From 70956a061f632972a3189d7da809f0f0b68e40e8 Mon Sep 17 00:00:00 2001
From: Young Bu Park <youngp@microsoft.com>
Date: Thu, 10 Nov 2022 14:08:24 -0800
Subject: [PATCH 01/10] reduce the concurrency to 1

---
 build/test.mk                        |  2 +-
 test/functional/corerp/corerptest.go | 29 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/build/test.mk b/build/test.mk
index 20a4dfb2a0..514b2a7f6d 100644
--- a/build/test.mk
+++ b/build/test.mk
@@ -37,7 +37,7 @@ test-functional-kubernetes: ## Runs Kubernetes functional tests
 	CGO_ENABLED=1 go test ./test/functional/kubernetes/... -timeout ${TEST_TIMEOUT} -v -parallel 5 $(GOTEST_OPTS)
 
 test-functional-corerp: ## Runs Applications.Core functional tests
-	CGO_ENABLED=1 go test ./test/functional/corerp/... -timeout ${TEST_TIMEOUT} -v -parallel 5 $(GOTEST_OPTS)
+	CGO_ENABLED=1 go test ./test/functional/corerp/... -timeout ${TEST_TIMEOUT} -v -parallel 1 $(GOTEST_OPTS)
 
 test-functional-ucp: ## Runs UCP functional tests
 	CGO_ENABLED=1 go test ./test/functional/ucp/... -timeout ${TEST_TIMEOUT} -v -parallel 5 $(GOTEST_OPTS)
