feat: cleanup bootstrapped infra by OliverTrautvetter · Pull Request #185 · codesphere-cloud/oms

OliverTrautvetter · 2026-02-10T09:31:18Z

Add the ability to clean up the infrastructure I created with oms beta bootstrap-gcp , so that no manual cleanup is required.

Clickup

Signed-off-by: OliverTrautvetter <66372584+OliverTrautvetter@users.noreply.github.com>

…phere-cloud/oms into cleanup_bootstrapped_infra

Copilot

Pull request overview

Adds a new bootstrap-gcp cleanup CLI subcommand to delete OMS-bootstrapped GCP projects (optionally cleaning up OMS-created DNS records), aiming to remove the need for manual teardown.

Changes:

Add oms beta bootstrap-gcp cleanup command with --project-id, --force, and --skip-dns-cleanup flags.
Label newly created GCP projects with oms-managed=true and add client methods to verify/delete OMS-managed projects and delete OMS DNS records.
Add docs and initial test scaffolding for the cleanup functionality.

Reviewed changes

Copilot reviewed 8 out of 8 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
`internal/bootstrap/gcp/gcp_client.go`	Adds OMS-managed labeling on project creation and implements delete/verification/DNS cleanup client methods.
`internal/bootstrap/gcp/mocks.go`	Updates generated mock to include new GCP client manager methods.
`internal/bootstrap/gcp/gcp_client_cleanup_test.go`	Adds new tests around constants/formatting (currently not exercising new production code paths).
`cli/cmd/bootstrap_gcp_cleanup.go`	Implements the new cleanup subcommand behavior (infra file loading, verification/prompt, DNS cleanup, project deletion).
`cli/cmd/bootstrap_gcp_cleanup_test.go`	Adds tests for opts defaults and flag wiring for the new command.
`cli/cmd/bootstrap_gcp.go`	Registers the new `cleanup` subcommand under `bootstrap-gcp`.
`docs/oms-cli_beta_bootstrap-gcp_cleanup.md`	Documents the new cleanup command and flags.
`docs/oms-cli_beta_bootstrap-gcp.md`	Adds the cleanup subcommand to the bootstrap-gcp docs index.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

cli/cmd/bootstrap_gcp_cleanup.go

internal/bootstrap/gcp/gcp_client.go

cli/cmd/bootstrap_gcp_cleanup.go

internal/bootstrap/gcp/gcp_client_cleanup_test.go

cli/cmd/bootstrap_gcp_cleanup_test.go

…ling

…d generation

Copilot

Pull request overview

Copilot reviewed 8 out of 8 changed files in this pull request and generated 4 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

docs/oms-cli_beta_bootstrap-gcp_cleanup.md

internal/bootstrap/gcp/gcp_client_cleanup_test.go

cli/cmd/bootstrap_gcp_cleanup.go

Signed-off-by: OliverTrautvetter <66372584+OliverTrautvetter@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 8 out of 8 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

cli/cmd/bootstrap_gcp_cleanup_test.go

… and confirmation logic

Signed-off-by: OliverTrautvetter <66372584+OliverTrautvetter@users.noreply.github.com>

…g improvements

…infra

Signed-off-by: OliverTrautvetter <66372584+OliverTrautvetter@users.noreply.github.com>

…phere-cloud/oms into cleanup_bootstrapped_infra

Signed-off-by: OliverTrautvetter <66372584+OliverTrautvetter@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 10 out of 10 changed files in this pull request and generated 6 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

internal/bootstrap/gcp/gcp_client.go

cli/cmd/bootstrap_gcp_cleanup.go

cli/cmd/bootstrap_gcp_cleanup_test.go

internal/bootstrap/gcp/gcp_client_cleanup_test.go

cli/cmd/bootstrap_gcp_cleanup.go

Signed-off-by: OliverTrautvetter <66372584+OliverTrautvetter@users.noreply.github.com>

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Signed-off-by: OliverTrautvetter <66372584+OliverTrautvetter@users.noreply.github.com>

cli/cmd/bootstrap_gcp_cleanup.go

internal/bootstrap/gcp/gcp_client.go

cli/cmd/bootstrap_gcp_cleanup.go

Signed-off-by: OliverTrautvetter <66372584+OliverTrautvetter@users.noreply.github.com>

NautiluX · 2026-03-05T13:44:20Z

cli/cmd/bootstrap_gcp_cleanup.go

+			Example: `  # Clean up using project ID from the local infra file
+  oms-cli beta bootstrap-gcp cleanup
+
+  # Clean up a specific project
+  oms-cli beta bootstrap-gcp cleanup --project-id my-project-abc123
+
+  # Force cleanup without confirmation (skips OMS-managed check)
+  oms-cli beta bootstrap-gcp cleanup --project-id my-project-abc123 --force
+
+  # Skip DNS record cleanup
+  oms-cli beta bootstrap-gcp cleanup --skip-dns-cleanup
+
+  # Clean up with manual DNS settings (when infra file is not available)
+  oms-cli beta bootstrap-gcp cleanup --project-id my-project --base-domain example.com --dns-zone-name my-zone --dns-project-id dns-project`,
+		},


