fixed the nil pointer issue for --approve -> --yes

Signed-off-by: Dipankar Das <65275144+dipankardas011@users.noreply.github.com>
ksctl · May 31, 2024 · 56c26c5 · 56c26c5
1 parent 838af7f
commit 56c26c5
Show file tree

Hide file tree

Showing 10 changed files with 402 additions and 403 deletions.
diff --git a/.github/workflows/test-mock.bkp.yml b/.github/workflows/test-mock.bkp.yml
diff --git a/.github/workflows/test-mock.yml b/.github/workflows/test-mock.yml
@@ -49,25 +49,24 @@ jobs:
           cd .\scripts
           .\builder.ps1
           cd C:\Users\runneradmin\AppData\Local\ksctl
-          .\ksctl.exe version
-
           echo "KSCTL_BIN=.\C:\Users\runneradmin\AppData\Local\ksctl\ksctl.exe" >> ${GITHUB_ENV}
+          ${{ env.KSCTL_BIN }} version
+
 
       - name: build ksctl linux
         if: ${{ matrix.os == 'ubuntu-latest' }}
         run: |
           make install_linux
-          ksctl version
-
           echo "KSCTL_BIN=ksctl" >> ${GITHUB_ENV}
+          ${{ env.KSCTL_BIN }} version
+
 
       - name: build ksctl macos
         if: ${{ matrix.os == 'macos-latest' }}
         run: |
           make install_macos_intel
-          ksctl version
-
           echo "KSCTL_BIN=ksctl" >> ${GITHUB_ENV}
+          ${{ env.KSCTL_BIN }} version
 
 
       - name: civo create

diff --git a/cli/cmd/addNodesHAAws.go b/cli/cmd/addNodesHAAws.go
@@ -41,7 +41,7 @@ ksctl create ha-aws add-nodes -n demo -r ap-south-1 -s store-local --noWP 3 --no
 		cli.Client.Metadata.K8sVersion = k8sVer
 		cli.Client.Metadata.StateLocation = consts.KsctlStore(storage)
 
-		if err := createApproval(ctx, log, cmd.Flags().Lookup("approve").Changed); err != nil {
+		if err := createApproval(ctx, log, cmd.Flags().Lookup("yes").Changed); err != nil {
 			log.Error(ctx, "createApproval", "Reason", err)
 			os.Exit(1)
 		}

diff --git a/cli/cmd/addNodesHAAzure.go b/cli/cmd/addNodesHAAzure.go
@@ -42,7 +42,7 @@ ksctl create ha-azure add-nodes -n demo -r eastus -s store-local --noWP 3 --node
 		cli.Client.Metadata.K8sVersion = k8sVer
 		cli.Client.Metadata.StateLocation = consts.KsctlStore(storage)
 
-		if err := createApproval(ctx, log, cmd.Flags().Lookup("approve").Changed); err != nil {
+		if err := createApproval(ctx, log, cmd.Flags().Lookup("yes").Changed); err != nil {
 			log.Error(ctx, "createApproval", "Reason", err)
 			os.Exit(1)
 		}

diff --git a/cli/cmd/addNodesHACivo.go b/cli/cmd/addNodesHACivo.go
@@ -42,7 +42,7 @@ ksctl create ha-civo add-nodes -n demo -r LON1 -s store-local --noWP 3 --nodeSiz
 		cli.Client.Metadata.IsHA = true
 		cli.Client.Metadata.StateLocation = consts.KsctlStore(storage)
 
-		if err := createApproval(ctx, log, cmd.Flags().Lookup("approve").Changed); err != nil {
+		if err := createApproval(ctx, log, cmd.Flags().Lookup("yes").Changed); err != nil {
 			log.Error(ctx, "createApproval", "Reason", err)
 			os.Exit(1)
 		}

diff --git a/cli/cmd/createCluster.go b/cli/cmd/createCluster.go
@@ -38,7 +38,7 @@ ksctl create-cluster ha-aws -n demo -r us-east-1 --bootstrap k3s -s store-local
 
 		SetDefaults(consts.CloudAws, consts.ClusterTypeHa)
 
-		createHA(ctx, log, cmd.Flags().Lookup("approve").Changed)
+		createHA(ctx, log, cmd.Flags().Lookup("yes").Changed)
 	},
 }
 
@@ -58,7 +58,7 @@ var createClusterAzure = &cobra.Command{
 
 		SetDefaults(consts.CloudAzure, consts.ClusterTypeMang)
 
-		createManaged(ctx, log, cmd.Flags().Lookup("approve").Changed)
+		createManaged(ctx, log, cmd.Flags().Lookup("yes").Changed)
 	},
 }
 
@@ -78,7 +78,7 @@ ksctl create-cluster civo <arguments to cloud provider>
 
 		SetDefaults(consts.CloudCivo, consts.ClusterTypeMang)
 
-		createManaged(ctx, log, cmd.Flags().Lookup("approve").Changed)
+		createManaged(ctx, log, cmd.Flags().Lookup("yes").Changed)
 	},
 }
 
@@ -98,7 +98,7 @@ ksctl create-cluster local <arguments to cloud provider>
 
 		SetDefaults(consts.CloudLocal, consts.ClusterTypeMang)
 
-		createManaged(ctx, log, cmd.Flags().Lookup("approve").Changed)
+		createManaged(ctx, log, cmd.Flags().Lookup("yes").Changed)
 	},
 }
 
