Delete app with DeletePropagationForeground

Co-authored-by: Georgi Sabev <[email protected]>
cloudfoundry · Jul 12, 2023 · 3ffaa2a · 3ffaa2a
1 parent fd94c44
commit 3ffaa2a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/api/repositories/app_repository.go b/api/repositories/app_repository.go
@@ -468,7 +468,10 @@ func (f *AppRepo) DeleteApp(ctx context.Context, authInfo authorization.Info, me
 		return fmt.Errorf("failed to build user client: %w", err)
 	}
 
-	return apierrors.FromK8sError(userClient.Delete(ctx, cfApp), AppResourceType)
+	return apierrors.FromK8sError(
+		userClient.Delete(ctx, cfApp, client.PropagationPolicy(metav1.DeletePropagationForeground)),
+		AppResourceType,
+	)
 }
 
 func (f *AppRepo) GetAppEnv(ctx context.Context, authInfo authorization.Info, appGUID string) (AppEnvRecord, error) {

diff --git a/api/repositories/app_repository_test.go b/api/repositories/app_repository_test.go
@@ -1202,8 +1202,9 @@ var _ = Describe("AppRepository", func() {
 
 		It("deletes the CFApp resource", func() {
 			Expect(deleteAppErr).NotTo(HaveOccurred())
-			_, err := appRepo.GetApp(testCtx, authInfo, appGUID)
-			Expect(err).To(matchers.WrapErrorAssignableToTypeOf(apierrors.NotFoundError{}))
+			app, err := appRepo.GetApp(testCtx, authInfo, appGUID)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(app.DeletedAt).To(PointTo(BeTemporally("~", time.Now(), 5*time.Second)))
 		})
 
 		When("the app doesn't exist", func() {