Cr 10692 support bitbucket (#494)

* split runtime install funcs to new file
* bump autopilot to 0.4.2
* hide new git providers behind hidden --enable-git-providers flag
* updated dockerfile
* updated go-sdk to 0.45.0
* updated version to 0.0.441
* unhide cluster commands

Co-authored-by: Kim Aharfi <kim.aharfi@codefresh.io>

Author: ATGardner

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.18.0-alpine3.15 as base
+FROM golang:1.18.4-alpine3.16 as base
 
 WORKDIR /go/src/github.com/codefresh-io/cli-v2
 
@@ -26,7 +26,7 @@ RUN go mod verify
 
 ############################### CLI ###############################
 ### Compile
-FROM golang:1.18.0-alpine3.15 as codefresh-build
+FROM golang:1.18.4-alpine3.16 as codefresh-build
 
 WORKDIR /go/src/github.com/codefresh-io/cli-v2
 
@@ -44,7 +44,7 @@ ARG SEGMENT_WRITE_KEY
 RUN make local DEV_MODE=false SEGMENT_WRITE_KEY=${SEGMENT_WRITE_KEY}
 
 ### Run
-FROM alpine:3.15 as codefresh
+FROM alpine:3.16 as codefresh
 
 WORKDIR /go/src/github.com/codefresh-io/cli-v2
 

Makefile

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

cmd/commands/cluster.go

@@ -81,7 +81,6 @@ var (
 
 func NewClusterCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Hidden:            true, // until app-proxy is working correctly
 		Use:               "cluster",
 		Short:             "Manage clusters of Codefresh runtimes",
 		PersistentPreRunE: cfConfig.RequireAuthentication,

cmd/commands/common.go

@@ -33,8 +33,8 @@ import (
 	"github.com/codefresh-io/cli-v2/pkg/store"
 	"github.com/codefresh-io/cli-v2/pkg/util"
 
-	"github.com/argoproj-labs/argocd-autopilot/pkg/git"
-	autoPilotUtil "github.com/argoproj-labs/argocd-autopilot/pkg/util"
+	apgit "github.com/argoproj-labs/argocd-autopilot/pkg/git"
+	aputil "github.com/argoproj-labs/argocd-autopilot/pkg/util"
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -115,7 +115,7 @@ func askUserIfToInstallDemoResources(cmd *cobra.Command, sampleInstall *bool) er
 	return nil
 }
 
-func ensureRepo(cmd *cobra.Command, runtimeName string, cloneOpts *git.CloneOptions, fromAPI bool) error {
+func ensureRepo(cmd *cobra.Command, runtimeName string, cloneOpts *apgit.CloneOptions, fromAPI bool) error {
 	ctx := cmd.Context()
 	if cloneOpts.Repo != "" {
 		return nil
@@ -151,7 +151,7 @@ func getRepoFromUserInput(cmd *cobra.Command) error {
 	repoPrompt := promptui.Prompt{
 		Label: "Repository URL",
 		Validate: func(value string) error {
-			host, orgRepo, _, _, _, _, _ := autoPilotUtil.ParseGitUrl(value)
+			host, orgRepo, _, _, _, _, _ := aputil.ParseGitUrl(value)
 			if host != "" && orgRepo != "" {
 				return nil
 			}
@@ -279,57 +279,50 @@ func getIngressClassFromUserSelect(ingressClassNames []string) (string, error) {
 	return result, nil
 }
 
-func inferProviderFromRepo(opts *git.CloneOptions) {
-	if opts.Provider != "" {
-		return
-	}
-
-	if strings.Contains(opts.Repo, "github.com") {
-		opts.Provider = "github"
-	}
-	if strings.Contains(opts.Repo, "gitlab.com") {
-		opts.Provider = "gitlab"
-	}
-}
-
-func ensureGitToken(cmd *cobra.Command, cloneOpts *git.CloneOptions, verify bool) error {
-	errMessage := "Value stored in environment variable GIT_TOKEN is invalid; enter a valid runtime token"
+// ensureGitToken gets the runtime token from the user (if !silent), and verifys it witht he provider (if available)
+func ensureGitToken(cmd *cobra.Command, gitProvider cfgit.Provider, cloneOpts *apgit.CloneOptions) error {
+	ctx := cmd.Context()
+	errMessage := "Value stored in environment variable GIT_TOKEN is invalid; enter a valid runtime token: %w"
 	if cloneOpts.Auth.Password == "" && !store.Get().Silent {
 		err := getGitTokenFromUserInput(cmd)
-		errMessage = "Invalid runtime token; enter a valid token"
+		errMessage = "Invalid runtime token; enter a valid token: %w"
 		if err != nil {
 			return err
 		}
 	}
 
-	if verify {
-		err := cfgit.VerifyToken(cmd.Context(), cloneOpts.Provider, cloneOpts.Auth.Password, cfgit.RuntimeToken)
+	if gitProvider != nil {
+		err := gitProvider.VerifyToken(ctx, cfgit.RuntimeToken, cloneOpts.Auth.Password)
 		if err != nil {
 			// in case when we get invalid value from env variable TOKEN we clean
 			cloneOpts.Auth.Password = ""
-			return fmt.Errorf(errMessage)
+			return fmt.Errorf(errMessage, err)
 		}
-	}
-
-	if cloneOpts.Auth.Password == "" {
+	} else if cloneOpts.Auth.Password == "" {
 		return fmt.Errorf("must provide a git token using --git-token")
 	}
 
 	return nil
 }
 
-func ensureGitPAT(cmd *cobra.Command, opts *RuntimeInstallOptions) error {
+// ensureGitPAT verifys the user's Personal Access Token (if it is different from the Runtime Token)
+func ensureGitPAT(ctx context.Context, opts *RuntimeInstallOptions) error {
 	if opts.GitIntegrationRegistrationOpts.Token == "" {
 		opts.GitIntegrationRegistrationOpts.Token = opts.InsCloneOpts.Auth.Password
-		currentUser, err := cfConfig.NewClient().Users().GetCurrent(cmd.Context())
+		currentUser, err := cfConfig.NewClient().Users().GetCurrent(ctx)
 		if err != nil {
 			return fmt.Errorf("failed to retrieve username from platform: %w", err)
 		}
 
-		log.G(cmd.Context()).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)
+		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)
+		return nil
+	}
+
+	if opts.gitProvider != nil {
+		return opts.gitProvider.VerifyToken(ctx, cfgit.PersonalToken, opts.InsCloneOpts.Auth.Password)
 	}
 
-	return cfgit.VerifyToken(cmd.Context(), opts.InsCloneOpts.Provider, opts.GitIntegrationRegistrationOpts.Token, cfgit.PersonalToken)
+	return nil
 }
 
 func getGitTokenFromUserInput(cmd *cobra.Command) error {

cmd/commands/git-source.go

@@ -811,7 +811,7 @@ func createDemoWorkflowTemplate(gsFs fs.FS) error {
 func createGithubExamplePipeline(opts *gitSourceGithubExampleOptions) error {
 	if !store.Get().SkipIngress {
 		// Create an ingress that will manage external access to the github eventsource service
-		ingress := createGithubExampleIngress(opts.ingressClass, opts.ingressHost, opts.hostName, opts.ingressController, opts.runtimeName)
+		ingress := createGithubExampleIngress(opts.ingressClass, opts.hostName, opts.ingressController, opts.runtimeName)
 		ingressFilePath := opts.gsFs.Join(opts.gsCloneOpts.Path(), store.Get().GithubExampleIngressFileName)
 
 		ingressRedundanded, err := cleanUpFieldsIngressGithub(&ingress)
@@ -864,7 +864,7 @@ func createGithubExamplePipeline(opts *gitSourceGithubExampleOptions) error {
 	return nil
 }
 
-func createGithubExampleIngress(ingressClass string, ingressHost string, hostName string, ingressController ingressutil.IngressController, runtimeName string) *netv1.Ingress {
+func createGithubExampleIngress(ingressClass string, hostName string, ingressController ingressutil.IngressController, runtimeName string) *netv1.Ingress {
 	ingressOptions := ingressutil.CreateIngressOptions{
 		Name:             store.Get().CodefreshDeliveryPipelines,
 		IngressClassName: ingressClass,

cmd/commands/integrations.go

@@ -41,8 +41,9 @@ type (
 )
 
 var gitProvidersByName = map[string]model.GitProviders{
-	"github": model.GitProvidersGithub,
-	"gitlab": model.GitProvidersGitlab,
+	"bitbucket-server": model.GitProvidersBitbucketServer,
+	"github":           model.GitProvidersGithub,
+	"gitlab":           model.GitProvidersGitlab,
 }
 
 func NewIntegrationCommand() *cobra.Command {
@@ -104,7 +105,7 @@ func NewGitIntegrationListCommand(client *sdk.AppProxyAPI) *cobra.Command {
 		Use:   "list",
 		Short: "List your git integrations",
 		Args:  cobra.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			if err := verifyOutputFormat(format, allowedFormats...); err != nil {
 				return err
 			}
@@ -223,7 +224,7 @@ func NewGitIntegrationAddCommand(client *sdk.AppProxyAPI) *cobra.Command {
 		},
 	}
 
-	cmd.Flags().StringVar(&provider, "provider", "github", "One of github|gitlab")
+	cmd.Flags().StringVar(&provider, "provider", "github", "One of bitbucket-server|github|gitlab")
 	cmd.Flags().StringVar(&apiURL, "api-url", "", "Git provider API Url")
 	cmd.Flags().BoolVar(&accountAdminsOnly, "account-admins-only", false,
 		"If true, this integration would only be visible to account admins (default: false)")

cmd/commands/pipeline.go

@@ -61,7 +61,7 @@ func NewPipelineGetCommand() *cobra.Command {
 
 			<BIN> pipeline -r runtime_name -N namespace -n pipeline_name
 		`),
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			ctx := cmd.Context()
 
 			return RunPipelineGet(ctx, name, namespace, runtime)
@@ -97,7 +97,7 @@ func NewPipelineListCommand() *cobra.Command {
 
 			<BIN> pipelines list -r <runtime>
 		`),
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			ctx := cmd.Context()
 
 			filterArgs := model.PipelinesFilterArgs{