From a699d9086f4f37411c99bd532c74feda3f645ad8 Mon Sep 17 00:00:00 2001 From: Jill Guyonnet Date: Tue, 11 Jul 2023 12:17:03 +0200 Subject: [PATCH] [Fleet] Fix version constraint for experimentalDataStreamSettings (#1350) --- internal/stack/_static/kibana.yml.tmpl | 2 +- internal/stack/resources_test.go | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/internal/stack/_static/kibana.yml.tmpl b/internal/stack/_static/kibana.yml.tmpl index 35b4e1bf4..9e52be0d8 100644 --- a/internal/stack/_static/kibana.yml.tmpl +++ b/internal/stack/_static/kibana.yml.tmpl @@ -28,7 +28,7 @@ xpack.fleet.registryUrl: "https://package-registry:8080" xpack.fleet.agents.enabled: true xpack.fleet.agents.fleet_server.hosts: ["https://fleet-server:8220"] -{{ if and (not (semverLessThan $version "8.7.0")) (semverLessThan $version "8.10.0") }} +{{ if and (not (semverLessThan $version "8.7.0")) (semverLessThan $version "8.10.0-SNAPSHOT") }} xpack.fleet.enableExperimental: ["experimentalDataStreamSettings"] # Enable experimental toggles in Fleet UI {{ end }} diff --git a/internal/stack/resources_test.go b/internal/stack/resources_test.go index c0c0fd5d9..bae2e5a4d 100644 --- a/internal/stack/resources_test.go +++ b/internal/stack/resources_test.go @@ -69,3 +69,13 @@ func TestApplyResourcesWithCustomGeoipDir(t *testing.T) { expectedVolume := fmt.Sprintf("%s:/usr/share/elasticsearch/config/ingest-geoip", expectedGeoipPath) assert.Contains(t, volumes, expectedVolume) } + +func TestSemverLessThan(t *testing.T) { + b, err := semverLessThan("8.9.0", "8.10.0-SNAPSHOT") + require.NoError(t, err) + assert.True(t, b) + + b, err = semverLessThan("8.10.0-SNAPSHOT", "8.10.0") + require.NoError(t, err) + assert.True(t, b) +}