diff --git a/test/functional/corerp/corerptest.go b/test/functional/corerp/corerptest.go
index 2d7294b7a3..24bd61eb16 100644
--- a/test/functional/corerp/corerptest.go
+++ b/test/functional/corerp/corerptest.go
@@ -275,22 +275,21 @@ func (ct CoreRPTest) Test(t *testing.T) {
 	// Cleanup code here will run regardless of pass/fail of subtests
 	for _, step := range ct.Steps {
 		// Delete AWS resources if they were created
-		if step.AWSResources == nil || len(step.AWSResources.Resources) == 0 {
-			continue
-		}
-		for _, resource := range step.AWSResources.Resources {
-			t.Logf("deleting %s", resource.Name)
-			err := validation.DeleteAWSResource(ctx, t, &resource, ct.Options.AWSClient)
-			require.NoErrorf(t, err, "failed to delete %s", resource.Name)
-			t.Logf("finished deleting %s", ct.Description)
-
-			t.Logf("validating deletion of AWS resource for %s", ct.Description)
-			validation.ValidateNoAWSResource(ctx, t, &resource, ct.Options.AWSClient)
-			t.Logf("finished validation of deletion of AWS resource %s for %s", resource.Name, ct.Description)
-		}
+		if step.AWSResources != nil && len(step.AWSResources.Resources) > 0 {
+			for _, resource := range step.AWSResources.Resources {
+				t.Logf("deleting %s", resource.Name)
+				err := validation.DeleteAWSResource(ctx, t, &resource, ct.Options.AWSClient)
+				require.NoErrorf(t, err, "failed to delete %s", resource.Name)
+				t.Logf("finished deleting %s", ct.Description)
+
+				t.Logf("validating deletion of AWS resource for %s", ct.Description)
+				validation.ValidateNoAWSResource(ctx, t, &resource, ct.Options.AWSClient)
+				t.Logf("finished validation of deletion of AWS resource %s for %s", resource.Name, ct.Description)
+			}
 
-		if (step.CoreRPResources == nil && step.SkipKubernetesOutputResourceValidation) || step.SkipResourceDeletion {
-			continue
+			if (step.CoreRPResources == nil && step.SkipKubernetesOutputResourceValidation) || step.SkipResourceDeletion {
+				continue
+			}
 		}
 
 		for _, resource := range step.CoreRPResources.Resources {

From 0c449b48e6f716870801e6863f44b7e65103d94d Mon Sep 17 00:00:00 2001
From: Young Bu Park <youngp@microsoft.com>
Date: Thu, 10 Nov 2022 14:22:12 -0800
Subject: [PATCH 02/10] fix test secret handling

---
 test/functional/corerp/corerptest.go | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/test/functional/corerp/corerptest.go b/test/functional/corerp/corerptest.go
index 24bd61eb16..f94a8e3ac3 100644
--- a/test/functional/corerp/corerptest.go
+++ b/test/functional/corerp/corerptest.go
@@ -207,12 +207,18 @@ func (ct CoreRPTest) Test(t *testing.T) {
 		}
 	})
 
+	t.Logf("Creating secrets if provided")
+    err := ct.CreateSecrets(ctx)
+    if err != nil {
+        t.Errorf("failed to create secrets %v", err)
+    }
+
 	// Inside the integration test code we rely on the context for timeout/cancellation functionality.
 	// We expect the caller to wire this out to the test timeout system, or a stricter timeout if desired.
 
 	require.GreaterOrEqual(t, len(ct.Steps), 1, "at least one step is required")
 	defer ct.CleanUpExtensionResources(ct.InitialResources)
-	err := ct.CreateInitialResources(ctx)
+	err = ct.CreateInitialResources(ctx)
 	require.NoError(t, err, "failed to create initial resources")
 
 	success := true
@@ -308,6 +314,12 @@ func (ct CoreRPTest) Test(t *testing.T) {
 		}
 	}
 
+	t.Logf("Deleting secrets")
+    err = ct.DeleteSecrets(ctx)
+    if err != nil {
+        t.Errorf("failed to delete secrets %v", err)
+    }
+
 	// Custom verification is expected to use `t` to trigger its own assertions
 	if ct.PostDeleteVerify != nil {
 		t.Logf("running post-delete verification for %s", ct.Description)

From be39d077bfc2cedcafee253865ea5e030efac3fe Mon Sep 17 00:00:00 2001
From: Young Bu Park <youngp@microsoft.com>
Date: Thu, 10 Nov 2022 14:29:41 -0800
Subject: [PATCH 03/10] fix

---
 test/functional/corerp/corerptest.go | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/functional/corerp/corerptest.go b/test/functional/corerp/corerptest.go
index f94a8e3ac3..b4ddb61425 100644
--- a/test/functional/corerp/corerptest.go
+++ b/test/functional/corerp/corerptest.go
@@ -208,10 +208,10 @@ func (ct CoreRPTest) Test(t *testing.T) {
 	})
 
 	t.Logf("Creating secrets if provided")
-    err := ct.CreateSecrets(ctx)
-    if err != nil {
-        t.Errorf("failed to create secrets %v", err)
-    }
+	err := ct.CreateSecrets(ctx)
+	if err != nil {
+		t.Errorf("failed to create secrets %v", err)
+	}
 
 	// Inside the integration test code we rely on the context for timeout/cancellation functionality.
 	// We expect the caller to wire this out to the test timeout system, or a stricter timeout if desired.
@@ -292,10 +292,10 @@ func (ct CoreRPTest) Test(t *testing.T) {
 				validation.ValidateNoAWSResource(ctx, t, &resource, ct.Options.AWSClient)
 				t.Logf("finished validation of deletion of AWS resource %s for %s", resource.Name, ct.Description)
 			}
+		}
 
