CR-14124 git integrestion step for bitbucket cloud (#556)

* git integrestion step for bitbucket cloud

* bump

* bump

* bump app-proxy and go-sdk

* bump

* resolve comments

* bump

* fix lint

Co-authored-by: Noam Gal <[email protected]>

Author: kim-codefresh

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.0.499
+VERSION=v0.0.500
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")

cmd/commands/common.go

@@ -296,6 +296,9 @@ func ensureGitUserToken(ctx context.Context, opts *RuntimeInstallOptions) error
 		}
 
 		log.G(ctx).Infof("Personal git token was not provided. Using runtime git token to register user: \"%s\". You may replace your personal git token at any time from the UI in the user settings", currentUser.Name)
+
+		opts.GitIntegrationRegistrationOpts.Username = opts.InsCloneOpts.Auth.Username
+
 		return nil
 	}
 

cmd/commands/integrations.go

@@ -38,6 +38,12 @@ type (
 		Provider      model.GitProviders
 		SharingPolicy model.SharingPolicy
 	}
+
+	GitIntegrationRegistrationOpts struct {
+		Name     string
+		Token    string
+		Username string
+	}
 )
 
 var gitProvidersByName = map[string]model.GitProviders{
@@ -317,32 +323,45 @@ func RunGitIntegrationRemoveCommand(ctx context.Context, client sdk.AppProxyAPI,
 }
 
 func NewGitIntegrationRegisterCommand(client *sdk.AppProxyAPI) *cobra.Command {
-	var opts model.RegisterToGitIntegrationArgs
-
+	opts := &GitIntegrationRegistrationOpts{}
 	cmd := &cobra.Command{
 		Use:   "register [NAME]",
 		Short: "Register to a git integrations",
 		Args:  cobra.MaximumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) > 0 {
-				opts.Name = &args[0]
+				opts.Name = args[0]
 			}
 
-			return RunGitIntegrationRegisterCommand(cmd.Context(), *client, &opts)
+			return RunGitIntegrationRegisterCommand(cmd.Context(), *client, opts)
 		},
 	}
 
 	util.Die(viper.BindEnv("token", "GIT_TOKEN"))
-
 	cmd.Flags().StringVar(&opts.Token, "token", "", "Authentication token")
 
+	util.Die(viper.BindEnv("username", "GIT_USER"))
+
+	cmd.Flags().StringVar(&opts.Username, "username", "", "Authentication user name")
+
 	util.Die(cmd.MarkFlagRequired("token"))
 
 	return cmd
 }
 
