Include github sha in messages

andrewmarklloyd · Apr 25, 2023 · 7964808 · 7964808
1 parent 48cf3b5
commit 7964808
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/main.go b/main.go
@@ -64,7 +64,7 @@ func main() {
 		renderMessage := mqtt.RenderMessage{}
 		err := json.Unmarshal([]byte(message), &renderMessage)
 		if err != nil {
-			handleError(fmt.Errorf("unmarshalling render message: %w", err), mqtt.UnknownRepoURL)
+			handleError(fmt.Errorf("unmarshalling render message: %w", err), mqtt.UnknownRepoURL, mqtt.UnknownGithubSHA)
 			return
 		}
 
@@ -76,16 +76,17 @@ func main() {
 
 		err = subscribeHandler(renderMessage)
 		if err != nil {
-			handleError(err, renderMessage.RepoURL)
+			handleError(err, renderMessage.RepoURL, renderMessage.GithubSHA)
 			return
 		}
 
 		logger.Info("successfully rendered and uploaded: ", renderMessage)
 
 		err = messageClient.PublishRenderFeedbackMessage(mqtt.RenderSuccessTopic, mqtt.RenderFeedbackMessage{
-			Status:  mqtt.StatusSucceess,
-			RepoURL: renderMessage.RepoURL,
-			Message: "successfully finished render, video is uploaded to storage",
+			Status:    mqtt.StatusSucceess,
+			RepoURL:   renderMessage.RepoURL,
+			GithubSHA: renderMessage.GithubSHA,
+			Message:   "successfully finished render, video is uploaded to storage",
 		})
 		if err != nil {
 			logger.Errorf("publishing success message: %w", err)
@@ -111,9 +112,10 @@ func subscribeHandler(renderMessage mqtt.RenderMessage) error {
 	}
 
 	err = messageClient.PublishRenderFeedbackMessage(mqtt.RenderAckTopic, mqtt.RenderFeedbackMessage{
-		Status:  mqtt.StatusSucceess,
-		RepoURL: renderMessage.RepoURL,
-		Message: "successfully cloned repo and started render",
+		Status:    mqtt.StatusSucceess,
+		RepoURL:   renderMessage.RepoURL,
+		GithubSHA: renderMessage.GithubSHA,
+		Message:   "successfully cloned repo and started render",
 	})
 	if err != nil {
 		return fmt.Errorf("publishing ack message: %w", err)
@@ -152,12 +154,13 @@ func render(fileName string) error {
 	return nil
 }
 
-func handleError(err error, repoURL string) {
+func handleError(err error, repoURL, githubSHA string) {
 	logger.Error(err)
 	pubErr := messageClient.PublishRenderFeedbackMessage(mqtt.RenderErrTopic, mqtt.RenderFeedbackMessage{
-		Status:  mqtt.StatusSucceess,
-		RepoURL: repoURL,
-		Message: fmt.Sprintf("error during render: %s", err.Error()),
+		Status:    mqtt.StatusSucceess,
+		RepoURL:   repoURL,
+		GithubSHA: githubSHA,
+		Message:   fmt.Sprintf("error during render: %s", err.Error()),
 	})
 	if pubErr != nil {
 		logger.Errorf("error publishing to renderErrTopic: %s", pubErr)

diff --git a/pkg/mqtt/config.go b/pkg/mqtt/config.go
@@ -13,16 +13,19 @@ const (
 	StatusSucceess = "success"
 	StatusError    = "error"
 
-	UnknownRepoURL = "unknownRepoURL"
+	UnknownRepoURL   = "unknownRepoURL"
+	UnknownGithubSHA = "unknownGithubSHA"
 )
 
 type RenderMessage struct {
 	FileNames []string `json:"fileNames"`
 	RepoURL   string   `json:"repoURL"`
+	GithubSHA string   `json:"githubSHA"`
 }
 
 type RenderFeedbackMessage struct {
-	RepoURL string `json:"repoURL"`
-	Status  string `json:"status"`
-	Message string `json:"message"`
+	RepoURL   string `json:"repoURL"`
+	Status    string `json:"status"`
+	Message   string `json:"message"`
+	GithubSHA string `json:"githubSHA"`
 }