-			if (step.CoreRPResources == nil && step.SkipKubernetesOutputResourceValidation) || step.SkipResourceDeletion {
-				continue
-			}
+		if (step.CoreRPResources == nil && step.SkipKubernetesOutputResourceValidation) || step.SkipResourceDeletion {
+			continue
 		}
 
 		for _, resource := range step.CoreRPResources.Resources {
@@ -315,10 +315,10 @@ func (ct CoreRPTest) Test(t *testing.T) {
 	}
 
 	t.Logf("Deleting secrets")
-    err = ct.DeleteSecrets(ctx)
-    if err != nil {
-        t.Errorf("failed to delete secrets %v", err)
-    }
+	err = ct.DeleteSecrets(ctx)
+	if err != nil {
+		t.Errorf("failed to delete secrets %v", err)
+	}
 
 	// Custom verification is expected to use `t` to trigger its own assertions
 	if ct.PostDeleteVerify != nil {

From 1c7577446f81b067393c299101ad68102d9f65a9 Mon Sep 17 00:00:00 2001
From: Young Bu Park <youngp@microsoft.com>
Date: Thu, 10 Nov 2022 15:06:17 -0800
Subject: [PATCH 04/10] reverted to 5

---
 build/test.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/test.mk b/build/test.mk
index 514b2a7f6d..20a4dfb2a0 100644
--- a/build/test.mk
+++ b/build/test.mk
@@ -37,7 +37,7 @@ test-functional-kubernetes: ## Runs Kubernetes functional tests
 	CGO_ENABLED=1 go test ./test/functional/kubernetes/... -timeout ${TEST_TIMEOUT} -v -parallel 5 $(GOTEST_OPTS)
 
 test-functional-corerp: ## Runs Applications.Core functional tests
-	CGO_ENABLED=1 go test ./test/functional/corerp/... -timeout ${TEST_TIMEOUT} -v -parallel 1 $(GOTEST_OPTS)
+	CGO_ENABLED=1 go test ./test/functional/corerp/... -timeout ${TEST_TIMEOUT} -v -parallel 5 $(GOTEST_OPTS)
 
 test-functional-ucp: ## Runs UCP functional tests
 	CGO_ENABLED=1 go test ./test/functional/ucp/... -timeout ${TEST_TIMEOUT} -v -parallel 5 $(GOTEST_OPTS)

From 27d7071b6036317c7c3ed0f572ce2eae5faa1b19 Mon Sep 17 00:00:00 2001
From: Young Bu Park <youngp@microsoft.com>
Date: Thu, 10 Nov 2022 15:43:57 -0800
Subject: [PATCH 05/10] increase timeout

---
 .github/workflows/build.yaml | 2 +-
 azure-pipelines.yml          | 4 ++--
 build/test.mk                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d455463cbe..cbbb0c8a08 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -200,7 +200,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       # Timeout used for Kubernetes functional tests
-      K8S_FUNCTIONALTEST_TIMEOUT: 20m
+      K8S_FUNCTIONALTEST_TIMEOUT: 40m
       RADIUS_CONTAINER_LOG_BASE: dist/container_logs
       RADIUS_CHART_LOCATION: deploy/Chart/
     steps:
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b589de0987..cd22297cff 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -17,9 +17,9 @@ variables:
 - name: DOCKER_REGISTRY
   value: radiusdev.azurecr.io
 - name: K8S_FUNCTIONALTEST_TIMEOUT
-  value: 20m
+  value: 40m
 - name: AZURE_FUNCTIONALTEST_TIMEOUT
-  value: 20m
+  value: 40m
 - name: REL_CHANNEL
   value: edge
 - name: REL_VERSION
diff --git a/build/test.mk b/build/test.mk
index 20a4dfb2a0..514b2a7f6d 100644
--- a/build/test.mk
+++ b/build/test.mk
@@ -37,7 +37,7 @@ test-functional-kubernetes: ## Runs Kubernetes functional tests
 	CGO_ENABLED=1 go test ./test/functional/kubernetes/... -timeout ${TEST_TIMEOUT} -v -parallel 5 $(GOTEST_OPTS)
 
 test-functional-corerp: ## Runs Applications.Core functional tests
-	CGO_ENABLED=1 go test ./test/functional/corerp/... -timeout ${TEST_TIMEOUT} -v -parallel 5 $(GOTEST_OPTS)
+	CGO_ENABLED=1 go test ./test/functional/corerp/... -timeout ${TEST_TIMEOUT} -v -parallel 1 $(GOTEST_OPTS)
 
 test-functional-ucp: ## Runs UCP functional tests
 	CGO_ENABLED=1 go test ./test/functional/ucp/... -timeout ${TEST_TIMEOUT} -v -parallel 5 $(GOTEST_OPTS)

From a38782e334947fda59ab45f6d95c9ff3a892ca63 Mon Sep 17 00:00:00 2001
From: Young Bu Park <youngp@microsoft.com>
Date: Thu, 10 Nov 2022 17:29:27 -0800
Subject: [PATCH 06/10] revert

---
 .github/workflows/build.yaml | 2 +-
 azure-pipelines.yml          | 4 ++--
 build/test.mk                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index cbbb0c8a08..d455463cbe 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -200,7 +200,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       # Timeout used for Kubernetes functional tests
-      K8S_FUNCTIONALTEST_TIMEOUT: 40m
+      K8S_FUNCTIONALTEST_TIMEOUT: 20m
       RADIUS_CONTAINER_LOG_BASE: dist/container_logs
       RADIUS_CHART_LOCATION: deploy/Chart/
     steps:
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index cd22297cff..b589de0987 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -17,9 +17,9 @@ variables:
 - name: DOCKER_REGISTRY
   value: radiusdev.azurecr.io
 - name: K8S_FUNCTIONALTEST_TIMEOUT
-  value: 40m
+  value: 20m
 - name: AZURE_FUNCTIONALTEST_TIMEOUT
-  value: 40m
+  value: 20m
 - name: REL_CHANNEL
   value: edge
 - name: REL_VERSION
diff --git a/build/test.mk b/build/test.mk
index 514b2a7f6d..20a4dfb2a0 100644
--- a/build/test.mk
+++ b/build/test.mk
@@ -37,7 +37,7 @@ test-functional-kubernetes: ## Runs Kubernetes functional tests
 	CGO_ENABLED=1 go test ./test/functional/kubernetes/... -timeout ${TEST_TIMEOUT} -v -parallel 5 $(GOTEST_OPTS)
 
 test-functional-corerp: ## Runs Applications.Core functional tests
-	CGO_ENABLED=1 go test ./test/functional/corerp/... -timeout ${TEST_TIMEOUT} -v -parallel 1 $(GOTEST_OPTS)
+	CGO_ENABLED=1 go test ./test/functional/corerp/... -timeout ${TEST_TIMEOUT} -v -parallel 5 $(GOTEST_OPTS)
 
 test-functional-ucp: ## Runs UCP functional tests
 	CGO_ENABLED=1 go test ./test/functional/ucp/... -timeout ${TEST_TIMEOUT} -v -parallel 5 $(GOTEST_OPTS)

From 9a1c8d402055650586b82a8f9c9143d73fb3144a Mon Sep 17 00:00:00 2001
From: Young Bu Park <youngp@microsoft.com>
Date: Thu, 10 Nov 2022 17:30:23 -0800
Subject: [PATCH 07/10] workaround

---
 test/functional/corerp/corerptest.go               | 14 +++++++-------
 .../corerp/resources/dapr_pubsub_test.go           |  1 +
 .../corerp/resources/dapr_secretstore_test.go      |  1 +
 .../corerp/resources/dapr_statestore_test.go       |  1 +
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/test/functional/corerp/corerptest.go b/test/functional/corerp/corerptest.go
index b4ddb61425..e623c8d849 100644
--- a/test/functional/corerp/corerptest.go
+++ b/test/functional/corerp/corerptest.go
@@ -313,13 +313,13 @@ func (ct CoreRPTest) Test(t *testing.T) {
 			}
 		}
 	}
