Use the first tag from the list of tags in the Webhook.

This assumes that only a single tag is sent (which from a perusal of the code
is a correct assumption).

Author: bigkevmcd

README.md

@@ -53,6 +53,10 @@ $ kubectl create secret generic quay-imager-client --from-literal=token=$GITHUB_
 
 A k8s `Deployment` is provided in [./deploy/deployment.yaml](./deploy/deployment.yaml).
 
+## Exposing the Handler
+
+The Service exposes a Hook handler at `/` on port 8080 that handles the hooks.
+
 ## Building
 
 A `Dockerfile` is provided for building a container, but otherwise:

pkg/cmd/http.go

@@ -31,7 +31,7 @@ func makeHTTPCmd() *cobra.Command {
 
 			sugar := logger.Sugar()
 
-			f, err := os.Open(viper.GetString("config-file"))
+			f, err := os.Open(viper.GetString("config"))
 			if err != nil {
 				return err
 			}
@@ -40,7 +40,7 @@ func makeHTTPCmd() *cobra.Command {
 
 			updater := hook.New(sugar, client.New(scmClient), repos)
 			handler := hook.NewHandler(sugar, updater)
-			http.Handle("/hook", handler)
+			http.Handle("/", handler)
 			listen := fmt.Sprintf(":%d", viper.GetInt("port"))
 			sugar.Infow("quay-hooks http starting", "port", viper.GetInt("port"))
 			return http.ListenAndServe(listen, nil)
@@ -62,11 +62,11 @@ func makeHTTPCmd() *cobra.Command {
 	logIfError(viper.BindPFlag("driver", cmd.Flags().Lookup("driver")))
 
 	cmd.Flags().String(
-		"config-file",
+		"config",
 		"/etc/quay-imager/config.yaml",
 		"repository configuration",
 	)
-	logIfError(viper.BindPFlag("config-file", cmd.Flags().Lookup("config-file")))
+	logIfError(viper.BindPFlag("config", cmd.Flags().Lookup("config")))
 	return cmd
 }
 

pkg/hook/update.go

@@ -44,7 +44,10 @@ func (u *Updater) Update(ctx context.Context, h *quay.RepositoryPushHook) error
 		return err
 	}
 	u.log.Infow("got existing file", "sha", current.Sha)
-	updated, err := syaml.SetBytes(current.Data, cfg.UpdateKey, h.DockerURL)
+	newURL := fmt.Sprintf("%s:%s", h.DockerURL, h.UpdatedTags[0])
+
+	u.log.Infow("new image reference", "image", newURL)
+	updated, err := syaml.SetBytes(current.Data, cfg.UpdateKey, newURL)
 
 	masterRef, err := u.gitClient.GetBranchHead(ctx, cfg.SourceRepo, cfg.SourceBranch)
 	newBranchName := u.nameGenerator(cfg.BranchGenerateName)

pkg/hook/update_test.go

@@ -39,7 +39,7 @@ func TestUpdaterWithKnownRepo(t *testing.T) {
 	updater.Update(context.Background(), hook)
 
 	updated := m.GetUpdatedContents(testGitHubRepo, testFilePath, "known-branch")
-	want := "test:\n  image: quay.io/testorg/repo\n"
+	want := "test:\n  image: quay.io/testorg/repo:production\n"
 	if s := string(updated); s != want {
 		t.Fatalf("update failed, got %#v, want %#v", s, want)
 	}
@@ -54,8 +54,9 @@ func TestUpdaterWithKnownRepo(t *testing.T) {
 
 func createHook() *quay.RepositoryPushHook {
 	return &quay.RepositoryPushHook{
-		Repository: testQuayRepo,
-		DockerURL:  "quay.io/testorg/repo",
+		Repository:  testQuayRepo,
+		DockerURL:   "quay.io/testorg/repo",
+		UpdatedTags: []string{"production"},
 	}
 }