-func RunGitIntegrationRegisterCommand(ctx context.Context, client sdk.AppProxyAPI, opts *model.RegisterToGitIntegrationArgs) error {
-	intg, err := client.GitIntegrations().Register(ctx, opts)
+func RunGitIntegrationRegisterCommand(ctx context.Context, client sdk.AppProxyAPI, opts *GitIntegrationRegistrationOpts) error {
+	regOpts := &model.RegisterToGitIntegrationArgs{
+		Token: opts.Token,
+	}
+	if opts.Username != "" {
+		regOpts.Username = &opts.Username
+	}
+
+	if opts.Name != "" {
+		regOpts.Name = &opts.Name
+	}
+
+	intg, err := client.GitIntegrations().Register(ctx, regOpts)
 	if err != nil {
 		return fmt.Errorf("failed to register to git integration: %w", err)
 	}

cmd/commands/runtime_install.go

@@ -96,7 +96,7 @@ type (
 		GsCloneOpts                    *apgit.CloneOptions
 		InsCloneOpts                   *apgit.CloneOptions
 		GitIntegrationCreationOpts     *apmodel.AddGitIntegrationArgs
-		GitIntegrationRegistrationOpts *apmodel.RegisterToGitIntegrationArgs
+		GitIntegrationRegistrationOpts *GitIntegrationRegistrationOpts
 		KubeFactory                    kube.Factory
 		CommonConfig                   *runtime.CommonConfig
 		NamespaceLabels                map[string]string
@@ -121,7 +121,7 @@ func NewRuntimeInstallCommand() *cobra.Command {
 				SharingPolicy: apmodel.SharingPolicyAllUsersInAccount,
 				APIURL:        &gitIntegrationApiURL,
 			},
-			GitIntegrationRegistrationOpts: &apmodel.RegisterToGitIntegrationArgs{},
+			GitIntegrationRegistrationOpts: &GitIntegrationRegistrationOpts{},
 		}
 		finalParameters map[string]string
 	)
@@ -197,6 +197,7 @@ func NewRuntimeInstallCommand() *cobra.Command {
 	cmd.Flags().StringVar(&installationOpts.GatewayName, "gateway-name", "", "The gateway name")
 	cmd.Flags().StringVar(&installationOpts.GatewayNamespace, "gateway-namespace", "", "The namespace of the gateway")
 	cmd.Flags().StringVar(&installationOpts.GitIntegrationRegistrationOpts.Token, "personal-git-token", "", "The Personal git token for your user")
+	cmd.Flags().StringVar(&installationOpts.GitIntegrationRegistrationOpts.Username, "personal-git-user", "", "The Personal git user that match the token, required for bitbucket cloud")
 	cmd.Flags().StringVar(&installationOpts.versionStr, "version", "", "The runtime version to install (default: latest)")
 	cmd.Flags().StringVar(&installationOpts.SuggestedSharedConfigRepo, "shared-config-repo", "", "URL to the shared configurations repo. (default: <installation-repo> or the existing one for this account)")
 	cmd.Flags().BoolVar(&installationOpts.InstallDemoResources, "demo-resources", true, "Installs demo resources (default: true)")
@@ -965,12 +966,13 @@ you can try to create it manually by running:
 	return nil
 }
 
-func registerUserToGitIntegration(ctx context.Context, appProxyClient codefresh.AppProxyAPI, runtime string, opts *apmodel.RegisterToGitIntegrationArgs) error {
+func registerUserToGitIntegration(ctx context.Context, appProxyClient codefresh.AppProxyAPI, runtime string, opts *GitIntegrationRegistrationOpts) error {
 	if err := RunGitIntegrationRegisterCommand(ctx, appProxyClient, opts); err != nil {
 		command := util.Doc(fmt.Sprintf(
-			"\t<BIN> integration git register default --runtime %s --token %s",
+			"\t<BIN> integration git register default --runtime %s --token %s --username %s",
 			runtime,
 			opts.Token,
+			opts.Username,
 		))
 		return fmt.Errorf(`
 %w

docs/commands/cli-v2_integration_git_register.md

@@ -9,8 +9,9 @@ cli-v2 integration git register [NAME] [flags]
 ### Options
 
 ```
-  -h, --help           help for register
-      --token string   Authentication token
+  -h, --help              help for register
+      --token string      Authentication token
+      --username string   Authentication user name
 ```
 
 ### Options inherited from parent commands

docs/commands/cli-v2_runtime_install.md

@@ -47,6 +47,7 @@ cli-v2 runtime install [runtime_name] [flags]
   -n, --namespace string                             If present, the namespace scope for this CLI request
       --namespace-labels stringToString              Optional labels that will be set on the namespace resource. (e.g. "key1=value1,key2=value2" (default [])
       --personal-git-token string                    The Personal git token for your user
+      --personal-git-user string                     The Personal git user that match the token, required for bitbucket cloud
       --provider string                              The git provider, one of: azure|bitbucket|bitbucket-server|gitea|github|gitlab
       --provider-api-url string                      Git provider API url
       --repo string                                  Repository URL [GIT_REPO]

docs/releases/release_notes.md

@@ -23,7 +23,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.499/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.500/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.499/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.500/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/argoproj/argo-events v0.17.1-0.20220327045437-70eaafe9afec
 	github.com/argoproj/argo-workflows/v3 v3.3.1
 	github.com/briandowns/spinner v1.18.1
-	github.com/codefresh-io/go-sdk v0.47.1
+	github.com/codefresh-io/go-sdk v0.47.2
 	github.com/fatih/color v1.13.0
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
 	github.com/go-git/go-billy/v5 v5.3.1
@@ -257,7 +257,6 @@ require (
 replace (
 	// https://github.com/golang/go/issues/33546#issuecomment-519656923
 	github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
-
 	github.com/golang/protobuf => github.com/golang/protobuf v1.4.2
 	github.com/gorilla/websocket => github.com/gorilla/websocket v1.4.2
 	github.com/grpc-ecosystem/grpc-gateway => github.com/grpc-ecosystem/grpc-gateway v1.16.0

go.sum

@@ -308,8 +308,8 @@ github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h
 github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA=
 github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
-github.com/codefresh-io/go-sdk v0.47.1 h1:u75zJuphhFvqyjpcZWGzifAeOsZ7BcSrm2WZ4yTvxFo=
-github.com/codefresh-io/go-sdk v0.47.1/go.mod h1:CcoVmTFWHGkbrSW8LyOGB/vJe5Vzr3iC/pNE2QIBTyg=
+github.com/codefresh-io/go-sdk v0.47.2 h1:GgQHvZgmMxuTd6QivT40cZ+brkOCjiQ2KFtrRFDHGP8=
+github.com/codefresh-io/go-sdk v0.47.2/go.mod h1:CcoVmTFWHGkbrSW8LyOGB/vJe5Vzr3iC/pNE2QIBTyg=
 github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
 github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27/go.mod h1:VQx0hjo2oUeQkQUET7wRwradO6f+fN5jzXgB/zROxxE=
 github.com/container-storage-interface/spec v1.5.0/go.mod h1:8K96oQNkJ7pFcC2R9Z1ynGGBB1I93kcS6PGg3SsOk8s=

manifests/runtime.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   defVersion: 1.0.1
-  version: 0.0.499
+  version: 0.0.500
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events