-
-	t.Logf("Deleting secrets")
-	err = ct.DeleteSecrets(ctx)
-	if err != nil {
-		t.Errorf("failed to delete secrets %v", err)
-	}
-
+	/*
+		t.Logf("Deleting secrets")
+		err = ct.DeleteSecrets(ctx)
+		if err != nil {
+			t.Errorf("failed to delete secrets %v", err)
+		}
+	*/
 	// Custom verification is expected to use `t` to trigger its own assertions
 	if ct.PostDeleteVerify != nil {
 		t.Logf("running post-delete verification for %s", ct.Description)
diff --git a/test/functional/corerp/resources/dapr_pubsub_test.go b/test/functional/corerp/resources/dapr_pubsub_test.go
index 8cac4d608b..737539a83d 100644
--- a/test/functional/corerp/resources/dapr_pubsub_test.go
+++ b/test/functional/corerp/resources/dapr_pubsub_test.go
@@ -49,6 +49,7 @@ func Test_DaprPubSubGeneric(t *testing.T) {
 					},
 				},
 			},
+			SkipResourceDeletion: true,
 		},
 	}, requiredSecrets)
 
diff --git a/test/functional/corerp/resources/dapr_secretstore_test.go b/test/functional/corerp/resources/dapr_secretstore_test.go
index 4236915a6b..24c99583ad 100644
--- a/test/functional/corerp/resources/dapr_secretstore_test.go
+++ b/test/functional/corerp/resources/dapr_secretstore_test.go
@@ -52,6 +52,7 @@ func Test_DaprSecretStoreGeneric(t *testing.T) {
 					},
 				},
 			},
