APP-6153 pass StartBuildRequest.Token from CLI (#4420)

Author: abe-winter

cli/app.go

@@ -60,6 +60,7 @@ const (
 	moduleBuildFlagBuildID   = "id"
 	moduleBuildFlagPlatform  = "platform"
 	moduleBuildFlagWait      = "wait"
+	moduleBuildFlagToken     = "token"
 	moduleBuildFlagGroupLogs = "group-logs"
 	moduleBuildRestartOnly   = "restart-only"
 	moduleBuildFlagNoBuild   = "no-build"
@@ -1624,6 +1625,10 @@ Example:
 									Usage: "git ref to clone when building your module. This can be a branch name or a commit hash",
 									Value: "main",
 								},
+								&cli.StringFlag{
+									Name:  moduleBuildFlagToken,
+									Usage: "checkout token for private repos, not necessary for public repos",
+								},
 							},
 							Action: ModuleBuildStartAction,
 						},

cli/module_build.go

@@ -77,7 +77,19 @@ func (c *viamClient) moduleBuildStartAction(cCtx *cli.Context) error {
 	}
 
 	gitRef := cCtx.String(moduleBuildFlagRef)
-	res, err := c.startBuild(manifest.URL, gitRef, manifest.ModuleID, platforms, version)
+	token := cCtx.String(moduleBuildFlagToken)
+	req := buildpb.StartBuildRequest{
+		Repo:          manifest.URL,
+		Ref:           &gitRef,
+		Platforms:     platforms,
+		ModuleId:      manifest.ModuleID,
+		ModuleVersion: version,
+		Token:         &token,
+	}
+	if err := c.ensureLoggedIn(); err != nil {
+		return err
+	}
+	res, err := c.buildClient.StartBuild(c.c.Context, &req)
 	if err != nil {
 		return err
 	}
@@ -315,20 +327,6 @@ func ModuleBuildLinkRepoAction(c *cli.Context) error {
 	return nil
 }
 
-func (c *viamClient) startBuild(repo, ref, moduleID string, platforms []string, version string) (*buildpb.StartBuildResponse, error) {
-	if err := c.ensureLoggedIn(); err != nil {
-		return nil, err
-	}
-	req := buildpb.StartBuildRequest{
-		Repo:          repo,
-		Ref:           &ref,
-		Platforms:     platforms,
-		ModuleId:      moduleID,
-		ModuleVersion: version,
-	}
-	return c.buildClient.StartBuild(c.c.Context, &req)
-}
-
 func (c *viamClient) printModuleBuildLogs(buildID, platform string) error {
 	if err := c.ensureLoggedIn(); err != nil {
 		return err

go.mod

@@ -83,7 +83,7 @@ require (
 	go.uber.org/atomic v1.11.0
 	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.24.0
-	go.viam.com/api v0.1.344
+	go.viam.com/api v0.1.345
 	go.viam.com/test v1.1.1-0.20220913152726-5da9916c08a2
 	go.viam.com/utils v0.1.103
 	goji.io v2.0.2+incompatible

go.sum

@@ -1607,8 +1607,8 @@ go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
 go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY=
 go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
 go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
-go.viam.com/api v0.1.344 h1:sfeHBoOA2QfD5S/LKdFJkO17hQeVU+wxBDOCua1Ndag=
-go.viam.com/api v0.1.344/go.mod h1:5lpVRxMsKFCaahqsnJfPGwJ9baoQ6PIKQu3lxvy6Wtw=
+go.viam.com/api v0.1.345 h1:QE7KWhkgIpclAG/aJSI3kIi6Mu5bLhutgrTLCy+QzfI=
+go.viam.com/api v0.1.345/go.mod h1:5lpVRxMsKFCaahqsnJfPGwJ9baoQ6PIKQu3lxvy6Wtw=
 go.viam.com/test v1.1.1-0.20220913152726-5da9916c08a2 h1:oBiK580EnEIzgFLU4lHOXmGAE3MxnVbeR7s1wp/F3Ps=
 go.viam.com/test v1.1.1-0.20220913152726-5da9916c08a2/go.mod h1:XM0tej6riszsiNLT16uoyq1YjuYPWlRBweTPRDanIts=
 go.viam.com/utils v0.1.103 h1:Nqx2TxwpR3RKA5Iy1xKgomq0ASU+DEsHSEdi3w7/KR4=