fix: check if kibana version is a commit (#1047)

mdelapenya · mergify-bot · commit de744a04132a · 2021-04-22T06:31:32.000Z
(cherry picked from commit 05ab18f)
diff --git a/e2e/_suites/fleet/ingest_manager_test.go b/e2e/_suites/fleet/ingest_manager_test.go
@@ -123,7 +123,7 @@ func InitializeIngestManagerTestSuite(ctx *godog.TestSuiteContext) {
 		}
 
 		profileEnv["kibanaDockerNamespace"] = "kibana"
-		if strings.HasPrefix(kibanaVersion, "pr") {
+		if strings.HasPrefix(kibanaVersion, "pr") || e2e.IsCommit(kibanaVersion) {
 			// because it comes from a PR
 			profileEnv["kibanaDockerNamespace"] = "observability-ci"
 		}
diff --git a/e2e/utils.go b/e2e/utils.go
@@ -14,6 +14,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"regexp"
 	"strings"
 	"time"
 
@@ -522,6 +523,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/e2e/utils_test.go b/e2e/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"

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ func InitializeIngestManagerTestSuite(ctx *godog.TestSuiteContext) {`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`profileEnv["kibanaDockerNamespace"] = "kibana"`
`126`		`- if strings.HasPrefix(kibanaVersion, "pr") {`
	`126`	`+ if strings.HasPrefix(kibanaVersion, "pr") \|\| e2e.IsCommit(kibanaVersion) {`
`127`	`127`	`// because it comes from a PR`
`128`	`128`	`profileEnv["kibanaDockerNamespace"] = "observability-ci"`
`129`	`129`	`}`