+			SkipResourceDeletion: true,
 		},
 	}, requiredSecrets)
 
diff --git a/test/functional/corerp/resources/dapr_statestore_test.go b/test/functional/corerp/resources/dapr_statestore_test.go
index 65e7f6319a..684ab7df2c 100644
--- a/test/functional/corerp/resources/dapr_statestore_test.go
+++ b/test/functional/corerp/resources/dapr_statestore_test.go
@@ -48,6 +48,7 @@ func Test_DaprStateStoreGeneric(t *testing.T) {
 					},
 				},
 			},
+			SkipResourceDeletion: true,
 		},
 	}, requiredSecrets)
 

From 4a3a6cdeb2a2b33928104dc21d826042296b4454 Mon Sep 17 00:00:00 2001
From: Young Bu Park <youngp@microsoft.com>
Date: Thu, 10 Nov 2022 18:09:49 -0800
Subject: [PATCH 08/10] wip

---
 test/functional/corerp/corerptest.go | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/functional/corerp/corerptest.go b/test/functional/corerp/corerptest.go
index e623c8d849..da429d77e4 100644
--- a/test/functional/corerp/corerptest.go
+++ b/test/functional/corerp/corerptest.go
@@ -208,17 +208,19 @@ func (ct CoreRPTest) Test(t *testing.T) {
 	})
 
 	t.Logf("Creating secrets if provided")
-	err := ct.CreateSecrets(ctx)
-	if err != nil {
-		t.Errorf("failed to create secrets %v", err)
-	}
+	_ = ct.CreateSecrets(ctx)
+	/*
+		if err != nil {
+			t.Errorf("failed to create secrets %v", err)
+		}
+	*/
 
 	// Inside the integration test code we rely on the context for timeout/cancellation functionality.
 	// We expect the caller to wire this out to the test timeout system, or a stricter timeout if desired.
 
 	require.GreaterOrEqual(t, len(ct.Steps), 1, "at least one step is required")
 	defer ct.CleanUpExtensionResources(ct.InitialResources)
-	err = ct.CreateInitialResources(ctx)
+	err := ct.CreateInitialResources(ctx)
 	require.NoError(t, err, "failed to create initial resources")
 
 	success := true

From 26a72f106ae5cea838a38f68eb8d04e9382afd92 Mon Sep 17 00:00:00 2001
From: Young Bu Park <youngp@microsoft.com>
Date: Thu, 10 Nov 2022 19:42:03 -0800
Subject: [PATCH 09/10] skip secret deletion

---
 test/functional/corerp/corerptest.go          | 38 +++++++++++--------
 .../corerp/resources/dapr_pubsub_test.go      |  1 +
 .../corerp/resources/dapr_secretstore_test.go |  4 ++
 .../corerp/resources/dapr_statestore_test.go  |  1 +
 4 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/test/functional/corerp/corerptest.go b/test/functional/corerp/corerptest.go
