diff --git a/cmd/mapt/cmd/aws/hosts/mac.go b/cmd/mapt/cmd/aws/hosts/mac.go index 3159dd95e..e946a7cf2 100644 --- a/cmd/mapt/cmd/aws/hosts/mac.go +++ b/cmd/mapt/cmd/aws/hosts/mac.go @@ -111,16 +111,18 @@ func getMacDestroy() *cobra.Command { } return mac.Destroy( &maptContext.ContextArgs{ - Context: cmd.Context(), - Debug: viper.IsSet(params.Debug), - DebugLevel: viper.GetUint(params.DebugLevel), - KeepState: viper.IsSet(params.KeepState), + Context: cmd.Context(), + Debug: viper.IsSet(params.Debug), + DebugLevel: viper.GetUint(params.DebugLevel), + ForceDestroy: viper.IsSet(params.ForceDestroy), + KeepState: viper.IsSet(params.KeepState), }, viper.GetString(awsParams.MACDHID)) }, } flagSet := pflag.NewFlagSet(params.DestroyCmdName, pflag.ExitOnError) flagSet.StringP(awsParams.MACDHID, "", "", awsParams.MACDHIDDesc) + flagSet.Bool(params.ForceDestroy, false, params.ForceDestroyDesc) flagSet.Bool(params.KeepState, false, params.KeepStateDesc) c.PersistentFlags().AddFlagSet(flagSet) err := c.MarkPersistentFlagRequired(awsParams.MACDHID) diff --git a/cmd/mapt/cmd/aws/hosts/rhel.go b/cmd/mapt/cmd/aws/hosts/rhel.go index b394918ee..3d8f6f9b6 100644 --- a/cmd/mapt/cmd/aws/hosts/rhel.go +++ b/cmd/mapt/cmd/aws/hosts/rhel.go @@ -97,18 +97,20 @@ func getRHELDestroy() *cobra.Command { return err } return rhel.Destroy(&maptContext.ContextArgs{ - Context: cmd.Context(), - ProjectName: viper.GetString(params.ProjectName), - BackedURL: viper.GetString(params.BackedURL), - Debug: viper.IsSet(params.Debug), - DebugLevel: viper.GetUint(params.DebugLevel), - Serverless: viper.IsSet(params.Serverless), - KeepState: viper.IsSet(params.KeepState), + Context: cmd.Context(), + ProjectName: viper.GetString(params.ProjectName), + BackedURL: viper.GetString(params.BackedURL), + Debug: viper.IsSet(params.Debug), + DebugLevel: viper.GetUint(params.DebugLevel), + Serverless: viper.IsSet(params.Serverless), + ForceDestroy: viper.IsSet(params.ForceDestroy), + KeepState: viper.IsSet(params.KeepState), }) }, } flagSet := pflag.NewFlagSet(params.DestroyCmdName, pflag.ExitOnError) flagSet.Bool(params.Serverless, false, params.ServerlessDesc) + flagSet.Bool(params.ForceDestroy, false, params.ForceDestroyDesc) flagSet.Bool(params.KeepState, false, params.KeepStateDesc) c.PersistentFlags().AddFlagSet(flagSet) return c diff --git a/cmd/mapt/cmd/aws/hosts/windows.go b/cmd/mapt/cmd/aws/hosts/windows.go index 32f736a2d..07c0b7d92 100644 --- a/cmd/mapt/cmd/aws/hosts/windows.go +++ b/cmd/mapt/cmd/aws/hosts/windows.go @@ -108,18 +108,20 @@ func getWindowsDestroy() *cobra.Command { return err } return windows.Destroy(&maptContext.ContextArgs{ - Context: cmd.Context(), - ProjectName: viper.GetString(params.ProjectName), - BackedURL: viper.GetString(params.BackedURL), - Debug: viper.IsSet(params.Debug), - DebugLevel: viper.GetUint(params.DebugLevel), - Serverless: viper.IsSet(params.Serverless), - KeepState: viper.IsSet(params.KeepState), + Context: cmd.Context(), + ProjectName: viper.GetString(params.ProjectName), + BackedURL: viper.GetString(params.BackedURL), + Debug: viper.IsSet(params.Debug), + DebugLevel: viper.GetUint(params.DebugLevel), + Serverless: viper.IsSet(params.Serverless), + ForceDestroy: viper.IsSet(params.ForceDestroy), + KeepState: viper.IsSet(params.KeepState), }) }, } flagSet := pflag.NewFlagSet(params.DestroyCmdName, pflag.ExitOnError) flagSet.Bool(params.Serverless, false, params.ServerlessDesc) + flagSet.Bool(params.ForceDestroy, false, params.ForceDestroyDesc) flagSet.Bool(params.KeepState, false, params.KeepStateDesc) c.PersistentFlags().AddFlagSet(flagSet) return c diff --git a/cmd/mapt/cmd/aws/services/eks.go b/cmd/mapt/cmd/aws/services/eks.go index dbf553901..4a4c7df1e 100644 --- a/cmd/mapt/cmd/aws/services/eks.go +++ b/cmd/mapt/cmd/aws/services/eks.go @@ -108,16 +108,18 @@ func getDestroyEKS() *cobra.Command { } return awsEKS.Destroy( &maptContext.ContextArgs{ - Context: cmd.Context(), - ProjectName: viper.GetString(params.ProjectName), - BackedURL: viper.GetString(params.BackedURL), - Debug: viper.IsSet(params.Debug), - DebugLevel: viper.GetUint(params.DebugLevel), - KeepState: viper.IsSet(params.KeepState), + Context: cmd.Context(), + ProjectName: viper.GetString(params.ProjectName), + BackedURL: viper.GetString(params.BackedURL), + Debug: viper.IsSet(params.Debug), + DebugLevel: viper.GetUint(params.DebugLevel), + ForceDestroy: viper.IsSet(params.ForceDestroy), + KeepState: viper.IsSet(params.KeepState), }) }, } flagSet := pflag.NewFlagSet(params.DestroyCmdName, pflag.ExitOnError) + flagSet.Bool(params.ForceDestroy, false, params.ForceDestroyDesc) flagSet.Bool(params.KeepState, false, params.KeepStateDesc) c.PersistentFlags().AddFlagSet(flagSet) return c diff --git a/cmd/mapt/cmd/aws/services/mac-pool.go b/cmd/mapt/cmd/aws/services/mac-pool.go index 756b4e7a1..5f01d772d 100644 --- a/cmd/mapt/cmd/aws/services/mac-pool.go +++ b/cmd/mapt/cmd/aws/services/mac-pool.go @@ -99,17 +99,19 @@ func destroyMP() *cobra.Command { return err } return macpool.Destroy(&maptContext.ContextArgs{ - Context: cmd.Context(), - ProjectName: viper.GetString(params.ProjectName), - BackedURL: viper.GetString(params.BackedURL), - Debug: viper.IsSet(params.Debug), - DebugLevel: viper.GetUint(params.DebugLevel), - KeepState: viper.IsSet(params.KeepState), + Context: cmd.Context(), + ProjectName: viper.GetString(params.ProjectName), + BackedURL: viper.GetString(params.BackedURL), + Debug: viper.IsSet(params.Debug), + DebugLevel: viper.GetUint(params.DebugLevel), + ForceDestroy: viper.IsSet(params.ForceDestroy), + KeepState: viper.IsSet(params.KeepState), }) }, } flagSet := pflag.NewFlagSet(params.CreateCmdName, pflag.ExitOnError) params.AddCommonFlags(flagSet) + flagSet.Bool(params.ForceDestroy, false, params.ForceDestroyDesc) flagSet.Bool(params.KeepState, false, params.KeepStateDesc) c.PersistentFlags().AddFlagSet(flagSet) return c diff --git a/cmd/mapt/cmd/aws/services/snc.go b/cmd/mapt/cmd/aws/services/snc.go index 5cbd4b254..1e738ab34 100644 --- a/cmd/mapt/cmd/aws/services/snc.go +++ b/cmd/mapt/cmd/aws/services/snc.go @@ -110,18 +110,20 @@ func destroySNC() *cobra.Command { return err } return openshiftsnc.Destroy(&maptContext.ContextArgs{ - Context: cmd.Context(), - ProjectName: viper.GetString(params.ProjectName), - BackedURL: viper.GetString(params.BackedURL), - Debug: viper.IsSet(params.Debug), - DebugLevel: viper.GetUint(params.DebugLevel), - Serverless: viper.IsSet(params.Serverless), - KeepState: viper.IsSet(params.KeepState), + Context: cmd.Context(), + ProjectName: viper.GetString(params.ProjectName), + BackedURL: viper.GetString(params.BackedURL), + Debug: viper.IsSet(params.Debug), + DebugLevel: viper.GetUint(params.DebugLevel), + Serverless: viper.IsSet(params.Serverless), + ForceDestroy: viper.IsSet(params.ForceDestroy), + KeepState: viper.IsSet(params.KeepState), }) }, } flagSet := pflag.NewFlagSet(params.DestroyCmdName, pflag.ExitOnError) flagSet.Bool(params.Serverless, false, params.ServerlessDesc) + flagSet.Bool(params.ForceDestroy, false, params.ForceDestroyDesc) flagSet.Bool(params.KeepState, false, params.KeepStateDesc) c.PersistentFlags().AddFlagSet(flagSet) return c