refactor: rename bitbucket to bitbucket_cloud

ushiradineth · ushiradineth · commit 43e2a44b85f7 · 2025-11-18T19:44:49.000+05:30
Signed-off-by: Ushira Dineth &lt;ushiradineth@gmail.com&gt;
diff --git a/api/v1alpha1/commitstatus_types.go b/api/v1alpha1/commitstatus_types.go
@@ -48,7 +48,7 @@ type CommitStatusSpec struct {
 	Phase CommitStatusPhase `json:"phase"` // pending, success, failure
 	// (Github: error, failure, pending, success)
 	// (Gitlab: pending, running, success, failed, canceled)
-	// (Bitbucket: INPROGRESS, STOPPED, SUCCESSFUL, FAILED)
+	// (Bitbucket Cloud: INPROGRESS, STOPPED, SUCCESSFUL, FAILED)
 
 	// Url is a URL that the user can follow to see more details about the status
 	// +kubebuilder:validation:Optional
diff --git a/api/v1alpha1/common_types.go b/api/v1alpha1/common_types.go
@@ -28,7 +28,7 @@ type GitLab struct {
 	Domain string `json:"domain,omitempty"`
 }
 
-// Bitbucket is a Bitbucket SCM provider configuration. It is used to configure the Bitbucket settings.
+// Bitbucket is a Bitbucket Cloud SCM provider configuration. It is used to configure the Bitbucket Cloud settings.
 type Bitbucket struct{}
 
 // Forgejo is a Forgejo SCM provider configuration. It is used to configure the Forgejo settings.
@@ -94,7 +94,7 @@ type ForgejoRepo struct {
 	Name string `json:"name"`
 }
 
-// BitbucketRepo is a repository in Bitbucket, identified by its workspace and repository.
+// BitbucketRepo is a repository in Bitbucket Cloud, identified by its workspace and repository.
 type BitbucketRepo struct {
 	// Workspace is the workspace of the repository.
 	// +kubebuilder:validation:Required
diff --git a/api/v1alpha1/scmprovider_types.go b/api/v1alpha1/scmprovider_types.go
@@ -48,7 +48,7 @@ type ScmProviderSpec struct {
 	// Forgejo required configuration for Forgejo as the SCM provider
 	Forgejo *Forgejo `json:"forgejo,omitempty"`
 
-	// Bitbucket required configuration for Bitbucket as the SCM provider
+	// Bitbucket required configuration for Bitbucket Cloud as the SCM provider
 	Bitbucket *Bitbucket `json:"bitbucket,omitempty"`
 
 	// Fake required configuration for Fake as the SCM provider
diff --git a/config/crd/bases/promoter.argoproj.io_clusterscmproviders.yaml b/config/crd/bases/promoter.argoproj.io_clusterscmproviders.yaml
diff --git a/config/crd/bases/promoter.argoproj.io_gitrepositories.yaml b/config/crd/bases/promoter.argoproj.io_gitrepositories.yaml
diff --git a/config/crd/bases/promoter.argoproj.io_scmproviders.yaml b/config/crd/bases/promoter.argoproj.io_scmproviders.yaml
diff --git a/internal/controller/argocdcommitstatus_controller.go b/internal/controller/argocdcommitstatus_controller.go
@@ -45,7 +45,7 @@ import (
 	promoterv1alpha1 "github.com/argoproj-labs/gitops-promoter/api/v1alpha1"
 	"github.com/argoproj-labs/gitops-promoter/internal/git"
 	"github.com/argoproj-labs/gitops-promoter/internal/scms"
-	"github.com/argoproj-labs/gitops-promoter/internal/scms/bitbucket"
+	bitbucket_cloud "github.com/argoproj-labs/gitops-promoter/internal/scms/bitbucket_cloud"
 	"github.com/argoproj-labs/gitops-promoter/internal/scms/fake"
 	"github.com/argoproj-labs/gitops-promoter/internal/scms/forgejo"
 	"github.com/argoproj-labs/gitops-promoter/internal/scms/github"
@@ -739,10 +739,10 @@ func (r *ArgoCDCommitStatusReconciler) getGitAuthProvider(ctx context.Context, a
 		}
 		return gitlabClient, ps.Spec.RepositoryReference, nil
 	case scmProvider.GetSpec().Bitbucket != nil:
-		logger.V(4).Info("Creating Bitbucket git authentication provider")
-		bitbucketClient, err := bitbucket.NewBitbucketGitAuthenticationProvider(scmProvider, secret)
+		logger.V(4).Info("Creating Bitbucket Cloud git authentication provider")
+		bitbucketClient, err := bitbucket_cloud.NewBitbucketCloudGitAuthenticationProvider(scmProvider, secret)
 		if err != nil {
-			return nil, ps.Spec.RepositoryReference, fmt.Errorf("failed to create Bitbucket client: %w", err)
+			return nil, ps.Spec.RepositoryReference, fmt.Errorf("failed to create Bitbucket Cloud client: %w", err)
 		}
 		return bitbucketClient, ps.Spec.RepositoryReference, nil
 	case scmProvider.GetSpec().Forgejo != nil:
diff --git a/internal/controller/changetransferpolicy_controller.go b/internal/controller/changetransferpolicy_controller.go
@@ -30,7 +30,7 @@ import (
 
 	"github.com/argoproj-labs/gitops-promoter/internal/git"
 	"github.com/argoproj-labs/gitops-promoter/internal/scms"
-	"github.com/argoproj-labs/gitops-promoter/internal/scms/bitbucket"
+	bitbucket_cloud "github.com/argoproj-labs/gitops-promoter/internal/scms/bitbucket_cloud"
 	"github.com/argoproj-labs/gitops-promoter/internal/scms/fake"
 	"github.com/argoproj-labs/gitops-promoter/internal/scms/forgejo"
 	"github.com/argoproj-labs/gitops-promoter/internal/scms/github"
@@ -493,10 +493,10 @@ func (r *ChangeTransferPolicyReconciler) getGitAuthProvider(ctx context.Context,
 		logger.V(4).Info("Creating Forgejo git authentication provider")
 		return forgejo.NewForgejoGitAuthenticationProvider(scmProvider, secret), nil
 	case scmProvider.GetSpec().Bitbucket != nil:
-		logger.V(4).Info("Creating Bitbucket git authentication provider")
-		provider, err := bitbucket.NewBitbucketGitAuthenticationProvider(scmProvider, secret)
+		logger.V(4).Info("Creating Bitbucket Cloud git authentication provider")
+		provider, err := bitbucket_cloud.NewBitbucketCloudGitAuthenticationProvider(scmProvider, secret)
 		if err != nil {
-			return nil, fmt.Errorf("failed to create Bitbucket Auth Provider: %w", err)
+			return nil, fmt.Errorf("failed to create Bitbucket Cloud Auth Provider: %w", err)
 		}
 		return provider, nil
 	default:
diff --git a/internal/controller/commitstatus_controller.go b/internal/controller/commitstatus_controller.go
@@ -29,7 +29,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
-	"github.com/argoproj-labs/gitops-promoter/internal/scms/bitbucket"
+	bitbucket_cloud "github.com/argoproj-labs/gitops-promoter/internal/scms/bitbucket_cloud"
 	"github.com/argoproj-labs/gitops-promoter/internal/scms/fake"
 	"github.com/argoproj-labs/gitops-promoter/internal/scms/forgejo"
 	"github.com/argoproj-labs/gitops-promoter/internal/settings"
@@ -165,10 +165,10 @@ func (r *CommitStatusReconciler) getCommitStatusProvider(ctx context.Context, co
 		}
 		return p, nil
 	case scmProvider.GetSpec().Bitbucket != nil:
-		var p *bitbucket.CommitStatus
-		p, err = bitbucket.NewBitbucketCommitStatusProvider(r.Client, *secret, "")
+		var p *bitbucket_cloud.CommitStatus
+		p, err = bitbucket_cloud.NewBitbucketCloudCommitStatusProvider(r.Client, *secret, "")
 		if err != nil {
-			return nil, fmt.Errorf("failed to get Bitbucket provider with secret %q: %w", secret.Name, err)
+			return nil, fmt.Errorf("failed to get Bitbucket Cloud provider with secret %q: %w", secret.Name, err)
 		}
 		return p, nil
 	case scmProvider.GetSpec().Forgejo != nil:
diff --git a/internal/controller/pullrequest_controller.go b/internal/controller/pullrequest_controller.go
@@ -29,7 +29,7 @@ import (
 	promoterv1alpha1 "github.com/argoproj-labs/gitops-promoter/api/v1alpha1"
 	"github.com/argoproj-labs/gitops-promoter/internal/git"
 	"github.com/argoproj-labs/gitops-promoter/internal/scms"
-	"github.com/argoproj-labs/gitops-promoter/internal/scms/bitbucket"
+	bitbucket_cloud "github.com/argoproj-labs/gitops-promoter/internal/scms/bitbucket_cloud"
 	"github.com/argoproj-labs/gitops-promoter/internal/scms/fake"
 	"github.com/argoproj-labs/gitops-promoter/internal/scms/forgejo"
 	"github.com/argoproj-labs/gitops-promoter/internal/scms/github"
@@ -287,7 +287,7 @@ func (r *PullRequestReconciler) getPullRequestProvider(ctx context.Context, pr p
 	case scmProvider.GetSpec().GitLab != nil:
 		return gitlab.NewGitlabPullRequestProvider(r.Client, *secret, scmProvider.GetSpec().GitLab.Domain) //nolint:wrapcheck
 	case scmProvider.GetSpec().Bitbucket != nil:
-		return bitbucket.NewBitbucketPullRequestProvider(r.Client, *secret) //nolint:wrapcheck
+		return bitbucket_cloud.NewBitbucketCloudPullRequestProvider(r.Client, *secret) //nolint:wrapcheck
 	case scmProvider.GetSpec().Forgejo != nil:
 		return forgejo.NewForgejoPullRequestProvider(r.Client, *secret, scmProvider.GetSpec().Forgejo.Domain) //nolint:wrapcheck
 	case scmProvider.GetSpec().Fake != nil:
diff --git a/internal/scms/bitbucket_cloud/commit_status.go b/internal/scms/bitbucket_cloud/commit_status.go
@@ -1,4 +1,4 @@
-package bitbucket
+package bitbucket_cloud
 
 import (
 	"context"
@@ -19,16 +19,16 @@ import (
 	"github.com/argoproj-labs/gitops-promoter/internal/utils"
 )
 
-// CommitStatus implements the scms.CommitStatusProvider interface for Bitbucket.
+// CommitStatus implements the scms.CommitStatusProvider interface for Bitbucket Cloud.
 type CommitStatus struct {
 	client    *bitbucket.Client
 	k8sClient client.Client
 }
 
 var _ scms.CommitStatusProvider = &CommitStatus{}
 
-// NewBitbucketCommitStatusProvider creates a new instance of CommitStatus for Bitbucket.
-func NewBitbucketCommitStatusProvider(k8sClient client.Client, secret v1.Secret, domain string) (*CommitStatus, error) {
+// NewBitbucketCloudCommitStatusProvider creates a new instance of CommitStatus for Bitbucket Cloud.
+func NewBitbucketCloudCommitStatusProvider(k8sClient client.Client, secret v1.Secret, domain string) (*CommitStatus, error) {
 	client, err := GetClient(secret)
 	if err != nil {
 		return nil, err
diff --git a/internal/scms/bitbucket_cloud/git_operations.go b/internal/scms/bitbucket_cloud/git_operations.go
@@ -1,4 +1,4 @@
-package bitbucket
+package bitbucket_cloud
 
 import (
 	"context"
@@ -12,7 +12,7 @@ import (
 	"github.com/argoproj-labs/gitops-promoter/internal/scms"
 )
 
-// GitAuthenticationProvider implements the scms.GitOperationsProvider interface for Bitbucket.
+// GitAuthenticationProvider implements the scms.GitOperationsProvider interface for Bitbucket Cloud.
 type GitAuthenticationProvider struct {
 	scmProvider v1alpha1.GenericScmProvider
 	secret      *v1.Secret
@@ -21,11 +21,11 @@ type GitAuthenticationProvider struct {
 
 var _ scms.GitOperationsProvider = &GitAuthenticationProvider{}
 
-// NewBitbucketGitAuthenticationProvider creates a new instance of GitAuthenticationProvider for Bitbucket.
-func NewBitbucketGitAuthenticationProvider(scmProvider v1alpha1.GenericScmProvider, secret *v1.Secret) (*GitAuthenticationProvider, error) {
+// NewBitbucketCloudGitAuthenticationProvider creates a new instance of GitAuthenticationProvider for Bitbucket Cloud.
+func NewBitbucketCloudGitAuthenticationProvider(scmProvider v1alpha1.GenericScmProvider, secret *v1.Secret) (*GitAuthenticationProvider, error) {
 	client, err := GetClient(*secret)
 	if err != nil {
-		return nil, fmt.Errorf("failed to create Bitbucket Client: %w", err)
+		return nil, fmt.Errorf("failed to create Bitbucket Cloud Client: %w", err)
 	}
 
 	return &GitAuthenticationProvider{
@@ -35,7 +35,7 @@ func NewBitbucketGitAuthenticationProvider(scmProvider v1alpha1.GenericScmProvid
 	}, nil
 }
 
-// GetGitHttpsRepoUrl constructs the HTTPS URL for a Bitbucket repository based on the provided GitRepository object.
+// GetGitHttpsRepoUrl constructs the HTTPS URL for a Bitbucket Cloud repository based on the provided GitRepository object.
 func (GitAuthenticationProvider) GetGitHttpsRepoUrl(repo v1alpha1.GitRepository) string {
 	repoUrl := fmt.Sprintf("https://bitbucket.com/%s/%s.git", repo.Spec.Bitbucket.Workspace, repo.Spec.Bitbucket.Repository)
 	if _, err := url.Parse(repoUrl); err != nil {
@@ -44,17 +44,17 @@ func (GitAuthenticationProvider) GetGitHttpsRepoUrl(repo v1alpha1.GitRepository)
 	return repoUrl
 }
 
-// GetToken retrieves the Bitbucket access token from the secret.
+// GetToken retrieves the Bitbucket Cloud access token from the secret.
 func (bb GitAuthenticationProvider) GetToken(ctx context.Context) (string, error) {
 	return string(bb.secret.Data["token"]), nil
 }
 
-// GetUser returns a placeholder user for Bitbucket authentication.
+// GetUser returns a placeholder user for Bitbucket Cloud authentication.
 func (GitAuthenticationProvider) GetUser(ctx context.Context) (string, error) {
 	return "x-token-auth", nil
 }
 
-// GetClient creates a new Bitbucket client using the provided secret and domain.
+// GetClient creates a new Bitbucket Cloud client using the provided secret.
 func GetClient(secret v1.Secret) (*bitbucket.Client, error) {
 	token := string(secret.Data["token"])
 	if token == "" {
diff --git a/internal/scms/bitbucket_cloud/pullrequest.go b/internal/scms/bitbucket_cloud/pullrequest.go
@@ -1,4 +1,4 @@
-package bitbucket
+package bitbucket_cloud
 
 import (
 	"context"
@@ -20,16 +20,16 @@ import (
 	"github.com/argoproj-labs/gitops-promoter/internal/utils"
 )
 
-// PullRequest implements the scms.PullRequestProvider interface for Bitbucket.
+// PullRequest implements the scms.PullRequestProvider interface for Bitbucket Cloud.
 type PullRequest struct {
 	client    *bitbucket.Client
 	k8sClient client.Client
 }
 
 var _ scms.PullRequestProvider = &PullRequest{}
 
-// NewBitbucketPullRequestProvider creates a new instance of PullRequest for Bitbucket.
-func NewBitbucketPullRequestProvider(k8sClient client.Client, secret v1.Secret) (*PullRequest, error) {
+// NewBitbucketCloudPullRequestProvider creates a new instance of PullRequest for Bitbucket Cloud.
+func NewBitbucketCloudPullRequestProvider(k8sClient client.Client, secret v1.Secret) (*PullRequest, error) {
 	client, err := GetClient(secret)
 	if err != nil {
 		return nil, err
diff --git a/internal/scms/bitbucket_cloud/utils.go b/internal/scms/bitbucket_cloud/utils.go
@@ -1,11 +1,11 @@
-package bitbucket
+package bitbucket_cloud
 
 import (
 	"github.com/argoproj-labs/gitops-promoter/api/v1alpha1"
 )
 
-// phaseToBuildState converts a CommitStatusPhase to a Bitbucket build state.
-// Bitbucket states: SUCCESSFUL, FAILED, INPROGRESS, STOPPED
+// phaseToBuildState converts a CommitStatusPhase to a Bitbucket Cloud build state.
+// Bitbucket Cloud states: SUCCESSFUL, FAILED, INPROGRESS, STOPPED
 // https://developer.atlassian.com/cloud/bitbucket/rest/api-group-commit-statuses/#api-repositories-workspace-repo-slug-commit-commit-statuses-build-post-request-body
 func phaseToBuildState(phase v1alpha1.CommitStatusPhase) string {
 	switch phase {
@@ -18,8 +18,8 @@ func phaseToBuildState(phase v1alpha1.CommitStatusPhase) string {
 	}
 }
 
-// buildStateToPhase converts a Bitbucket build state to a CommitStatusPhase.
-// Bitbucket states: SUCCESSFUL, FAILED, INPROGRESS, STOPPED
+// buildStateToPhase converts a Bitbucket Cloud build state to a CommitStatusPhase.
+// Bitbucket Cloud states: SUCCESSFUL, FAILED, INPROGRESS, STOPPED
 // https://developer.atlassian.com/cloud/bitbucket/rest/api-group-commit-statuses/#api-repositories-workspace-repo-slug-commit-commit-statuses-build-post-request-body
 func buildStateToPhase(buildState string) v1alpha1.CommitStatusPhase {
 	switch buildState {

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ type GitLab struct {`
`28`	`28`	Domain string `json:"domain,omitempty"`
`29`	`29`	`}`
`30`	`30`
`31`		`-// Bitbucket is a Bitbucket SCM provider configuration. It is used to configure the Bitbucket settings.`
	`31`	`+// Bitbucket is a Bitbucket Cloud SCM provider configuration. It is used to configure the Bitbucket Cloud settings.`
`32`	`32`	`type Bitbucket struct{}`
`33`	`33`
`34`	`34`	`// Forgejo is a Forgejo SCM provider configuration. It is used to configure the Forgejo settings.`
`@@ -94,7 +94,7 @@ type ForgejoRepo struct {`
`94`	`94`	Name string `json:"name"`
`95`	`95`	`}`
`96`	`96`
`97`		`-// BitbucketRepo is a repository in Bitbucket, identified by its workspace and repository.`
	`97`	`+// BitbucketRepo is a repository in Bitbucket Cloud, identified by its workspace and repository.`
`98`	`98`	`type BitbucketRepo struct {`
`99`	`99`	`// Workspace is the workspace of the repository.`
`100`	`100`	`// +kubebuilder:validation:Required`