Skip to content

Commit 80a0465

Browse files
committed
feat(scm): wire Bitbucket provider to controllers
Signed-off-by: Ushira Dineth <[email protected]>
1 parent d63e8c6 commit 80a0465

File tree

3 files changed

+19
-0
lines changed

3 files changed

+19
-0
lines changed

internal/controller/changetransferpolicy_controller.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030

3131
"github.com/argoproj-labs/gitops-promoter/internal/git"
3232
"github.com/argoproj-labs/gitops-promoter/internal/scms"
33+
"github.com/argoproj-labs/gitops-promoter/internal/scms/bitbucket"
3334
"github.com/argoproj-labs/gitops-promoter/internal/scms/fake"
3435
"github.com/argoproj-labs/gitops-promoter/internal/scms/forgejo"
3536
"github.com/argoproj-labs/gitops-promoter/internal/scms/github"
@@ -491,6 +492,13 @@ func (r *ChangeTransferPolicyReconciler) getGitAuthProvider(ctx context.Context,
491492
case scmProvider.GetSpec().Forgejo != nil:
492493
logger.V(4).Info("Creating Forgejo git authentication provider")
493494
return forgejo.NewForgejoGitAuthenticationProvider(scmProvider, secret), nil
495+
case scmProvider.GetSpec().Bitbucket != nil:
496+
logger.V(4).Info("Creating Bitbucket git authentication provider")
497+
provider, err := bitbucket.NewBitbucketGitAuthenticationProvider(scmProvider, secret)
498+
if err != nil {
499+
return nil, fmt.Errorf("failed to create Bitbucket Auth Provider: %w", err)
500+
}
501+
return provider, nil
494502
default:
495503
return nil, errors.New("no supported git authentication provider found")
496504
}

internal/controller/commitstatus_controller.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
"sigs.k8s.io/controller-runtime/pkg/builder"
3030
"sigs.k8s.io/controller-runtime/pkg/predicate"
3131

32+
"github.com/argoproj-labs/gitops-promoter/internal/scms/bitbucket"
3233
"github.com/argoproj-labs/gitops-promoter/internal/scms/fake"
3334
"github.com/argoproj-labs/gitops-promoter/internal/scms/forgejo"
3435
"github.com/argoproj-labs/gitops-promoter/internal/settings"
@@ -163,6 +164,13 @@ func (r *CommitStatusReconciler) getCommitStatusProvider(ctx context.Context, co
163164
return nil, fmt.Errorf("failed to get GitLab provider for domain %q with secret %q: %w", scmProvider.GetSpec().GitLab.Domain, secret.Name, err)
164165
}
165166
return p, nil
167+
case scmProvider.GetSpec().Bitbucket != nil:
168+
var p *bitbucket.CommitStatus
169+
p, err = bitbucket.NewBitbucketCommitStatusProvider(r.Client, *secret, "")
170+
if err != nil {
171+
return nil, fmt.Errorf("failed to get Bitbucket provider with secret %q: %w", secret.Name, err)
172+
}
173+
return p, nil
166174
case scmProvider.GetSpec().Forgejo != nil:
167175
var p *forgejo.CommitStatus
168176
p, err = forgejo.NewForgejoCommitStatusProvider(r.Client, scmProvider, *secret)

internal/controller/pullrequest_controller.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
promoterv1alpha1 "github.com/argoproj-labs/gitops-promoter/api/v1alpha1"
3030
"github.com/argoproj-labs/gitops-promoter/internal/git"
3131
"github.com/argoproj-labs/gitops-promoter/internal/scms"
32+
"github.com/argoproj-labs/gitops-promoter/internal/scms/bitbucket"
3233
"github.com/argoproj-labs/gitops-promoter/internal/scms/fake"
3334
"github.com/argoproj-labs/gitops-promoter/internal/scms/forgejo"
3435
"github.com/argoproj-labs/gitops-promoter/internal/scms/github"
@@ -285,6 +286,8 @@ func (r *PullRequestReconciler) getPullRequestProvider(ctx context.Context, pr p
285286
return github.NewGithubPullRequestProvider(ctx, r.Client, scmProvider, *secret, gitRepository.Spec.GitHub.Owner) //nolint:wrapcheck
286287
case scmProvider.GetSpec().GitLab != nil:
287288
return gitlab.NewGitlabPullRequestProvider(r.Client, *secret, scmProvider.GetSpec().GitLab.Domain) //nolint:wrapcheck
289+
case scmProvider.GetSpec().Bitbucket != nil:
290+
return bitbucket.NewBitbucketPullRequestProvider(r.Client, *secret) //nolint:wrapcheck
288291
case scmProvider.GetSpec().Forgejo != nil:
289292
return forgejo.NewForgejoPullRequestProvider(r.Client, *secret, scmProvider.GetSpec().Forgejo.Domain) //nolint:wrapcheck
290293
case scmProvider.GetSpec().Fake != nil:

0 commit comments

Comments
 (0)