CR-13227-github-enterprise (#513)

ATGardner · web-flow · commit 285378dd2b62 · 2022-08-04T10:58:18.000+03:00
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION=v0.0.457
+VERSION=v0.0.458
 
 
 OUT_DIR=dist
diff --git a/cmd/commands/runtime_install.go b/cmd/commands/runtime_install.go
@@ -323,12 +323,13 @@ func ensureGitData(cmd *cobra.Command, opts *RuntimeInstallOptions) error {
 		return err
 	}
 
-	opts.gitProvider, err = cfgit.GetProvider(cfgit.ProviderType(opts.InsCloneOpts.Provider), opts.InsCloneOpts.Repo)
+	baseURL, _, _, _, _, _, _ := aputil.ParseGitUrl(opts.InsCloneOpts.Repo)
+	opts.gitProvider, err = cfgit.GetProvider(cfgit.ProviderType(opts.InsCloneOpts.Provider), baseURL)
 	if err != nil {
 		return err
 	}
 
-	if opts.gitProvider.Type() != cfgit.GITHUB_CLOUD && !opts.EnableGitProviders {
+	if opts.gitProvider.Type() != cfgit.GITHUB && !opts.EnableGitProviders {
 		return fmt.Errorf("Unsupported git provider type %s", opts.gitProvider.Type())
 	}
 
@@ -581,6 +582,7 @@ func runRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 
 	ingressControllerName := opts.IngressController.Name()
 
+	repoURL := opts.InsCloneOpts.URL()
 	token, iv, err := createRuntimeOnPlatform(ctx, &model.RuntimeInstallationArgs{
 		RuntimeName:         opts.RuntimeName,
 		Cluster:             server,
@@ -590,7 +592,7 @@ func runRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 		IngressClass:        &opts.IngressClass,
 		IngressController:   &ingressControllerName,
 		ComponentNames:      componentNames,
-		Repo:                &opts.InsCloneOpts.Repo,
+		Repo:                &repoURL,
 		Recover:             &opts.FromRepo,
 	})
 	handleCliStep(reporter.InstallStepCreateRuntimeOnPlatform, "Creating runtime on platform", err, false, true)
@@ -2074,8 +2076,8 @@ func ensureGitIntegrationOpts(opts *RuntimeInstallOptions) error {
 	}
 
 	opts.GitIntegrationCreationOpts.Provider = provider
-	apiUrl := opts.gitProvider.ApiUrl()
-	opts.GitIntegrationCreationOpts.APIURL = &apiUrl
+	baseURL := opts.gitProvider.BaseURL()
+	opts.GitIntegrationCreationOpts.APIURL = &baseURL
 
 	return nil
 }
diff --git a/docs/releases/release_notes.md b/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.457/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.458/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.457/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.458/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	github.com/Masterminds/semver/v3 v3.1.1
-	github.com/argoproj-labs/argocd-autopilot v0.4.2
+	github.com/argoproj-labs/argocd-autopilot v0.4.3
 	github.com/argoproj/applicationset v0.4.1
 	github.com/argoproj/argo-cd/v2 v2.4.6
 	github.com/argoproj/argo-events v0.17.1-0.20220327045437-70eaafe9afec
diff --git a/go.sum b/go.sum
@@ -154,8 +154,8 @@ github.com/antonmedv/expr v1.9.0/go.mod h1:5qsM3oLGDND7sDmQGDXHkYfkjYMUX14qsgqmH
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/appscode/go v0.0.0-20190808133642-1d4ef1f1c1e0/go.mod h1:iy07dV61Z7QQdCKJCIvUoDL21u6AIceRhZzyleh2ymc=
-github.com/argoproj-labs/argocd-autopilot v0.4.2 h1:lL8yU/cu5vqrIIpfVXwHzxbdCUQDlFw5V3YFQIbzxKs=
-github.com/argoproj-labs/argocd-autopilot v0.4.2/go.mod h1:FV6AIgKWXubDwGAZfPzwWpQLNOneVS78qWdDRJUnAII=
+github.com/argoproj-labs/argocd-autopilot v0.4.3 h1:Jbiu4sf6UGZPpLjiwFlntycgwTCkC0OTKPEntraQESg=
+github.com/argoproj-labs/argocd-autopilot v0.4.3/go.mod h1:FV6AIgKWXubDwGAZfPzwWpQLNOneVS78qWdDRJUnAII=
 github.com/argoproj/applicationset v0.4.1 h1:PzTn77TK7XQB3CdpCDPbwU4pQgip0x4qvuJQ8XiBk5E=
 github.com/argoproj/applicationset v0.4.1/go.mod h1:cJZ7CWG80kBII4QNalyAvSr8eVifo8jKkyXoVl9qXaA=
 github.com/argoproj/argo-cd/v2 v2.4.6 h1:n3Y0UaAUVbdd8tBpSzwpH3iuLtzAbK1hmGXyk7ueKT4=
diff --git a/manifests/runtime.yaml b/manifests/runtime.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   defVersion: 1.0.1
-  version: 0.0.457
+  version: 0.0.458
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events
diff --git a/pkg/git/provider.go b/pkg/git/provider.go
@@ -27,7 +27,7 @@ type (
 	// Provider represents a git provider
 	Provider interface {
 		Type() ProviderType
-		ApiUrl() string
+		BaseURL() string
 		VerifyToken(ctx context.Context, tokenType TokenType, token string) error
 		SupportsMarketplace() bool
 	}
@@ -41,29 +41,29 @@ const (
 var (
 	providers = map[ProviderType]func(string) (Provider, error){
 		BITBUCKET_SERVER: NewBitbucketServerProvider,
-		GITHUB_CLOUD:     NewGithubCloudProvider,
-		GITHUB_ENT:       NewGithubEnterpriseProvider,
+		GITHUB:           NewGithubProvider,
+		GITHUB_ENT:       NewGithubProvider, // for backward compatability
 		GITLAB:           NewGitlabProvider,
 	}
 )
 
-func GetProvider(providerType ProviderType, cloneURL string) (Provider, error) {
+func GetProvider(providerType ProviderType, baseURL string) (Provider, error) {
 	if providerType != "" {
 		fn := providers[providerType]
 		if fn == nil {
 			return nil, fmt.Errorf("invalid git provider %s", providerType)
 		}
 
-		return fn(cloneURL)
+		return fn(baseURL)
 	}
 
-	if strings.Contains(cloneURL, GITHUB_CLOUD_DOMAIN) {
-		return NewGithubCloudProvider(cloneURL)
+	if strings.Contains(baseURL, GITHUB_CLOUD_DOMAIN) {
+		return NewGithubProvider(baseURL)
 	}
 
-	if strings.Contains(cloneURL, GITLAB_CLOUD_DOMAIN) {
-		return NewGitlabProvider(cloneURL)
+	if strings.Contains(baseURL, GITLAB_CLOUD_DOMAIN) {
+		return NewGitlabProvider(baseURL)
 	}
 
-	return nil, fmt.Errorf("failed getting provider for clone url %s", cloneURL)
+	return nil, fmt.Errorf("failed getting provider for clone url %s", baseURL)
 }
diff --git a/pkg/git/provider_bitbucket-server.go b/pkg/git/provider_bitbucket-server.go
@@ -23,7 +23,8 @@ import (
 
 type (
 	bitbucketServer struct {
-		apiURL string
+		providerType ProviderType
+		apiURL       *url.URL
 	}
 )
 
@@ -32,24 +33,28 @@ const (
 	BITBUCKET_SERVER        ProviderType = "bitbucket-server"
 )
 
-func NewBitbucketServerProvider(cloneURL string) (Provider, error) {
-	u, err := url.Parse(cloneURL)
+func NewBitbucketServerProvider(baseURL string) (Provider, error) {
+	u, err := url.Parse(baseURL)
 	if err != nil {
 		return nil, err
 	}
 
-	u.Path = ""
+	u.Path = BITBUCKET_REST_ENDPOINT
 	return &bitbucketServer{
-		apiURL: u.String(),
+		providerType: BITBUCKET_SERVER,
+		apiURL:      u,
 	}, nil
 }
 
 func (bbs *bitbucketServer) Type() ProviderType {
-	return BITBUCKET_SERVER
+	return bbs.providerType
 }
 
-func (bbs *bitbucketServer) ApiUrl() string {
-	return bbs.apiURL
+func (bbs *bitbucketServer) BaseURL() string {
+	urlClone := *bbs.apiURL
+	urlClone.Path = ""
+	urlClone.RawQuery = ""
+	return urlClone.String()
 }
 
 func (bbs *bitbucketServer) VerifyToken(ctx context.Context, tokenType TokenType, token string) error {
diff --git a/pkg/git/provider_github.go b/pkg/git/provider_github.go
@@ -25,54 +25,57 @@ import (
 type (
 	github struct {
 		providerType ProviderType
-		apiURL       string
+		apiURL       *url.URL
 	}
 )
 
 const (
-	GITHUB_CLOUD_DOMAIN               = "github.com"
-	GITHUB_CLOUD_URL                  = "https://api.github.com"
-	GITHUB_REST_ENDPOINT              = "/api/v3"
-	GITHUB_CLOUD         ProviderType = "github"
-	GITHUB_ENT           ProviderType = "github-enterprise"
+	GITHUB_CLOUD_DOMAIN                = "github.com"
+	GITHUB_CLOUD_BASE_URL              = "https://github.com/"
+	GITHUB_CLOUD_API_URL               = "https://api.github.com"
+	GITHUB_REST_ENDPOINT               = "/api/v3"
+	GITHUB                ProviderType = "github"
+	GITHUB_ENT            ProviderType = "github-enterpeise" // for backward compatability
 )
 
 var requiredScopes = map[TokenType][]string{
 	RuntimeToken:  {"repo", "admin:repo_hook"},
 	PersonalToken: {"repo"},
 }
 
-func NewGithubCloudProvider(_ string) (Provider, error) {
-	return &github{
-		providerType: GITHUB_CLOUD,
-		apiURL:       GITHUB_CLOUD_URL,
-	}, nil
-}
+func NewGithubProvider(baseURL string) (Provider, error) {
+	if baseURL == GITHUB_CLOUD_BASE_URL {
+		baseURL = GITHUB_CLOUD_API_URL
+	}
 
-func NewGithubEnterpriseProvider(cloneURL string) (Provider, error) {
-	u, err := url.Parse(cloneURL)
+	u, err := url.Parse(baseURL)
 	if err != nil {
 		return nil, err
 	}
 
-	u.Path = ""
+	if baseURL != GITHUB_CLOUD_API_URL {
+		u.Path = GITHUB_REST_ENDPOINT
+	}
+
 	return &github{
-		providerType: GITHUB_ENT,
-		apiURL:       u.String(),
+		providerType: GITHUB,
+		apiURL:       u,
 	}, nil
 }
 
 func (g *github) Type() ProviderType {
 	return g.providerType
 }
 
-func (g *github) ApiUrl() string {
-	return g.apiURL
+func (g *github) BaseURL() string {
+	urlClone := *g.apiURL
+	urlClone.Path = ""
+	urlClone.RawQuery = ""
+	return urlClone.String()
 }
 
 func (g *github) VerifyToken(ctx context.Context, tokenType TokenType, token string) error {
-	fullURL := g.apiURL + GITHUB_REST_ENDPOINT
-	req, err := http.NewRequestWithContext(ctx, "HEAD", fullURL, nil)
+	req, err := http.NewRequestWithContext(ctx, "HEAD", g.apiURL.String(), nil)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/git/provider_gitlab.go b/pkg/git/provider_gitlab.go
@@ -24,7 +24,7 @@ import (
 type (
 	gitlab struct {
 		providerType ProviderType
-		apiURL       string
+		apiURL       *url.URL
 	}
 )
 
@@ -34,25 +34,28 @@ const (
 	GITLAB               ProviderType = "gitlab"
 )
 
-func NewGitlabProvider(cloneURL string) (Provider, error) {
-	u, err := url.Parse(cloneURL)
+func NewGitlabProvider(baseURL string) (Provider, error) {
+	u, err := url.Parse(baseURL)
 	if err != nil {
 		return nil, err
 	}
 
-	u.Path = ""
+	u.Path = GITLAB_REST_ENDPOINT
 	return &gitlab{
 		providerType: GITLAB,
-		apiURL:       u.String(),
+		apiURL:       u,
 	}, nil
 }
 
 func (g *gitlab) Type() ProviderType {
 	return g.providerType
 }
 
-func (g *gitlab) ApiUrl() string {
-	return g.apiURL
+func (g *gitlab) BaseURL() string {
+	urlClone := *g.apiURL
+	urlClone.Path = ""
+	urlClone.RawQuery = ""
+	return urlClone.String()
 }
 
 func (g *gitlab) VerifyToken(ctx context.Context, tokenType TokenType, token string) error {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION=v0.0.457`
	`1`	`+VERSION=v0.0.458`
`2`	`2`
`3`	`3`
`4`	`4`	`OUT_DIR=dist`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ type (`
`27`	`27`	`// Provider represents a git provider`
`28`	`28`	`Provider interface {`
`29`	`29`	`Type() ProviderType`
`30`		`- ApiUrl() string`
	`30`	`+ BaseURL() string`
`31`	`31`	`VerifyToken(ctx context.Context, tokenType TokenType, token string) error`
`32`	`32`	`SupportsMarketplace() bool`
`33`	`33`	`}`
`@@ -41,29 +41,29 @@ const (`
`41`	`41`	`var (`
`42`	`42`	`providers = map[ProviderType]func(string) (Provider, error){`
`43`	`43`	`BITBUCKET_SERVER: NewBitbucketServerProvider,`
`44`		`- GITHUB_CLOUD: NewGithubCloudProvider,`
`45`		`- GITHUB_ENT: NewGithubEnterpriseProvider,`
	`44`	`+ GITHUB: NewGithubProvider,`
	`45`	`+ GITHUB_ENT: NewGithubProvider, // for backward compatability`
`46`	`46`	`GITLAB: NewGitlabProvider,`
`47`	`47`	`}`
`48`	`48`	`)`
`49`	`49`
`50`		`-func GetProvider(providerType ProviderType, cloneURL string) (Provider, error) {`
	`50`	`+func GetProvider(providerType ProviderType, baseURL string) (Provider, error) {`
`51`	`51`	`if providerType != "" {`
`52`	`52`	`fn := providers[providerType]`
`53`	`53`	`if fn == nil {`
`54`	`54`	`return nil, fmt.Errorf("invalid git provider %s", providerType)`
`55`	`55`	`}`
`56`	`56`
`57`		`- return fn(cloneURL)`
	`57`	`+ return fn(baseURL)`
`58`	`58`	`}`
`59`	`59`
`60`		`- if strings.Contains(cloneURL, GITHUB_CLOUD_DOMAIN) {`
`61`		`- return NewGithubCloudProvider(cloneURL)`
	`60`	`+ if strings.Contains(baseURL, GITHUB_CLOUD_DOMAIN) {`
	`61`	`+ return NewGithubProvider(baseURL)`
`62`	`62`	`}`
`63`	`63`
`64`		`- if strings.Contains(cloneURL, GITLAB_CLOUD_DOMAIN) {`
`65`		`- return NewGitlabProvider(cloneURL)`
	`64`	`+ if strings.Contains(baseURL, GITLAB_CLOUD_DOMAIN) {`
	`65`	`+ return NewGitlabProvider(baseURL)`
`66`	`66`	`}`
`67`	`67`
`68`		`- return nil, fmt.Errorf("failed getting provider for clone url %s", cloneURL)`
	`68`	`+ return nil, fmt.Errorf("failed getting provider for clone url %s", baseURL)`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ import (`
`23`	`23`
`24`	`24`	`type (`
`25`	`25`	`bitbucketServer struct {`
`26`		`- apiURL string`
	`26`	`+ providerType ProviderType`
	`27`	`+ apiURL *url.URL`
`27`	`28`	`}`
`28`	`29`	`)`
`29`	`30`
`@@ -32,24 +33,28 @@ const (`
`32`	`33`	`BITBUCKET_SERVER ProviderType = "bitbucket-server"`
`33`	`34`	`)`
`34`	`35`
`35`		`-func NewBitbucketServerProvider(cloneURL string) (Provider, error) {`
`36`		`- u, err := url.Parse(cloneURL)`
	`36`	`+func NewBitbucketServerProvider(baseURL string) (Provider, error) {`
	`37`	`+ u, err := url.Parse(baseURL)`
`37`	`38`	`if err != nil {`
`38`	`39`	`return nil, err`
`39`	`40`	`}`
`40`	`41`
`41`		`- u.Path = ""`
	`42`	`+ u.Path = BITBUCKET_REST_ENDPOINT`
`42`	`43`	`return &bitbucketServer{`
`43`		`- apiURL: u.String(),`
	`44`	`+ providerType: BITBUCKET_SERVER,`
	`45`	`+ apiURL: u,`
`44`	`46`	`}, nil`
`45`	`47`	`}`
`46`	`48`
`47`	`49`	`func (bbs *bitbucketServer) Type() ProviderType {`
`48`		`- return BITBUCKET_SERVER`
	`50`	`+ return bbs.providerType`
`49`	`51`	`}`
`50`	`52`
`51`		`-func (bbs *bitbucketServer) ApiUrl() string {`
`52`		`- return bbs.apiURL`
	`53`	`+func (bbs *bitbucketServer) BaseURL() string {`
	`54`	`+ urlClone := *bbs.apiURL`
	`55`	`+ urlClone.Path = ""`
	`56`	`+ urlClone.RawQuery = ""`
	`57`	`+ return urlClone.String()`
`53`	`58`	`}`
`54`	`59`
`55`	`60`	`func (bbs *bitbucketServer) VerifyToken(ctx context.Context, tokenType TokenType, token string) error {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`	`type (`
`25`	`25`	`gitlab struct {`
`26`	`26`	`providerType ProviderType`
`27`		`- apiURL string`
	`27`	`+ apiURL *url.URL`
`28`	`28`	`}`
`29`	`29`	`)`
`30`	`30`
`@@ -34,25 +34,28 @@ const (`
`34`	`34`	`GITLAB ProviderType = "gitlab"`
`35`	`35`	`)`
`36`	`36`
`37`		`-func NewGitlabProvider(cloneURL string) (Provider, error) {`
`38`		`- u, err := url.Parse(cloneURL)`
	`37`	`+func NewGitlabProvider(baseURL string) (Provider, error) {`
	`38`	`+ u, err := url.Parse(baseURL)`
`39`	`39`	`if err != nil {`
`40`	`40`	`return nil, err`
`41`	`41`	`}`
`42`	`42`
`43`		`- u.Path = ""`
	`43`	`+ u.Path = GITLAB_REST_ENDPOINT`
`44`	`44`	`return &gitlab{`
`45`	`45`	`providerType: GITLAB,`
`46`		`- apiURL: u.String(),`
	`46`	`+ apiURL: u,`
`47`	`47`	`}, nil`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`func (g *gitlab) Type() ProviderType {`
`51`	`51`	`return g.providerType`
`52`	`52`	`}`
`53`	`53`
`54`		`-func (g *gitlab) ApiUrl() string {`
`55`		`- return g.apiURL`
	`54`	`+func (g *gitlab) BaseURL() string {`
	`55`	`+ urlClone := *g.apiURL`
	`56`	`+ urlClone.Path = ""`
	`57`	`+ urlClone.RawQuery = ""`
	`58`	`+ return urlClone.String()`
`56`	`59`	`}`
`57`	`60`
`58`	`61`	`func (g *gitlab) VerifyToken(ctx context.Context, tokenType TokenType, token string) error {`