Merge pull request #12 from blue-luke/project-id-not-name

feat: tidying logging
flanksource · Sep 10, 2024 · df9fd5b · df9fd5b
2 parents a94914f + 8bf3c89
commit df9fd5b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/cmd/trigger.go b/cmd/trigger.go
@@ -48,7 +48,17 @@ var Trigger = &cobra.Command{
 			foundBranch := false
 			errName := project.Name
 			if errName == "" {
-				errName = string(project.ID)
+				var idStr, serviceNameStr string
+
+				if project.ID != -1 {
+					idStr = fmt.Sprintf("%v", project.ID)
+				}
+
+				if project.ServiceName != "" {
+					serviceNameStr = project.ServiceName
+				}
+
+				errName = fmt.Sprintf("Project ID: %s, ServiceName: %s", idStr, serviceNameStr)
 			}
 			for _, lookup := range searchBranches {
 				err = project.SetBranch(lookup)

diff --git a/main.go b/main.go