From 4a03265dc2af6ac39fa78674e2a7f6bc991c4d49 Mon Sep 17 00:00:00 2001
From: shreyas-goenka <88374338+shreyas-goenka@users.noreply.github.com>
Date: Mon, 19 Jun 2023 12:31:07 +0200
Subject: [PATCH] Fix force flag not working for bundle destroy (#434)

## Changes
`--force` flag did not exist for `bundle destroy`. This PR adds that in.

## Tests
manually tested. Now adding the `--force` flag hijacks the deploy lock
on the target directory.
---
 cmd/bundle/deploy.go  | 6 +++---
 cmd/bundle/destroy.go | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cmd/bundle/deploy.go b/cmd/bundle/deploy.go
index 5ecc72d2..7dee32da 100644
--- a/cmd/bundle/deploy.go
+++ b/cmd/bundle/deploy.go
@@ -15,7 +15,7 @@ var deployCmd = &cobra.Command{
 		b := bundle.Get(cmd.Context())
 
 		// If `--force` is specified, force acquisition of the deployment lock.
-		b.Config.Bundle.Lock.Force = force
+		b.Config.Bundle.Lock.Force = forceDeploy
 
 		return bundle.Apply(cmd.Context(), b, bundle.Seq(
 			phases.Initialize(),
@@ -25,9 +25,9 @@ var deployCmd = &cobra.Command{
 	},
 }
 
-var force bool
+var forceDeploy bool
 
 func init() {
 	AddCommand(deployCmd)
-	deployCmd.Flags().BoolVar(&force, "force", false, "Force acquisition of deployment lock.")
+	deployCmd.Flags().BoolVar(&forceDeploy, "force", false, "Force acquisition of deployment lock.")
 }
diff --git a/cmd/bundle/destroy.go b/cmd/bundle/destroy.go
index 979f01a9..d0fe699a 100644
--- a/cmd/bundle/destroy.go
+++ b/cmd/bundle/destroy.go
@@ -22,7 +22,7 @@ var destroyCmd = &cobra.Command{
 		b := bundle.Get(ctx)
 
 		// If `--force` is specified, force acquisition of the deployment lock.
-		b.Config.Bundle.Lock.Force = force
+		b.Config.Bundle.Lock.Force = forceDestroy
 
 		// If `--auto-approve`` is specified, we skip confirmation checks
 		b.AutoApprove = autoApprove
@@ -51,8 +51,10 @@ var destroyCmd = &cobra.Command{
 }
 
 var autoApprove bool
+var forceDestroy bool
 
 func init() {
 	AddCommand(destroyCmd)
 	destroyCmd.Flags().BoolVar(&autoApprove, "auto-approve", false, "Skip interactive approvals for deleting resources and files")
+	destroyCmd.Flags().BoolVar(&forceDestroy, "force", false, "Force acquisition of deployment lock.")
 }