index da429d77e4..393e52f1ee 100644
--- a/test/functional/corerp/corerptest.go
+++ b/test/functional/corerp/corerptest.go
@@ -13,6 +13,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/client-go/discovery"
@@ -59,7 +60,8 @@ type CoreRPTest struct {
 	PostDeleteVerify func(ctx context.Context, t *testing.T, ct CoreRPTest)
 
 	// Object Name => map of secret keys and values
-	Secrets map[string]map[string]string
+	Secrets            map[string]map[string]string
+	SkipSecretDeletion bool
 }
 
 type TestOptions struct {
@@ -73,12 +75,13 @@ func NewTestOptions(t *testing.T) TestOptions {
 
 func NewCoreRPTest(t *testing.T, name string, steps []TestStep, secrets map[string]map[string]string, initialResources ...unstructured.Unstructured) CoreRPTest {
 	return CoreRPTest{
-		Options:          NewCoreRPTestOptions(t),
-		Name:             name,
-		Description:      name,
-		Steps:            steps,
-		Secrets:          secrets,
-		InitialResources: initialResources,
+		Options:            NewCoreRPTestOptions(t),
+		Name:               name,
+		Description:        name,
+		Steps:              steps,
+		Secrets:            secrets,
+		InitialResources:   initialResources,
+		SkipSecretDeletion: false,
 	}
 }
 
@@ -130,7 +133,7 @@ func (ct CoreRPTest) CreateSecrets(ctx context.Context) error {
 					Data: data,
 				}, v1.CreateOptions{})
 			if err != nil {
-				return fmt.Errorf("failed to create secret %s", err.Error())
+				return err
 			}
 		}
 	}
@@ -208,19 +211,22 @@ func (ct CoreRPTest) Test(t *testing.T) {
 	})
 
 	t.Logf("Creating secrets if provided")
-	_ = ct.CreateSecrets(ctx)
-	/*
-		if err != nil {
+	err := ct.CreateSecrets(ctx)
+	if err != nil {
+		if errors.IsAlreadyExists(err) {
+			// Do not stop the test if the same secret exists
+			t.Logf("the secret already exists %v", err)
+		} else {
 			t.Errorf("failed to create secrets %v", err)
 		}
-	*/
+	}
 
 	// Inside the integration test code we rely on the context for timeout/cancellation functionality.
 	// We expect the caller to wire this out to the test timeout system, or a stricter timeout if desired.
 
 	require.GreaterOrEqual(t, len(ct.Steps), 1, "at least one step is required")
 	defer ct.CleanUpExtensionResources(ct.InitialResources)
-	err := ct.CreateInitialResources(ctx)
+	err = ct.CreateInitialResources(ctx)
 	require.NoError(t, err, "failed to create initial resources")
 
 	success := true
@@ -315,13 +321,15 @@ func (ct CoreRPTest) Test(t *testing.T) {
 			}
 		}
 	}
-	/*
+
+	if !ct.SkipSecretDeletion {
 		t.Logf("Deleting secrets")
 		err = ct.DeleteSecrets(ctx)
 		if err != nil {
 			t.Errorf("failed to delete secrets %v", err)
 		}
-	*/
+	}
+
 	// Custom verification is expected to use `t` to trigger its own assertions
 	if ct.PostDeleteVerify != nil {
 		t.Logf("running post-delete verification for %s", ct.Description)
diff --git a/test/functional/corerp/resources/dapr_pubsub_test.go b/test/functional/corerp/resources/dapr_pubsub_test.go
index 737539a83d..e88077075a 100644
--- a/test/functional/corerp/resources/dapr_pubsub_test.go
+++ b/test/functional/corerp/resources/dapr_pubsub_test.go
@@ -49,6 +49,7 @@ func Test_DaprPubSubGeneric(t *testing.T) {
 					},
 				},
 			},
+			// TODO: Remove the below when https://github.com/project-radius/radius/issues/4627 is fixed.
 			SkipResourceDeletion: true,
 		},
 	}, requiredSecrets)
diff --git a/test/functional/corerp/resources/dapr_secretstore_test.go b/test/functional/corerp/resources/dapr_secretstore_test.go
index 24c99583ad..bd64a785e4 100644
--- a/test/functional/corerp/resources/dapr_secretstore_test.go
+++ b/test/functional/corerp/resources/dapr_secretstore_test.go
@@ -52,9 +52,13 @@ func Test_DaprSecretStoreGeneric(t *testing.T) {
 					},
 				},
 			},
