add (infra-provider) credential detection for cluster deletion (#603)

vmware-tanzu · May 25, 2021 · 8e5fa83 · 8e5fa83
1 parent f63751b
commit 8e5fa83
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/cli/pkg/standalone-cluster/delete.go b/cli/pkg/standalone-cluster/delete.go
@@ -16,13 +16,14 @@ import (
 )
 
 type teardownStandaloneOptions struct {
-	force bool
-	skip  bool
+	force      bool
+	skip       bool
+	configFile string
 }
 
 // DeleteCmd deletes a standalone workload cluster.
 var DeleteCmd = &cobra.Command{
-	Use:   "delete <cluster name>",
+	Use:   "delete <cluster name> -f <config file>",
 	Short: "delete a standalone workload cluster",
 	PreRunE: func(cmd *cobra.Command, args []string) (err error) {
 		return nil
@@ -36,7 +37,8 @@ var DeleteCmd = &cobra.Command{
 var tso = teardownStandaloneOptions{}
 
 func init() {
-	DeleteCmd.Flags().BoolVarP(&tso.force, "force", "f", false, "Force delete")
+	DeleteCmd.Flags().StringVarP(&tso.configFile, "config", "f", "", "Cluster configuration file")
+	DeleteCmd.Flags().BoolVar(&tso.force, "force", false, "Force delete")
 	DeleteCmd.Flags().BoolVarP(&tso.skip, "yes", "y", false, "Delete workload cluster without asking for confirmation")
 }
 
@@ -71,9 +73,10 @@ func teardown(cmd *cobra.Command, args []string) error {
 
 	// delete a new standlone cluster
 	teardownRegionOpts := tkgctl.DeleteRegionOptions{
-		ClusterName: clusterName,
-		Force:       tso.force,
-		SkipPrompt:  tso.skip,
+		ClusterName:   clusterName,
+		Force:         tso.force,
+		SkipPrompt:    tso.skip,
+		ClusterConfig: tso.configFile,
 	}
 
 	err = c.DeleteStandalone(teardownRegionOpts)

diff --git a/go.mod b/go.mod
@@ -31,8 +31,8 @@ replace (
 	// github.com/vmware-tanzu-private/core => ../../vmware-tanzu-private/core
 	github.com/vmware-tanzu-private/core => github.com/vmware-tanzu-private/core v1.3.1-0.20210524231710-aaa4fe81d0e3
 	// github.com/vmware-tanzu-private/tanzu-cli-tkg-plugins => ../../vmware-tanzu-private/tanzu-cli-tkg-plugins
+	github.com/vmware-tanzu-private/tkg-cli => github.com/vmware-tanzu-private/tkg-cli v1.3.1-0.20210525051804-aecf8ddffda7
 	// github.com/vmware-tanzu-private/tkg-cli => ../../vmware-tanzu-private/tkg-cli
-	github.com/vmware-tanzu-private/tkg-cli => github.com/vmware-tanzu-private/tkg-cli v1.3.1-0.20210524231343-b0dd61093e8d
 	// github.com/vmware-tanzu-private/tkg-providers => ../../vmware-tanzu-private/tkg-providers
 	github.com/vmware-tanzu-private/tkg-providers => github.com/vmware-tanzu-private/tkg-providers v1.3.1-0.20210422215837-027482ef8765
 

diff --git a/go.sum b/go.sum
@@ -1342,6 +1342,10 @@ github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYp
 github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI=
 github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
 github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec/go.mod h1:wPlfmglZmRWMYv/qJy3P+fK/UnoQB5ISk4txfNd9tDo=
+github.com/vmware-tanzu-private/core v1.3.1-0.20210524181536-6510d9ff7974 h1:yX8XKPIY0A/2FqGy4JzVSyabO7sj6jyOMotTAWNyjwo=
+github.com/vmware-tanzu-private/core v1.3.1-0.20210524181536-6510d9ff7974/go.mod h1:w7vyUrDtTZWYIyxOG5DqQuNQLbo40lGqr99LPJfJnj8=
+github.com/vmware-tanzu-private/tkg-cli v1.3.1-0.20210525051804-aecf8ddffda7 h1:6aaIGoW3QEMTarQIHmtRbEc5deRoZKJ80vIcC6KRx/8=
+github.com/vmware-tanzu-private/tkg-cli v1.3.1-0.20210525051804-aecf8ddffda7/go.mod h1:o1RK/zC9s2WAcsIqhZWNDiJPmXg4SLBHkOlXG95A6Gs=
 github.com/vmware-tanzu-private/core v1.3.1-0.20210524231710-aaa4fe81d0e3 h1:oKVJvWNUjrHVBaAF5sTv9GXEHDhsYVjRKIfbGqXRGRI=
 github.com/vmware-tanzu-private/core v1.3.1-0.20210524231710-aaa4fe81d0e3/go.mod h1:bFSx4RPTeC/8ha6G/sIV6kWr0tpHgfShHVLI50YdRl4=
 github.com/vmware-tanzu-private/tkg-cli v1.3.1-0.20210524231343-b0dd61093e8d h1:aHjP5bkCwIefZidMEzQjl+4q8y8zVi9f78aZE/+CJJQ=