fix(pipeline): update Bitbucket URL handling (#2400)

Previously, when users `git clone`d their Bitbucket repos with SSH, the URL was not being appropriate parsed and reconstructed, leading to invalid URLs in their pipeline manifests and pipelines that wouldn't build.

This fixes that bug (#2395), and also reformats the generated URL. 

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

Author: huanjani

internal/pkg/cli/pipeline_init.go

@@ -60,7 +60,7 @@ const (
 	// For a Bitbucket repository.
 	bbURL           = "bitbucket.org"
 	defaultBBBranch = "main"
-	fmtBBRepoURL    = "https://%s@%s/%s/%s" // Ex: "https://repoOwner@bitbucket.org/repoOwner/repoName
+	fmtBBRepoURL    = "https://%s/%s/%s" // Ex: "https://bitbucket.org/repoOwner/repoName"
 )
 
 var (
@@ -365,7 +365,8 @@ func (o *initPipelineOpts) selectURL() error {
 // https	https://git-codecommit.us-west-2.amazonaws.com/v1/repos/aws-sample (fetch)
 // fed		codecommit::us-west-2://aws-sample (fetch)
 // ssh		ssh://git-codecommit.us-west-2.amazonaws.com/v1/repos/aws-sample (push)
-// bb		https://huanjani@bitbucket.org/huanjani/aws-copilot-sample-service.git (fetch)
+// bbhttps	https://huanjani@bitbucket.org/huanjani/aws-copilot-sample-service.git (fetch)
+// bbssh	ssh://git@bitbucket.org:teamsinspace/documentation-tests.git (fetch)
 
 // parseGitRemoteResults returns just the trimmed middle column (url) of the `git remote -v` results,
 // and skips urls from unsupported sources.
@@ -452,14 +453,19 @@ func (url ccRepoURL) parse() (ccRepoDetails, error) {
 	}, nil
 }
 
+// Bitbucket URLs, post-parseGitRemoteResults(), may look like:
+// https://username@bitbucket.org/teamsinspace/documentation-tests
+// ssh://git@bitbucket.org:teamsinspace/documentation-tests
 func (url bbRepoURL) parse() (bbRepoDetails, error) {
 	urlString := string(url)
 	splitURL := strings.Split(urlString, "/")
 	if len(splitURL) < 2 {
 		return bbRepoDetails{}, fmt.Errorf("unable to parse the Bitbucket repository name from %s", url)
 	}
 	repoName := splitURL[len(splitURL)-1]
-	repoOwner := splitURL[len(splitURL)-2]
+	// rather than check for the SSH prefix, split on colon here; HTTPS version will be unaffected.
+	splitRepoOwner := strings.Split(splitURL[len(splitURL)-2], ":")
+	repoOwner := splitRepoOwner[len(splitRepoOwner)-1]
 
 	return bbRepoDetails{
 		name:  repoName,
@@ -610,7 +616,7 @@ func (o *initPipelineOpts) pipelineProvider() (manifest.Provider, error) {
 		}
 	case manifest.BitbucketProviderName:
 		config = &manifest.BitbucketProperties{
-			RepositoryURL: fmt.Sprintf(fmtBBRepoURL, o.repoOwner, bbURL, o.repoOwner, o.repoName),
+			RepositoryURL: fmt.Sprintf(fmtBBRepoURL, bbURL, o.repoOwner, o.repoName),
 			Branch:        o.repoBranch,
 		}
 	default:

internal/pkg/cli/pipeline_init_test.go

@@ -1112,7 +1112,7 @@ func TestInitPipelineGHRepoURL_parse(t *testing.T) {
 		expectedDetails ghRepoDetails
 		expectedError   error
 	}{
-		"matches repo name without .git suffix": {
+		"successfully parses name without .git suffix": {
 			inRepoURL: "https://github.com/badgoose/cli",
 
 			expectedDetails: ghRepoDetails{
@@ -1121,7 +1121,7 @@ func TestInitPipelineGHRepoURL_parse(t *testing.T) {
 			},
 			expectedError: nil,
 		},
-		"matches repo name with .git suffix": {
+		"successfully parses repo name with .git suffix": {
 			inRepoURL: "https://github.com/koke/grit.git",
 
 			expectedDetails: ghRepoDetails{
@@ -1159,7 +1159,7 @@ func TestInitPipelineCCRepoURL_parse(t *testing.T) {
 		expectedDetails ccRepoDetails
 		expectedError   error
 	}{
-		"matches with https url": {
+		"successfully parses https url": {
 			inRepoURL: "https://git-codecommit.sa-east-1.amazonaws.com/v1/repos/aws-sample",
 
 			expectedDetails: ccRepoDetails{
@@ -1168,7 +1168,7 @@ func TestInitPipelineCCRepoURL_parse(t *testing.T) {
 			},
 			expectedError: nil,
 		},
-		"matches with ssh url": {
+		"successfully parses ssh url": {
 			inRepoURL: "ssh://git-codecommit.us-east-2.amazonaws.com/v1/repos/aws-sample",
 
 			expectedDetails: ccRepoDetails{
@@ -1177,7 +1177,7 @@ func TestInitPipelineCCRepoURL_parse(t *testing.T) {
 			},
 			expectedError: nil,
 		},
-		"matches with federated (GRC) url": {
+		"successfully parses federated (GRC) url": {
 			inRepoURL: "codecommit::us-gov-west-1://aws-sample",
 
 			expectedDetails: ccRepoDetails{
@@ -1210,9 +1210,18 @@ func TestInitPipelineBBRepoURL_parse(t *testing.T) {
 		expectedDetails bbRepoDetails
 		expectedError   error
 	}{
-		"matches with https url": {
+		"successfully parses https url": {
 			inRepoURL: "https://huanjani@bitbucket.org/huanjani/aws-copilot-sample-service",
 
+			expectedDetails: bbRepoDetails{
+				name:  "aws-copilot-sample-service",
+				owner: "huanjani",
+			},
+			expectedError: nil,
+		},
+		"successfully parses ssh url": {
+			inRepoURL: "ssh://git@bitbucket.org:huanjani/aws-copilot-sample-service",
+
 			expectedDetails: bbRepoDetails{
 				name:  "aws-copilot-sample-service",
 				owner: "huanjani",

internal/pkg/deploy/cloudformation/pipeline_test.go

@@ -77,7 +77,7 @@ func TestCloudFormation_CreatePipeline(t *testing.T) {
 		AppName: "kudos",
 		Name:    "cicd",
 		Source: &deploy.BitbucketSource{
-			RepositoryURL: "https://aws@bitbucket.org/aws/somethingCool",
+			RepositoryURL: "https://bitbucket.org/aws/somethingCool",
 			ProviderName:  "Bitbucket",
 			Branch:        "main",
 		},

internal/pkg/deploy/cloudformation/stack/bb_pipeline_integration_test.go

@@ -25,7 +25,7 @@ func TestBB_Pipeline_Template(t *testing.T) {
 		Name:    "phonetool-pipeline",
 		Source: &deploy.BitbucketSource{
 			ProviderName:  manifest.BitbucketProviderName,
-			RepositoryURL: "https://huanjani@bitbucket.org/huanjani/sample",
+			RepositoryURL: "https://bitbucket.org/huanjani/sample",
 			Branch:        "main",
 		},
 		Build: deploy.PipelineBuildFromManifest(nil),

internal/pkg/deploy/pipeline.go

@@ -27,8 +27,8 @@ var (
 	ghRepoExp = regexp.MustCompile(`(https:\/\/github\.com\/|)(?P<owner>.+)\/(?P<repo>.+)`)
 	// Ex: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/aws-sample/browse
 	ccRepoExp = regexp.MustCompile(`(https:\/\/(?P<region>.+).console.aws.amazon.com\/codesuite\/codecommit\/repositories\/(?P<repo>.+)(\/browse))`)
-	// Ex: https://repoOwner@bitbucket.org/repoOwner/repoName
-	bbRepoExp = regexp.MustCompile(`(https:\/\/(.+)@bitbucket.org\/)(?P<owner>.+)\/(?P<repo>.+)`)
+	// Ex: https://bitbucket.org/repoOwner/repoName
+	bbRepoExp = regexp.MustCompile(`(https:\/\/bitbucket.org\/)(?P<owner>.+)\/(?P<repo>.+)`)
 )
 
 // CreatePipelineInput represents the fields required to deploy a pipeline.
@@ -60,7 +60,7 @@ type CreatePipelineInput struct {
 // Build represents CodeBuild project used in the CodePipeline
 // to build and test Docker image.
 type Build struct {
-	// The URI that identifies the Docker image to use for this build project. 
+	// The URI that identifies the Docker image to use for this build project.
 	Image string
 }