fix: cleans up resources on error

maistra · Sep 23, 2022 · 53338bb · 53338bb
1 parent 6fe4d7f
commit 53338bb
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/pkg/cmd/develop/cmd.go b/pkg/cmd/develop/cmd.go
@@ -184,6 +184,7 @@ func createDevelopNewCmd() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ns := cmd.Flag("namespace").Value.String()
 			client, err := dynclient.NewDefaultDynamicClient(ns, true)
+			defer deploymentCleanup(client)()
 			if err != nil {
 				return errors.Wrap(err, "Failed creating dynamic client")
 			}
@@ -198,10 +199,11 @@ func createDevelopNewCmd() *cobra.Command {
 				}
 
 				serviceName = codename.Generate(rng, 0)
-				fmt.Printf("generated name %s\n", serviceName)
-				if e := cmd.Parent().PersistentFlags().Set("deployment", serviceName+"-v1"); e != nil {
-					return errors.Wrapf(e, "Failed populating flags")
-				}
+				fmt.Printf("generated name %s\n", serviceName) // TODO switch to logger
+			}
+
+			if e := cmd.Parent().PersistentFlags().Set("deployment", serviceName+"-v1"); e != nil {
+				return errors.Wrapf(e, "Failed populating flags")
 			}
 
 			gateway := cmd.Flag("gateway").Value.String()
@@ -227,15 +229,6 @@ func createDevelopNewCmd() *cobra.Command {
 
 			return errors.Wrapf(cmd.Parent().RunE(cmd, args), "failed executing `ike develop` command from `ike develop new`")
 		},
-		PostRunE: func(cmd *cobra.Command, args []string) error {
-			ns := cmd.Flag("namespace").Value.String()
-			client, err := dynclient.NewDefaultDynamicClient(ns, true)
-			if err != nil {
-				return errors.Wrap(err, "Failed creating dynamic client")
-			}
-
-			return deploymentCleanup(client)()
-		},
 	}
 
 	newCmd.Flags().String("name", "", "defines service/deployment name. if none specified it will be autogenerated.")