Maidn/maidn-cli
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

feat: onboard canonical E2E sources #55

Merged
eding merged 2 commits from feat/canonical-e2e-onboarding into main 2026-09-15 20:32:44 +02:00
Conversation 0 Commits 2 Files changed 5 +3 -10
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 11f9271fd0 - Show all commits

9
internal/bootstrap/onboard.go
View file

@ -20,8 +20,6 @@ type onboardingRepoManager interface {
EnsureProtectedBranch(string, string) error
PublishDeliveryBranch(string, string, string, string, func(string) error) (bool, error)
EnsurePullRequest(string, string, string, string) error
HasOpenPullRequest(string, string) (bool, error)
MergePullRequest(string, string) error
PublishRepositoryPullRequest(string, string, string, string, func(string) error) (bool, error)
EnsureWebhook(string, string, string) error
TriggerWebhookTest(string, string, string) error
@ -80,13 +78,6 @@ func OnboardApp(cfg config.Config, sourceDir string) error {
return err
}
}
if open, err := sourceManager.HasOpenPullRequest(repository, deliveryBranch); err != nil {
return err
} else if open {
if err := sourceManager.MergePullRequest(repository, deliveryBranch); err != nil {
return err
}
}
registrationBranch := "maidn/register-" + resolved.Delivery.AppName
clusterManager := newOnboardingRepoManager(resolved.Git.BaseURL, resolved.Git.Token, resolved.Git.Owner, resolved.Git.Username, "", "", resolved.Flux.Branch, "")

4
internal/bootstrap/onboard_test.go
View file

@ -311,12 +311,14 @@ func TestOnboardAppUsesCanonicalSourceAndExecutionClusterManagers(t *testing.T)
"remote https://git.example.test/Maidn/maidn-e2e-web.git:production",
"protect Maidn/maidn-e2e-web:production",
"delivery https://git.example.test/Maidn/maidn-e2e-web.git:maidn/delivery-web-ui",
"open-pr Maidn/maidn-e2e-web:maidn/delivery-web-ui",
} {
if !strings.Contains(sourceCalls, want) {
t.Fatalf("source manager calls = %q, missing %q", sourceCalls, want)
}
}
if strings.Contains(sourceCalls, "merge-pr") {
t.Fatalf("source delivery PR was merged without review: %q", sourceCalls)
}
if got := strings.Join(clusterManager.calls, "\n"); got != "register test-org-2/cluster:maidn/register-web-ui" {
t.Fatalf("cluster manager calls = %q", got)
}