Merge pull request #146 from Clever/INFRANG-6712

[INFRANG-6712] Call catalogue sync service from goci

Author: andruwm

internal/catapult/catapult.go

@@ -12,6 +12,8 @@ import (
 	"github.com/Clever/circle-ci-integrations/gen-go/client"
 	"github.com/Clever/circle-ci-integrations/gen-go/models"
 	"github.com/Clever/wag/logging/wagclientlogger"
+
+	"golang.org/x/sync/errgroup"
 )
 
 // Artifact aliases a catapult models.CatapultApplication, and contains
@@ -44,21 +46,36 @@ func New() *Catapult {
 
 // Publish a list of build artifacts to catapult.
 func (c *Catapult) Publish(ctx context.Context, artifacts []*Artifact) error {
+	grp, grpCtx := errgroup.WithContext(ctx)
+
 	for _, art := range artifacts {
-		fmt.Println("Publishing", art.ID)
-		err := c.client.PostCatapultV2(ctx, &models.CatapultPublishRequest{
-			Username: environment.CircleUser,
-			Reponame: environment.Repo,
-			Buildnum: environment.CircleBuildNum,
-			App:      art,
+		grp.Go(func() error {
+			fmt.Println("Publishing", art.ID)
+			err := c.client.PostCatapultV2(grpCtx, &models.CatapultPublishRequest{
+				Username: environment.CircleUser,
+				Reponame: environment.Repo,
+				Buildnum: environment.CircleBuildNum,
+				App:      art,
+			})
+			if err != nil {
+				return fmt.Errorf("failed to publish %s with catapult: %v", art.ID, err)
+			}
+
+			err = c.client.SyncCatalogApp(grpCtx, &models.SyncCatalogAppInput{
+				App: art.ID,
+			})
+			if err != nil {
+				return fmt.Errorf("failed to sync catalog app %s with catalogue config: %v", art.ID, err)
+			}
+			return nil
 		})
-		if err != nil {
-			return fmt.Errorf("failed to publish %s with catapult: %v", art.ID, err)
-		}
 	}
-	return nil
+	return grp.Wait()
 }
 
+// Deploy a list of apps via catapult. Note that it is only possible to
+// deploy to production, even if you pass an env param to
+// circle-ci-integrations, which seems to ignore the param.
 func (c *Catapult) Deploy(ctx context.Context, apps []string) error {
 	for _, app := range apps {
 		fmt.Println("Deploying", app)

internal/docker/targets.go

@@ -9,19 +9,21 @@ import (
 	"github.com/Clever/ci-scripts/internal/repo"
 )
 
+// DockerTarget contains information about how to build and push a
+// docker build target.
 type DockerTarget struct {
 	// Tags are the list of tags to push for the built docker image.
 	Tags []string
 	// Command is the command to run to build the lambda artifact.
 	Command string
 }
 
-// BuildTargets returns a map of dockerfile path keys with their
-// associated tags for pushing to a remote repository. If multiple apps
-// share a repository then only the first matching Dockerfile and its
-// set of tags will be in the final list. This is an optimization so we
-// do not build multiple copies of the same Dockerfile which only differ
-// at runtime.
+// BuildTargets returns a map of dockerfile path keys with their build
+// command and associated tags for pushing to a remote repository. If
+// multiple apps share a repository then only the first matching
+// Dockerfile and its set of tags will be in the final list. This is an
+// optimization so we do not build multiple copies of the same
+// Dockerfile which only differ at runtime.
 func BuildTargets(apps map[string]*models.LaunchConfig) (map[string]DockerTarget, []*catapult.Artifact) {
 	var (
 		targets   = map[string]DockerTarget{}

internal/lambda/targets.go

@@ -22,10 +22,10 @@ type LambdaTarget struct {
 
 // BuildTargets returns a set of lambda targets to build and publish to
 // S3 as well as a list of artifacts to be published to catapult. The
-// targets map has the artifact name as the key and the already built
-// local zip location as the value. Any apps with a shared artifact
-// will have only one entry in the map, but will still have individual
-// entries in the catapult build artifacts
+// targets map has the artifact name as the key and a build command and
+// destination zip file in the value struct. Any apps with a shared
+// artifact will have only one entry in the map, but will still have
+// individual entries in the catapult build artifacts
 func BuildTargets(apps map[string]*models.LaunchConfig) (map[string]LambdaTarget, []*catapult.Artifact) {
 	var (
 		targets   = map[string]LambdaTarget{}

internal/repo/repo.go

@@ -120,13 +120,17 @@ func ArtifactName(appName string, lc *models.LaunchConfig) string {
 	return artifactName
 }
 
+// BuildCommand returns the build command for the application artifact,
+// if any is specified. Otherwise it returns an empty string.
 func BuildCommand(lc *models.LaunchConfig) string {
 	if lc.Build == nil || lc.Build.Artifact == nil {
 		return ""
 	}
 	return lc.Build.Artifact.Command
 }
 
+// ExecBuild runs the build command for the application artifact, if any
+// exists. If the command is empty, it returns nil after performing nop.
 func ExecBuild(c string) error {
 	if c == "" {
 		return nil