Add test for delete --prev-app

Signed-off-by: Neil Hickey <nhickey@vmware.com>
carvel-dev · May 11, 2022 · e169905 · e169905
1 parent 5a898a8
commit e169905
Showing 1 changed file with 52 additions and 3 deletions.
diff --git a/test/e2e/create_update_delete_test.go b/test/e2e/create_update_delete_test.go
@@ -140,15 +140,32 @@ data:
   key: value
 `
 
+	yaml3 := `
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: example-service
+spec:
+  ports:
+  - port: 6381
+    targetPort: 6381
+  selector:
+    app: example-app
+    tier: backend
+---
+`
+
 	appName := "test-create-update-delete-prev-app"
 	prevAppName := "test-create-update-delete-prev-app-old"
 	cleanUp := func() {
-		kapp.Run([]string{"delete", "-a", appName, "--prev-app", prevAppName})
+		kapp.Run([]string{"delete", "-a", appName})
+		kapp.Run([]string{"delete", "-a", prevAppName})
 		os.Unsetenv("KAPP_FQ_CONFIGMAP_NAMES")
 	}
 
 	cleanUp()
-	defer cleanUp()
+	// defer cleanUp()
 
 	logger.Section("non-existent app, non-existent prevApp", func() {
 		// creates app with name appName
@@ -243,6 +260,37 @@ data:
 		os.Setenv("KAPP_FQ_CONFIGMAP_NAMES", "True")
 		cleanUp()
 	})
+
+	logger.Section("delete migrated prevApp", func() {
+		os.Setenv("KAPP_FQ_CONFIGMAP_NAMES", "True")
+		kapp.RunWithOpts([]string{"deploy", "-f", "-", "-a", appName}, RunOpts{IntoNs: true, StdinReader: strings.NewReader(yaml1)})
+
+		kapp.Run([]string{"delete", "-a", "empty-app", "--prev-app", appName})
+
+		NewMissingClusterResource(t, "configmap", appName, env.Namespace, kubectl)
+		cleanUp()
+	})
+
+	logger.Section("delete unmigrated prevApp", func() {
+		kapp.RunWithOpts([]string{"deploy", "-f", "-", "-a", appName}, RunOpts{IntoNs: true, StdinReader: strings.NewReader(yaml1)})
+
+		kapp.Run([]string{"delete", "-a", "empty-app", "--prev-app", appName})
+
+		NewMissingClusterResource(t, "configmap", appName, env.Namespace, kubectl)
+		cleanUp()
+	})
+
+	// delete with --app and --prev-app existing should only delete --app and not --prev-app
+	logger.Section("delete ignores prevApp", func() {
+		kapp.RunWithOpts([]string{"deploy", "-f", "-", "-a", appName}, RunOpts{IntoNs: true, StdinReader: strings.NewReader(yaml1)})
+		kapp.RunWithOpts([]string{"deploy", "-f", "-", "-a", prevAppName}, RunOpts{IntoNs: true, StdinReader: strings.NewReader(yaml3)})
+
+		kapp.Run([]string{"delete", "-a", appName, "--prev-app", prevAppName})
+
+		NewMissingClusterResource(t, "configmap", appName, env.Namespace, kubectl)
+		NewPresentClusterResource("configmap", prevAppName, env.Namespace, kubectl)
+		cleanUp()
+	})
 }
 
 func TestCreateUpdateDelete_PrevApp_FQConfigmap_Enabled(t *testing.T) {
@@ -293,7 +341,8 @@ data:
 	appName := "test-create-update-delete-prev-app-fq-configmap"
 	prevAppName := "test-create-update-delete-prev-app-fq-configmap-old"
 	cleanUp := func() {
-		kapp.Run([]string{"delete", "-a", appName, "--prev-app", prevAppName})
+		kapp.Run([]string{"delete", "-a", appName})
+		kapp.Run([]string{"delete", "-a", prevAppName})
 		os.Unsetenv("KAPP_FQ_CONFIGMAP_NAMES")
 	}