@@ -118,7 +118,7 @@ ksctl create-cluster ha-civo <arguments to cloud provider>
 
 		SetDefaults(consts.CloudCivo, consts.ClusterTypeHa)
 
-		createHA(ctx, log, cmd.Flags().Lookup("approve").Changed)
+		createHA(ctx, log, cmd.Flags().Lookup("yes").Changed)
 	},
 }
 
@@ -138,7 +138,7 @@ var createClusterHAAzure = &cobra.Command{
 
 		SetDefaults(consts.CloudAzure, consts.ClusterTypeHa)
 
-		createHA(ctx, log, cmd.Flags().Lookup("approve").Changed)
+		createHA(ctx, log, cmd.Flags().Lookup("yes").Changed)
 	},
 }
 

diff --git a/cli/cmd/deleteCluster.go b/cli/cmd/deleteCluster.go
@@ -38,7 +38,7 @@ ksctl create-cluster azure <arguments to civo cloud provider>
 
 		SetDefaults(consts.CloudAzure, consts.ClusterTypeMang)
 
-		deleteManaged(ctx, log, cmd.Flags().Lookup("approve").Changed)
+		deleteManaged(ctx, log, cmd.Flags().Lookup("yes").Changed)
 	},
 }
 
@@ -58,7 +58,7 @@ ksctl delete-cluster civo
 
 		SetDefaults(consts.CloudCivo, consts.ClusterTypeMang)
 
-		deleteManaged(ctx, log, cmd.Flags().Lookup("approve").Changed)
+		deleteManaged(ctx, log, cmd.Flags().Lookup("yes").Changed)
 
 	},
 }
@@ -79,7 +79,7 @@ var deleteClusterHAAws = &cobra.Command{
 
 		SetDefaults(consts.CloudAws, consts.ClusterTypeHa)
 
-		deleteHA(ctx, log, cmd.Flags().Lookup("approve").Changed)
+		deleteHA(ctx, log, cmd.Flags().Lookup("yes").Changed)
 	},
 }
 
@@ -99,7 +99,7 @@ var deleteClusterHAAzure = &cobra.Command{
 
 		SetDefaults(consts.CloudAzure, consts.ClusterTypeHa)
 
-		deleteHA(ctx, log, cmd.Flags().Lookup("approve").Changed)
+		deleteHA(ctx, log, cmd.Flags().Lookup("yes").Changed)
 	},
 }
 
@@ -119,7 +119,7 @@ ksctl delete-cluster ha-civo <arguments to cloud provider>
 
 		SetDefaults(consts.CloudCivo, consts.ClusterTypeHa)
 
-		deleteHA(ctx, log, cmd.Flags().Lookup("approve").Changed)
+		deleteHA(ctx, log, cmd.Flags().Lookup("yes").Changed)
 	},
 }
 
@@ -139,7 +139,7 @@ ksctl delete-cluster local <arguments to local/Docker provider>
 
 		SetDefaults(consts.CloudLocal, consts.ClusterTypeMang)
 
-		deleteManaged(ctx, log, cmd.Flags().Lookup("approve").Changed)
+		deleteManaged(ctx, log, cmd.Flags().Lookup("yes").Changed)
 	},
 }
 

diff --git a/cli/cmd/deleteNodesHAAws.go b/cli/cmd/deleteNodesHAAws.go
@@ -38,7 +38,7 @@ ksctl delete-cluster ha-aws delete-nodes <arguments to cloud provider>
 		cli.Client.Metadata.K8sDistro = consts.KsctlKubernetes(distro)
 		cli.Client.Metadata.StateLocation = consts.KsctlStore(storage)
 
-		if err := deleteApproval(ctx, log, cmd.Flags().Lookup("approve").Changed); err != nil {
+		if err := deleteApproval(ctx, log, cmd.Flags().Lookup("yes").Changed); err != nil {
 			log.Error(ctx, "deleteApproval", "Reason", err)
 			os.Exit(1)
 		}

diff --git a/cli/cmd/deleteNodesHAAzure.go b/cli/cmd/deleteNodesHAAzure.go
@@ -38,7 +38,7 @@ ksctl delete-cluster ha-azure delete-nodes <arguments to cloud provider>
 		cli.Client.Metadata.K8sDistro = consts.KsctlKubernetes(distro)
 		cli.Client.Metadata.StateLocation = consts.KsctlStore(storage)
 
-		if err := deleteApproval(ctx, log, cmd.Flags().Lookup("approve").Changed); err != nil {
+		if err := deleteApproval(ctx, log, cmd.Flags().Lookup("yes").Changed); err != nil {
 			log.Error(ctx, "deleteApproval", "Reason", err)
 			os.Exit(1)
 		}

diff --git a/cli/cmd/deleteNodesHACivo.go b/cli/cmd/deleteNodesHACivo.go
@@ -36,7 +36,7 @@ ksctl delete-cluster ha-civo delete-nodes <arguments to cloud provider>
 		cli.Client.Metadata.K8sDistro = consts.KsctlKubernetes(distro)
 		cli.Client.Metadata.StateLocation = consts.KsctlStore(storage)
 
-		if err := deleteApproval(ctx, log, cmd.Flags().Lookup("approve").Changed); err != nil {
+		if err := deleteApproval(ctx, log, cmd.Flags().Lookup("yes").Changed); err != nil {
 			log.Error(ctx, "deleteApproval", "Reason", err)
 			os.Exit(1)
 		}