fix tests

kptdev · Dec 14, 2022 · bcd815d · bcd815d
1 parent 05ad299
commit bcd815d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/e2e/testdata/porch/rpkg-lifecycle/config.yaml b/e2e/testdata/porch/rpkg-lifecycle/config.yaml
@@ -91,4 +91,4 @@ commands:
       - git-017a8366a5e0d9b35ae6dc489d4d3f68046d6034
       - --namespace=rpkg-lifecycle
     stderr: |
-      git-017a8366a5e0d9b35ae6dc489d4d3f68046d6034 failed (admission webhook "packagerevdeletion.google.com" denied the request: failed to delete package revision "git-017a8366a5e0d9b35ae6dc489d4d3f68046d6034")
+      git-017a8366a5e0d9b35ae6dc489d4d3f68046d6034 failed (admission webhook "packagerevdeletion.google.com" denied the request: failed to delete package revision "git-017a8366a5e0d9b35ae6dc489d4d3f68046d6034": spec.deletionProposed not set to 'true')
diff --git a/porch/test/e2e/e2e_test.go b/porch/test/e2e/e2e_test.go
@@ -118,9 +118,10 @@ func (t *PorchSuite) TestGitRepository(ctx context.Context) {
 			Namespace: t.namespace,
 		},
 		Spec: porchapi.PackageRevisionSpec{
-			PackageName:    "test-bucket",
-			WorkspaceName:  "workspace",
-			RepositoryName: "git",
+			PackageName:      "test-bucket",
+			WorkspaceName:    "workspace",
+			RepositoryName:   "git",
+			DeletionProposed: true, // simplifies cleanup
 			Tasks: []porchapi.Task{
 				{
 					Type: "clone",

diff --git a/porch/test/e2e/update_test.go b/porch/test/e2e/update_test.go
@@ -49,9 +49,10 @@ func (t *PorchSuite) TestPackageUpdateRecloneAndReplay(ctx context.Context) {
 			Namespace: t.namespace,
 		},
 		Spec: porchapi.PackageRevisionSpec{
-			PackageName:    "testRecloneAndReplay",
-			WorkspaceName:  "testdescr",
-			RepositoryName: gitRepository,
+			PackageName:      "testRecloneAndReplay",
+			WorkspaceName:    "testdescr",
+			RepositoryName:   gitRepository,
+			DeletionProposed: true,
 			Tasks: []porchapi.Task{
 				{
 					Type: porchapi.TaskTypeClone,

diff --git a/porch/webhooks/main.go b/porch/webhooks/main.go
@@ -318,7 +318,7 @@ func validateDeletion(w http.ResponseWriter, r *http.Request) {
 		admissionResponse.Allowed = false
 		admissionResponse.Result = &metav1.Status{
 			Status:  "Failure",
-			Message: fmt.Sprintf("Failed to delete package revision %q", pr.Name),
+			Message: fmt.Sprintf("failed to delete package revision %q: spec.deletionProposed not set to 'true'", pr.Name),
 			Reason:  "PackageRevisions must be proposed for deletion by setting spec.deletionProposed to 'true' prior to deletion.",
 		}
 	}