Add missing arg run-id & improve error messages (#87)

* Add missing arg run-id & improve error messages

* v0.12.2

VERSION

@@ -1 +1 @@
-0.12.1
+0.12.2

pkg/deploy/deploy.go

@@ -164,6 +164,10 @@ var Command *cli.Command = &cli.Command{
 			Name:  "grafana-api-key",
 			Usage: "The Grafana API key to use for deployment annotations.",
 		},
+		&cli.StringFlag{
+			Name:  "run-id",
+			Usage: "The GitHub Actions run ID to use for deployment annotations.",
+		},
 	},
 	Action: Deploy,
 }
@@ -329,7 +333,7 @@ func Deploy(c *cli.Context) error {
 				RunID: runID,
 			},
 		); err != nil {
-			return cli.Exit(err, 1)
+			return cli.Exit(fmt.Errorf("Failed to post Grafana annotation: %w", err), 1)
 		}
 	}
 

pkg/deploy/grafana.go

@@ -117,10 +117,15 @@ func addGrafanaDeploymentAnnotation(
 	}
 
 	// TODO: actually find out why Grafana is returning 429 instead of just retrying
+	const RETRY_ATTEMPTS = 5
+	const RETRY_DELAY = 5 * time.Second
+
 	_, _, err = lo.AttemptWithDelay(
-		5,
-		5*time.Second,
+		RETRY_ATTEMPTS,
+		RETRY_DELAY,
 		func(i int, duration time.Duration) error {
+			log.Printf("Sending deploy annotation to Grafana, attempt %d\n", i)
+
 			statusCode, err := sendRequest(
 				grafanaURL+"annotations/graphite",
 				grafanaSecret,
@@ -138,9 +143,12 @@ func addGrafanaDeploymentAnnotation(
 		},
 	)
 	if err != nil {
+		log.Printf("Failed to send deploy annotation to Grafana after %d attempts\n", RETRY_ATTEMPTS)
 		return err
 	}
 
+	log.Println("Deploy annotation sent to Grafana!")
+
 	return nil
 }