+			// TODO: Remove the below when https://github.com/project-radius/radius/issues/4627 is fixed.
 			SkipResourceDeletion: true,
 		},
 	}, requiredSecrets)
 
+	// TODO: Remove the below and "SkipResourceDeletion: true" when https://github.com/project-radius/radius/issues/4627 is fixed.
+	test.SkipSecretDeletion = true
+
 	test.Test(t)
 }
diff --git a/test/functional/corerp/resources/dapr_statestore_test.go b/test/functional/corerp/resources/dapr_statestore_test.go
index 684ab7df2c..4972e87663 100644
--- a/test/functional/corerp/resources/dapr_statestore_test.go
+++ b/test/functional/corerp/resources/dapr_statestore_test.go
@@ -48,6 +48,7 @@ func Test_DaprStateStoreGeneric(t *testing.T) {
 					},
 				},
 			},
+			// TODO: Remove the below when https://github.com/project-radius/radius/issues/4627 is fixed.
 			SkipResourceDeletion: true,
 		},
 	}, requiredSecrets)

From 23c4a5a006d6db3b2dcaa0665db99baee515f180 Mon Sep 17 00:00:00 2001
From: Young Bu Park <youngp@microsoft.com>
Date: Fri, 11 Nov 2022 09:53:30 -0800
Subject: [PATCH 10/10] revert

---
 test/functional/corerp/resources/dapr_pubsub_test.go      | 2 --
 test/functional/corerp/resources/dapr_secretstore_test.go | 5 -----
 test/functional/corerp/resources/dapr_statestore_test.go  | 2 --
 3 files changed, 9 deletions(-)

diff --git a/test/functional/corerp/resources/dapr_pubsub_test.go b/test/functional/corerp/resources/dapr_pubsub_test.go
index e88077075a..8cac4d608b 100644
--- a/test/functional/corerp/resources/dapr_pubsub_test.go
+++ b/test/functional/corerp/resources/dapr_pubsub_test.go
@@ -49,8 +49,6 @@ func Test_DaprPubSubGeneric(t *testing.T) {
 					},
 				},
 			},
-			// TODO: Remove the below when https://github.com/project-radius/radius/issues/4627 is fixed.
-			SkipResourceDeletion: true,
 		},
 	}, requiredSecrets)
 
diff --git a/test/functional/corerp/resources/dapr_secretstore_test.go b/test/functional/corerp/resources/dapr_secretstore_test.go
index bd64a785e4..4236915a6b 100644
--- a/test/functional/corerp/resources/dapr_secretstore_test.go
+++ b/test/functional/corerp/resources/dapr_secretstore_test.go
@@ -52,13 +52,8 @@ func Test_DaprSecretStoreGeneric(t *testing.T) {
 					},
 				},
 			},
-			// TODO: Remove the below when https://github.com/project-radius/radius/issues/4627 is fixed.
-			SkipResourceDeletion: true,
 		},
 	}, requiredSecrets)
 
-	// TODO: Remove the below and "SkipResourceDeletion: true" when https://github.com/project-radius/radius/issues/4627 is fixed.
-	test.SkipSecretDeletion = true
-
 	test.Test(t)
 }
diff --git a/test/functional/corerp/resources/dapr_statestore_test.go b/test/functional/corerp/resources/dapr_statestore_test.go
index 4972e87663..65e7f6319a 100644
--- a/test/functional/corerp/resources/dapr_statestore_test.go
+++ b/test/functional/corerp/resources/dapr_statestore_test.go
@@ -48,8 +48,6 @@ func Test_DaprStateStoreGeneric(t *testing.T) {
 					},
 				},
 			},
-			// TODO: Remove the below when https://github.com/project-radius/radius/issues/4627 is fixed.
-			SkipResourceDeletion: true,
 		},
 	}, requiredSecrets)