should use the example util so you don't need to think about the oms-cli or oms binary name

NautiluX · 2026-03-05T13:48:53Z

cli/cmd/bootstrap_gcp_cleanup.go

+	state, err := c.resolveCleanupConfig(deps)
+	if err != nil {
+		return fmt.Errorf("failed to resolve cleanup configuration: %w", err)
+	}
+
+	err = c.verifyAndConfirm(deps, state)
+	if err != nil {
+		return err
+	}
+
+	if !c.Opts.SkipDNSCleanup && state.baseDomain != "" && state.dnsZoneName != "" {
+		err = deps.StepLogger.Step("Clean up DNS records", func() error {
+			return deps.GCPClient.DeleteDNSRecordSets(state.dnsProjectID, state.dnsZoneName, state.baseDomain)
+		})
+		if err != nil {
+			log.Printf("Warning: DNS cleanup failed: %v", err)
+			log.Printf("You may need to manually delete DNS records for %s in project %s", state.baseDomain, state.dnsProjectID)
+		}
+	} else if !c.Opts.SkipDNSCleanup {
+		log.Printf("Skipping DNS cleanup: missing base domain or DNS zone name (provide --base-domain/--dns-zone-name or use --skip-dns-cleanup)")
+	}
+
+	err = deps.StepLogger.Step("Delete GCP project", func() error {
+		return deps.GCPClient.DeleteProject(state.projectID)
+	})
+	if err != nil {
+		return fmt.Errorf("failed to delete project: %w", err)
+	}
+
+	c.removeLocalInfraFile(deps, state)
+
+	log.Println("\nGCP project cleanup completed successfully!")
+	log.Printf("Project '%s' has been scheduled for deletion.", state.projectID)
+	log.Printf("Note: GCP projects are retained for 30 days before permanent deletion. You can restore the project within this period from the GCP Console.")
+
+	return nil


I think this function could look a bit simpler if you moved the 3 steps verify, dns cleanup, project deletion in their own functions each, in the best case each not taking an argument but instead on a struct that knows the "state", or as methods of the state struct. Then each step would become something like

err = deps.StepLogger.Step("Delete GCP project", state.DeleteProject) if err != nil { ... }

NautiluX · 2026-03-05T13:49:50Z

cli/cmd/bootstrap_gcp_cleanup.go

