Cr 13549 (#519)

* initial commit

* fixes according to code review

* bump

Author: danielm-codefresh

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.0.464
+VERSION=v0.0.465
 
 
 OUT_DIR=dist

cmd/commands/integrations.go

@@ -95,9 +95,7 @@ func NewGitIntegrationCommand(client *sdk.AppProxyAPI) *cobra.Command {
 }
 
 func NewGitIntegrationListCommand(client *sdk.AppProxyAPI) *cobra.Command {
-	var (
-		format string
-	)
+	var format string
 
 	allowedFormats := []string{"list", "yaml", "yml", "json"}
 
@@ -318,9 +316,7 @@ func RunGitIntegrationRemoveCommand(ctx context.Context, client sdk.AppProxyAPI,
 }
 
 func NewGitIntegrationRegisterCommand(client *sdk.AppProxyAPI) *cobra.Command {
-	var (
-		opts model.RegisterToGitIntegrationArgs
-	)
+	var opts model.RegisterToGitIntegrationArgs
 
 	cmd := &cobra.Command{
 		Use:   "register [NAME]",
@@ -356,9 +352,7 @@ func RunGitIntegrationRegisterCommand(ctx context.Context, client sdk.AppProxyAP
 }
 
 func NewGitIntegrationDeregisterCommand(client *sdk.AppProxyAPI) *cobra.Command {
-	var (
-		integration *string
-	)
+	var integration *string
 
 	cmd := &cobra.Command{
 		Use:   "deregister [NAME]",

cmd/commands/runtime_install.go

@@ -480,15 +480,15 @@ func ensureIngressClass(ctx context.Context, opts *RuntimeInstallOptions) error
 				ingressClassNames = append(ingressClassNames, ic.Name)
 				ingressClassNameToController[ic.Name] = ingressutil.GetController(string(controller))
 
-				if opts.IngressClass == ic.Name { //if ingress class provided via flag
+				if opts.IngressClass == ic.Name { // if ingress class provided via flag
 					isValidClass = true
 				}
 				break
 			}
 		}
 	}
 
-	if opts.IngressClass != "" { //if ingress class provided via flag
+	if opts.IngressClass != "" { // if ingress class provided via flag
 		if !isValidClass {
 			return fmt.Errorf("ingress class '%s' is not supported", opts.IngressClass)
 		}
@@ -581,13 +581,18 @@ func runRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 	}()
 
 	ingressControllerName := opts.IngressController.Name()
+	gitProvider, err := parseGitProvider(string(opts.gitProvider.Type()))
+	if err != nil {
+		return err
+	}
 
 	repoURL := opts.InsCloneOpts.URL()
 	token, iv, err := createRuntimeOnPlatform(ctx, &model.RuntimeInstallationArgs{
 		RuntimeName:         opts.RuntimeName,
 		Cluster:             server,
 		RuntimeVersion:      runtimeVersion,
 		IngressHost:         &opts.IngressHost,
+		GitProvider:         model.GitProviders(gitProvider),
 		InternalIngressHost: &opts.InternalIngressHost,
 		IngressClass:        &opts.IngressClass,
 		IngressController:   &ingressControllerName,

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.464/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.465/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.464/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.465/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.45.0
+	github.com/codefresh-io/go-sdk v0.46.0
 	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

go.sum

@@ -262,8 +262,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.45.0 h1:mgQYkaA0lC5L60MBdkNS3UvpGyx6rYWo5WEWcKNSRNA=
-github.com/codefresh-io/go-sdk v0.45.0/go.mod h1:CcoVmTFWHGkbrSW8LyOGB/vJe5Vzr3iC/pNE2QIBTyg=
+github.com/codefresh-io/go-sdk v0.46.0 h1:bqspXepPrH11Ve9cX9poJivysl6NePfJve+A1Ulv3eA=
+github.com/codefresh-io/go-sdk v0.46.0/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.464
+  version: 0.0.465
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events

pkg/git/provider.go

@@ -38,14 +38,12 @@ const (
 	PersonalToken TokenType = "personal token"
 )
 
-var (
-	providers = map[ProviderType]func(string) (Provider, error){
-		BITBUCKET_SERVER: NewBitbucketServerProvider,
-		GITHUB:           NewGithubProvider,
-		GITHUB_ENT:       NewGithubProvider, // for backward compatability
-		GITLAB:           NewGitlabProvider,
-	}
-)
+var providers = map[ProviderType]func(string) (Provider, error){
+	BITBUCKET_SERVER: NewBitbucketServerProvider,
+	GITHUB:           NewGithubProvider,
+	GITHUB_ENT:       NewGithubProvider, // for backward compatability
+	GITLAB:           NewGitlabProvider,
+}
 
 func GetProvider(providerType ProviderType, baseURL string) (Provider, error) {
 	if providerType != "" {

pkg/git/provider_bitbucket-server.go

@@ -42,7 +42,7 @@ func NewBitbucketServerProvider(baseURL string) (Provider, error) {
 	u.Path = BITBUCKET_REST_ENDPOINT
 	return &bitbucketServer{
 		providerType: BITBUCKET_SERVER,
-		apiURL:      u,
+		apiURL:       u,
 	}, nil
 }