fix(api): add git hash short param on manual run (#4140)

ovh · Apr 3, 2019 · ddf14fe · ddf14fe
1 parent 90aba33
commit ddf14fe
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 20 deletions.
diff --git a/engine/api/workflow/process.go b/engine/api/workflow/process.go
@@ -20,14 +20,18 @@ func setValuesGitInBuildParameters(run *sdk.WorkflowNodeRun, vcsInfos vcsInfos)
 	sdk.ParameterAddOrSetValue(&run.BuildParameters, tagGitBranch, sdk.StringParameter, run.VCSBranch)
 	sdk.ParameterAddOrSetValue(&run.BuildParameters, tagGitTag, sdk.StringParameter, run.VCSTag)
 	sdk.ParameterAddOrSetValue(&run.BuildParameters, tagGitHash, sdk.StringParameter, run.VCSHash)
+	hashShort := run.VCSHash
+	if len(hashShort) >= 7 {
+		hashShort = hashShort[:7]
+	}
+	sdk.ParameterAddOrSetValue(&run.BuildParameters, tagGitHashShort, sdk.StringParameter, hashShort)
 	sdk.ParameterAddOrSetValue(&run.BuildParameters, tagGitAuthor, sdk.StringParameter, vcsInfos.Author)
 	sdk.ParameterAddOrSetValue(&run.BuildParameters, tagGitMessage, sdk.StringParameter, vcsInfos.Message)
 	sdk.ParameterAddOrSetValue(&run.BuildParameters, tagGitURL, sdk.StringParameter, vcsInfos.URL)
 	sdk.ParameterAddOrSetValue(&run.BuildParameters, tagGitHTTPURL, sdk.StringParameter, vcsInfos.HTTPUrl)
 }
 
 func checkNodeRunCondition(wr *sdk.WorkflowRun, conditions sdk.WorkflowNodeConditions, params []sdk.Parameter) bool {
-
 	var conditionsOK bool
 	var errc error
 	if conditions.LuaScript == "" {

diff --git a/engine/api/workflow/run_workflow.go b/engine/api/workflow/run_workflow.go
@@ -16,6 +16,7 @@ const (
 	tagTriggeredBy   = "triggered_by"
 	tagEnvironment   = "environment"
 	tagGitHash       = "git.hash"
+	tagGitHashShort  = "git.hash.short"
 	tagGitRepository = "git.repository"
 	tagGitBranch     = "git.branch"
 	tagGitTag        = "git.tag"

diff --git a/engine/hooks/poller.go b/engine/hooks/poller.go
@@ -18,9 +18,11 @@ func fillPayload(pushEvent sdk.VCSPushEvent) map[string]string {
 	payload["git.author.email"] = pushEvent.Commit.Author.Email
 	payload["git.branch"] = strings.TrimPrefix(strings.TrimPrefix(pushEvent.Branch.DisplayID, "refs/heads/"), "refs/tags/")
 	payload["git.hash"] = pushEvent.Commit.Hash
-	if len(pushEvent.Commit.Hash) >= 7 {
-		payload["git.hash.short"] = pushEvent.Commit.Hash[:7]
+	hashShort := pushEvent.Commit.Hash
+	if len(hashShort) >= 7 {
+		hashShort = hashShort[:7]
 	}
+	payload["git.hash.short"] = hashShort
 	payload["git.repository"] = pushEvent.Repo
 	payload["cds.triggered_by.username"] = pushEvent.Commit.Author.DisplayName
 	payload["cds.triggered_by.fullname"] = pushEvent.Commit.Author.Name

diff --git a/engine/hooks/webhook.go b/engine/hooks/webhook.go
@@ -61,9 +61,11 @@ func executeRepositoryWebHook(t *sdk.TaskExecution) ([]sdk.WorkflowNodeRunHookEv
 		}
 		payload["git.hash.before"] = pushEvent.Before
 		payload["git.hash"] = pushEvent.After
-		if len(pushEvent.After) >= 7 {
-			payload["git.hash.short"] = pushEvent.After[:7]
+		hashShort := pushEvent.After
+		if len(hashShort) >= 7 {
+			hashShort = hashShort[:7]
 		}
+		payload["git.hash.short"] = hashShort
 		payload["git.repository"] = pushEvent.Repository.FullName
 		payload["cds.triggered_by.username"] = pushEvent.HeadCommit.Author.Username
 		payload["cds.triggered_by.fullname"] = pushEvent.HeadCommit.Author.Name
@@ -102,9 +104,11 @@ func executeRepositoryWebHook(t *sdk.TaskExecution) ([]sdk.WorkflowNodeRunHookEv
 		}
 		payload["git.hash.before"] = pushEvent.Before
 		payload["git.hash"] = pushEvent.After
-		if len(pushEvent.After) >= 7 {
-			payload["git.hash.short"] = pushEvent.After[:7]
+		hashShort := pushEvent.After
+		if len(hashShort) >= 7 {
+			hashShort = hashShort[:7]
 		}
+		payload["git.hash.short"] = hashShort
 		payload["git.repository"] = pushEvent.Project.PathWithNamespace
 
 		payload["cds.triggered_by.username"] = pushEvent.UserUsername
@@ -145,9 +149,11 @@ func executeRepositoryWebHook(t *sdk.TaskExecution) ([]sdk.WorkflowNodeRunHookEv
 			}
 			payload["git.hash.before"] = pushChange.FromHash
 			payload["git.hash"] = pushChange.ToHash
-			if len(pushChange.ToHash) >= 7 {
-				payload["git.hash.short"] = pushChange.ToHash[:7]
+			hashShort := pushChange.ToHash
+			if len(hashShort) >= 7 {
+				hashShort = hashShort[:7]
 			}
+			payload["git.hash.short"] = hashShort
 			payload["git.repository"] = fmt.Sprintf("%s/%s", pushEvent.Repository.Project.Key, pushEvent.Repository.Slug)
 
 			payload["cds.triggered_by.username"] = pushEvent.Actor.Name

diff --git a/engine/worker/builtin_gitclone.go b/engine/worker/builtin_gitclone.go
@@ -388,17 +388,19 @@ func extractInfo(w *currentWorker, dir string, params *[]sdk.Parameter, tag, bra
 					return fmt.Errorf("Error on addVariableInPipelineBuild (hash): %s", err)
 				}
 
-				if len(info.Hash) >= 7 {
-					if _, err := w.addVariableInPipelineBuild(
-						sdk.Variable{
-							Name:  "git.hash.short",
-							Type:  sdk.StringVariable,
-							Value: info.Hash[:7],
-						},
-						params,
-					); err != nil {
-						return fmt.Errorf("Error on addVariableInPipelineBuild (hash): %s", err)
-					}
+				hashShort := info.Hash
+				if len(hashShort) >= 7 {
+					hashShort = hashShort[:7]
+				}
+				if _, err := w.addVariableInPipelineBuild(
+					sdk.Variable{
+						Name:  "git.hash.short",
+						Type:  sdk.StringVariable,
+						Value: hashShort,
+					},
+					params,
+				); err != nil {
+					return fmt.Errorf("Error on addVariableInPipelineBuild (hash): %s", err)
 				}
 				sendLog(fmt.Sprintf("git.hash: %s", info.Hash))
 			} else {