+
+	if !c.Opts.SkipDNSCleanup && state.baseDomain != "" && state.dnsZoneName != "" {
+		err = deps.StepLogger.Step("Clean up DNS records", func() error {
+			return deps.GCPClient.DeleteDNSRecordSets(state.dnsProjectID, state.dnsZoneName, state.baseDomain)


this part is now missing the service account of the project that became permissions to do DNS stuff on the dnsproject

NautiluX · 2026-03-05T13:54:16Z

cli/cmd/bootstrap_gcp_cleanup.go

+
+// resolveCleanupConfig loads the infra file (if needed) and determines the project ID
+// and DNS settings from flags and/or the infra file.
+func (c *BootstrapGcpCleanupCmd) resolveCleanupConfig(deps *CleanupDeps) (*cleanupState, error) {


lots of else ifs in this function, I think it would be helpful to split it up so you can turn some of them into returns and reduce the complexity. (cyclomatic complexity here is 16)

OliverTrautvetter added 7 commits February 3, 2026 15:56

feat: add cleanup command to bootstrap

9f1eee8

feat: update cleanup command

f1a09cb

Merge branch 'main' into cleanup_bootstrapped_infra

539a590

ref: mockery

382e896

chore(docs): Auto-update docs and licenses

9cfbd1e

Signed-off-by: OliverTrautvetter <66372584+OliverTrautvetter@users.noreply.github.com>

test: add tests for new cleanup

f20991b

Merge branch 'cleanup_bootstrapped_infra' of https://github.com/codes…

5b7220f

…phere-cloud/oms into cleanup_bootstrapped_infra

OliverTrautvetter requested a review from Copilot February 10, 2026 10:22

Copilot started reviewing on behalf of OliverTrautvetter February 10, 2026 10:22 View session

Copilot AI reviewed Feb 10, 2026

View reviewed changes

OliverTrautvetter added 2 commits February 10, 2026 12:42

ref: enhance cleanup command with dependency injection and error hand…

5508d73

…ling

ref: add utility functions for OMS-managed label checks and DNS recor…

4f32c3f

…d generation

OliverTrautvetter requested a review from Copilot February 10, 2026 12:17

Copilot started reviewing on behalf of OliverTrautvetter February 10, 2026 12:18 View session

Copilot AI reviewed Feb 10, 2026

View reviewed changes

OliverTrautvetter added 2 commits February 10, 2026 13:37

ref: enhance GCP cleanup command with project ID handling

ec12723

chore(docs): Auto-update docs and licenses

bb57d56

Signed-off-by: OliverTrautvetter <66372584+OliverTrautvetter@users.noreply.github.com>

OliverTrautvetter requested a review from Copilot February 10, 2026 12:51

Copilot started reviewing on behalf of OliverTrautvetter February 10, 2026 12:52 View session

Copilot AI reviewed Feb 10, 2026

View reviewed changes

cli/cmd/bootstrap_gcp_cleanup_test.go Outdated Show resolved Hide resolved

OliverTrautvetter added 2 commits February 10, 2026 14:03

ref: remove redundant file existence check in cleanup command

3e923af

fix: error handling in EnableAPIs method for GCPClient

f362c2a

OliverTrautvetter requested review from a team and siherrmann and removed request for a team February 11, 2026 12:14

OliverTrautvetter added 4 commits February 16, 2026 10:35

ref: streamline GCP cleanup process with improved infra file handling…

8f23960

… and confirmation logic

ref: improve error messages for GCP infra file handling

22df9dd

Merge branch 'main' into cleanup_bootstrapped_infra

e2e1117

chore(docs): Auto-update docs and licenses

424cb1e

Signed-off-by: OliverTrautvetter <66372584+OliverTrautvetter@users.noreply.github.com>

OliverTrautvetter marked this pull request as ready for review February 16, 2026 10:07

OliverTrautvetter added 6 commits February 20, 2026 09:28

feat: enhance GCP cleanup command with DNS settings and error handlin…

84adde4

…g improvements

Merge remote-tracking branch 'origin/main' into cleanup_bootstrapped_…

6c12790

…infra

fix: merge error

bd05188

chore(docs): Auto-update docs and licenses

deef455

Signed-off-by: OliverTrautvetter <66372584+OliverTrautvetter@users.noreply.github.com>

ref: consolidate infrastructure file loading into a single function

ca4b2c3

Merge branch 'cleanup_bootstrapped_infra' of https://github.com/codes…

9d89e67

…phere-cloud/oms into cleanup_bootstrapped_infra

OliverTrautvetter removed the request for review from siherrmann February 24, 2026 09:43

OliverTrautvetter added 3 commits February 24, 2026 12:22

fix: add DNSProjectID option for GCP cleanup command

8c95a6c

chore(docs): Auto-update docs and licenses

285b82a

Signed-off-by: OliverTrautvetter <66372584+OliverTrautvetter@users.noreply.github.com>

Merge branch 'main' into cleanup_bootstrapped_infra

11efdea

OliverTrautvetter requested a review from Copilot February 24, 2026 12:25

Copilot started reviewing on behalf of OliverTrautvetter February 24, 2026 12:26 View session

Copilot AI reviewed Feb 24, 2026

View reviewed changes

OliverTrautvetter and others added 8 commits February 26, 2026 11:58

fix: typo

328063a

chore(docs): Auto-update docs and licenses

92a9b24

Signed-off-by: OliverTrautvetter <66372584+OliverTrautvetter@users.noreply.github.com>

Update cli/cmd/bootstrap_gcp_cleanup.go

ae0cca0

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update cli/cmd/bootstrap_gcp_cleanup.go

94a8952

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update internal/bootstrap/gcp/gcp_client_cleanup_test.go

91018a9

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update cli/cmd/bootstrap_gcp_cleanup_test.go

37b4390

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

fix: cleanup

8dd311b

chore(docs): Auto-update docs and licenses

a528af5

Signed-off-by: OliverTrautvetter <66372584+OliverTrautvetter@users.noreply.github.com>

OliverTrautvetter requested a review from NautiluX March 2, 2026 09:31

NautiluX reviewed Mar 2, 2026

View reviewed changes

cli/cmd/bootstrap_gcp_cleanup.go Outdated Show resolved Hide resolved

internal/bootstrap/gcp/gcp_client.go Outdated Show resolved Hide resolved

internal/bootstrap/gcp/gcp_client.go Outdated Show resolved Hide resolved

cli/cmd/bootstrap_gcp_cleanup.go Outdated Show resolved Hide resolved

OliverTrautvetter added 5 commits March 4, 2026 11:22

ref: simplify code

d8eff57

chore(docs): Auto-update docs and licenses

f2e7e1b

Signed-off-by: OliverTrautvetter <66372584+OliverTrautvetter@users.noreply.github.com>

fix: clean

06569c1

Merge branch 'main' into cleanup_bootstrapped_infra

c9bccc2

chore(docs): Auto-update docs and licenses

e5c59a0

Signed-off-by: OliverTrautvetter <66372584+OliverTrautvetter@users.noreply.github.com>

OliverTrautvetter requested a review from NautiluX March 4, 2026 10:50

NautiluX reviewed Mar 5, 2026

View reviewed changes

Conversation

OliverTrautvetter commented Feb 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

NautiluX Mar 5, 2026

Choose a reason for hiding this comment

Uh oh!

NautiluX Mar 5, 2026

Choose a reason for hiding this comment

Uh oh!

NautiluX Mar 5, 2026

Choose a reason for hiding this comment

Uh oh!

NautiluX Mar 5, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

OliverTrautvetter commented Feb 10, 2026 •

edited

Loading