From 54c9e25bf0e79ffd0a05b7308f5ec09360c76cc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Fri, 16 Apr 2021 02:07:51 +0200 Subject: [PATCH 1/2] fix: check if kibana version is a commit (#1047) (cherry picked from commit 05ab18f2e1d43ed193d23671b531e89ece05415f) # Conflicts: # e2e/_suites/fleet/ingest_manager_test.go --- e2e/_suites/fleet/ingest_manager_test.go | 5 +++++ internal/utils/utils.go | 8 ++++++++ internal/utils/utils_test.go | 16 ++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/e2e/_suites/fleet/ingest_manager_test.go b/e2e/_suites/fleet/ingest_manager_test.go index ab09ecb7b2..06068152c9 100644 --- a/e2e/_suites/fleet/ingest_manager_test.go +++ b/e2e/_suites/fleet/ingest_manager_test.go @@ -151,8 +151,13 @@ func InitializeIngestManagerTestSuite(ctx *godog.TestSuiteContext) { "stackVersion": common.StackVersion, } +<<<<<<< HEAD common.ProfileEnv["kibanaDockerNamespace"] = "kibana" if strings.HasPrefix(common.KibanaVersion, "pr") || utils.IsCommit(common.KibanaVersion) { +======= + profileEnv["kibanaDockerNamespace"] = "kibana" + if strings.HasPrefix(kibanaVersion, "pr") || e2e.IsCommit(kibanaVersion) { +>>>>>>> 05ab18f2... fix: check if kibana version is a commit (#1047) // because it comes from a PR common.ProfileEnv["kibanaDockerNamespace"] = "observability-ci" } diff --git a/internal/utils/utils.go b/internal/utils/utils.go index 3c2a877930..e794e05f1f 100644 --- a/internal/utils/utils.go +++ b/internal/utils/utils.go @@ -13,6 +13,7 @@ import ( "os" "path" "path/filepath" + "regexp" "strings" "time" @@ -501,6 +502,13 @@ func getBucketSearchNextPageParam(jsonParsed *gabs.Container) string { return "&pageToken=" + nextPageToken } +// IsCommit returns true if the string matches commit format +func IsCommit(s string) bool { + re := regexp.MustCompile(`\b[0-9a-f]{5,40}\b`) + + return re.MatchString(s) +} + func processBucketSearchPage(jsonParsed *gabs.Container, currentPage int, bucket string, prefix string, object string) (string, error) { items := jsonParsed.Path("items").Children() diff --git a/internal/utils/utils_test.go b/internal/utils/utils_test.go index 9516ef75d5..e897ebbba4 100644 --- a/internal/utils/utils_test.go +++ b/internal/utils/utils_test.go @@ -313,6 +313,22 @@ func TestGetGCPBucketCoordinates_Snapshots(t *testing.T) { }) } +func TestIsCommit(t *testing.T) { + t.Run("Returns true with commits", func(t *testing.T) { + assert.True(t, IsCommit("abcdef1234")) + assert.True(t, IsCommit("a12345")) + assert.True(t, IsCommit("abcdef1")) + }) + + t.Run("Returns false with non-commits", func(t *testing.T) { + assert.False(t, IsCommit("master")) + assert.False(t, IsCommit("7.x")) + assert.False(t, IsCommit("7.12.x")) + assert.False(t, IsCommit("7.11.x")) + assert.False(t, IsCommit("pr12345")) + }) +} + func TestProcessBucketSearchPage_CommitFound(t *testing.T) { // retrieving last element in commits.json object := "024b732844d40bdb2bf806480af2b03fcb8fbdbe/elastic-agent/elastic-agent-8.0.0-SNAPSHOT-darwin-x86_64.tar.gz" From aefa43e6c3c18263491341bfdceb827e19fb0462 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Thu, 22 Apr 2021 08:33:05 +0200 Subject: [PATCH 2/2] fix: resolve conflicts --- e2e/_suites/fleet/ingest_manager_test.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/e2e/_suites/fleet/ingest_manager_test.go b/e2e/_suites/fleet/ingest_manager_test.go index 06068152c9..ab09ecb7b2 100644 --- a/e2e/_suites/fleet/ingest_manager_test.go +++ b/e2e/_suites/fleet/ingest_manager_test.go @@ -151,13 +151,8 @@ func InitializeIngestManagerTestSuite(ctx *godog.TestSuiteContext) { "stackVersion": common.StackVersion, } -<<<<<<< HEAD common.ProfileEnv["kibanaDockerNamespace"] = "kibana" if strings.HasPrefix(common.KibanaVersion, "pr") || utils.IsCommit(common.KibanaVersion) { -======= - profileEnv["kibanaDockerNamespace"] = "kibana" - if strings.HasPrefix(kibanaVersion, "pr") || e2e.IsCommit(kibanaVersion) { ->>>>>>> 05ab18f2... fix: check if kibana version is a commit (#1047) // because it comes from a PR common.ProfileEnv["kibanaDockerNamespace"] = "observability-ci" }