chore: check if the version must use the fallback after coming from a Git SHA

mdelapenya · mdelapenya · commit 477e6e2d104a · 2021-05-11T17:37:55.000+02:00
diff --git a/internal/common/defaults.go b/internal/common/defaults.go
@@ -79,6 +79,9 @@ func InitVersions() {
 	}
 	BeatVersion = v
 
+	// detects if the BeatVersion is set by the GITHUB_CHECK_SHA1 variable
+	BeatVersion = utils.CheckPRVersion(BeatVersion, BeatVersionBase)
+
 	StackVersion = shell.GetEnv("STACK_VERSION", BeatVersionBase)
 	v, err = utils.GetElasticArtifactVersion(StackVersion)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,9 @@ func InitVersions() {`
`79`	`79`	`}`
`80`	`80`	`BeatVersion = v`
`81`	`81`
	`82`	`+ // detects if the BeatVersion is set by the GITHUB_CHECK_SHA1 variable`
	`83`	`+ BeatVersion = utils.CheckPRVersion(BeatVersion, BeatVersionBase)`
	`84`	`+`
`82`	`85`	`StackVersion = shell.GetEnv("STACK_VERSION", BeatVersionBase)`
`83`	`86`	`v, err = utils.GetElasticArtifactVersion(StackVersion)`
`84`	`87`	`if err != nil {`