Fixes for git-flow

- buildshiprun: shorter status message to fit into UI - git-tar: panic when checking for non-existing err variable - import-secrets: checked wrong name for HMAC secret, fixed Tested "in production" on o6s.io cluster. Signed-off-by: Alex Ellis (VMware) <[email protected]>
openfaas · Aug 13, 2018 · 10a092c · 10a092c
1 parent 197a147
commit 10a092c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/buildshiprun/handler.go b/buildshiprun/handler.go
@@ -152,7 +152,7 @@ func Handle(req []byte) string {
 	}
 
 	sdk.PostAudit(auditEvent)
-	status.AddStatus(sdk.StatusSuccess, fmt.Sprintf("function successfully deployed as: %s", serviceValue), sdk.BuildFunctionContext(event.Service))
+	status.AddStatus(sdk.StatusSuccess, fmt.Sprintf("deployed: %s", serviceValue), sdk.BuildFunctionContext(event.Service))
 	reportStatus(status)
 	return fmt.Sprintf("buildStatus %s %s %s", buildStatus, imageName, res.Status)
 }

diff --git a/git-tar/function/ops.go b/git-tar/function/ops.go
@@ -301,15 +301,21 @@ func importSecrets(pushEvent sdk.PushEvent, stack *stack.Services, clonePath str
 		fmt.Fprintf(os.Stderr, fmt.Errorf("error reaching import-secrets function: %s", reqErr.Error()).Error())
 	}
 
-	defer res.Body.Close()
+	if res.Body != nil {
+		defer res.Body.Close()
+	}
 
 	if res.StatusCode != http.StatusAccepted && res.StatusCode != http.StatusOK {
-		resBytes, err := ioutil.ReadAll(res.Body)
-		if err != nil {
-			return fmt.Errorf("error reading response from import-secrets: %s", err.Error())
-		}
+		if res.Body != nil {
+			resBytes, err := ioutil.ReadAll(res.Body)
+			if err != nil {
+				return fmt.Errorf("error reading response from import-secrets: %s", err.Error())
+			}
+
+			return fmt.Errorf("import-secrets returned unexpected status: %s", string(resBytes))
 
-		return fmt.Errorf("import-secrets returned error: %s, res: %s", err.Error(), string(resBytes))
+		}
+		return fmt.Errorf("import-secrets returned unknown error, status: %d", res.StatusCode)
 	}
 
 	auditEvent := sdk.AuditEvent{

diff --git a/import-secrets/handler.go b/import-secrets/handler.go
@@ -22,7 +22,7 @@ func Handle(req []byte) string {
 	event := getEventFromHeader()
 
 	if hmacEnabled() {
-		key, err := sdk.ReadSecret("github-secret-key")
+		key, err := sdk.ReadSecret("github-webhook-secret")
 		if err != nil {
 			fmt.Fprintf(os.Stderr, err.Error())
 			os.Exit(1)
@@ -31,6 +31,7 @@ func Handle(req []byte) string {
 		}
 
 		digest := os.Getenv("Http_X_Hub_Signature")
+
 		validated := hmac.Validate(req, digest, key)
 
 		if validated != nil {