Delete native P&T based Usage E2E test

It's functionally identical (no pun intended) to the variant that uses
functions, but the native version has a nasty bug. When it patches the
MR it removes the MR's finalizer, which causes the XR and MR
controllers to fight. This is bad when realtime compositions are
enabled.

We could potentially fix the native P&T variant (e.g. by patching in the
finalizer) but I don't think it's worth it. Apart from this very
specific scenario where we artificially set a finalizer to block the
delete, the composition implementation shouldn't matter. Given native
P&T is deprecated let's drop it and save some time in E2E runs.

Signed-off-by: Nic Cope <[email protected]>

Author: negz

test/e2e/manifests/apiextensions/usage/composition-pipeline/claim.yaml

@@ -6,61 +6,82 @@ spec:
   compositeTypeRef:
     apiVersion: nop.example.org/v1alpha1
     kind: XNopResource
-  resources:
-  - name: used-resource
-    base:
-      apiVersion: nop.crossplane.io/v1alpha1
-      kind: NopResource
-      metadata:
-        labels:
-            usage: used
-      spec:
-        forProvider:
-          conditionAfter:
-          - conditionType: "Synced"
-            conditionStatus: "True"
-            time: "5s"
-          - conditionType: "Ready"
-            conditionStatus: "True"
-            time: "10s"
-  - name: using-resource
-    base:
-      apiVersion: nop.crossplane.io/v1alpha1
-      kind: NopResource
-      metadata:
-        # We are delaying deletion of using resource with this finalizer. This is to ensure that the used resource is
-        # not deleted before the using resource. Imagine a scenario where a Release resource using a Cluster resource
-        # where we expect the Cluster resource not to be deleted until the Release resource is deleted. We are mimicking
-        # this behavior with the help of a finalizer on a NopResource.
-        finalizers:
-          - delay-deletion-of-using-resource
-        labels:
-          usage: using
-      spec:
-        forProvider:
-          conditionAfter:
-          - conditionType: "Synced"
-            conditionStatus: "True"
-            time: "5s"
-          - conditionType: "Ready"
-            conditionStatus: "True"
-            time: "10s"
-  - name: usage-resource
-    base:
-      apiVersion: apiextensions.crossplane.io/v1beta1
-      kind: Usage
-      spec:
-        of:
-          apiVersion: nop.crossplane.io/v1alpha1
-          kind: NopResource
-          resourceSelector:
-            matchControllerRef: true
-            matchLabels:
-              usage: used
-        by:
-          apiVersion: nop.crossplane.io/v1alpha1
-          kind: NopResource
-          resourceSelector:
-            matchControllerRef: true
-            matchLabels:
-              usage: using
+  mode: Pipeline
+  pipeline:
+    - step: be-a-dummy
+      functionRef:
+        name: function-dummy
+      input:
+        apiVersion: dummy.fn.crossplane.io/v1beta1
+        kind: Response
+        # This is a YAML-serialized RunFunctionResponse. function-dummy will
+        # overlay the desired state on any that was passed into it.
+        response:
+          desired:
+            resources:
+              used-resource:
+                resource:
+                  apiVersion: nop.crossplane.io/v1alpha1
+                  kind: NopResource
+                  metadata:
+                    labels:
+                      usage: used
+                  spec:
+                    forProvider:
+                      conditionAfter:
+                        - conditionType: "Synced"
+                          conditionStatus: "True"
+                          time: "5s"
+                        - conditionType: "Ready"
+                          conditionStatus: "True"
+                          time: "10s"
+              using-resource:
+                resource:
+                  apiVersion: nop.crossplane.io/v1alpha1
+                  kind: NopResource
+                  metadata:
+                    # We are delaying deletion of using resource with this finalizer. This is to ensure that the used resource is
+                    # not deleted before the using resource. Imagine a scenario where a Release resource using a Cluster resource
+                    # where we expect the Cluster resource not to be deleted until the Release resource is deleted. We are mimicking
+                    # this behavior with the help of a finalizer on a NopResource.
+                    finalizers:
+                      - delay-deletion-of-using-resource
+                    labels:
+                      usage: using
+                  spec:
+                    forProvider:
+                      conditionAfter:
+                        - conditionType: "Synced"
+                          conditionStatus: "True"
+                          time: "5s"
+                        - conditionType: "Ready"
+                          conditionStatus: "True"
+                          time: "10s"
+              usage-resource:
+                resource:
+                  apiVersion: apiextensions.crossplane.io/v1beta1
+                  kind: Usage
+                  metadata:
+                    labels:
+                      version: initial
+                  spec:
+                    of:
+                      apiVersion: nop.crossplane.io/v1alpha1
+                      kind: NopResource
+                      resourceSelector:
+                        matchControllerRef: true
+                        matchLabels:
+                          usage: used
+                    by:
+                      apiVersion: nop.crossplane.io/v1alpha1
+                      kind: NopResource
+                      resourceSelector:
+                        matchControllerRef: true
+                        matchLabels:
+                          usage: using
+          results:
+            - severity: SEVERITY_NORMAL
+              message: "I am doing a compose!"
+    - step: detect-readiness
+      functionRef:
+        name: function-auto-ready

test/e2e/manifests/apiextensions/usage/composition-pipeline/setup/composition.yaml

@@ -100,83 +100,6 @@ func TestUsageComposition(t *testing.T) {
 		Kind:       "Usage",
 	}))
 
-	environment.Test(t,
-		features.NewWithDescription(t.Name(), "Tests scenarios for Crossplane's `Usage` resource as part of a composition.").
-			WithLabel(LabelStage, LabelStageBeta).
-			WithLabel(LabelArea, LabelAreaAPIExtensions).
-			WithLabel(LabelSize, LabelSizeSmall).
-			WithLabel(config.LabelTestSuite, config.TestSuiteDefault).
-			WithSetup("PrerequisitesAreCreated", funcs.AllOf(
-				funcs.ApplyResources(FieldManager, manifests, "setup/*.yaml"),
-				funcs.ResourcesCreatedWithin(30*time.Second, manifests, "setup/*.yaml"),
-				funcs.ResourcesHaveConditionWithin(1*time.Minute, manifests, "setup/definition.yaml", apiextensionsv1.WatchingComposite()),
-				funcs.ResourcesHaveConditionWithin(2*time.Minute, manifests, "setup/provider.yaml", pkgv1.Healthy(), pkgv1.Active()),
-			)).
-			Assess("ClaimCreatedAndReady", funcs.AllOf(
-				funcs.ApplyResources(FieldManager, manifests, "claim.yaml"),
-				funcs.ResourcesCreatedWithin(30*time.Second, manifests, "claim.yaml"),
-				funcs.ResourcesHaveConditionWithin(5*time.Minute, manifests, "claim.yaml", xpv1.Available()),
-			)).
-			Assess("UsedResourceHasInUseLabel", funcs.AllOf(
-				funcs.ComposedResourcesHaveFieldValueWithin(1*time.Minute, manifests, "claim.yaml", "metadata.labels[crossplane.io/in-use]", "true", func(object k8s.Object) bool {
-					return object.GetLabels()["usage"] == "used"
-				}),
-			)).
-			Assess("ClaimDeleted", funcs.AllOf(
-				funcs.DeleteResources(manifests, "claim.yaml"),
-				funcs.ResourcesDeletedWithin(1*time.Minute, manifests, "claim.yaml"),
-			)).
-			// NOTE(turkenh): At this point, the claim is deleted and hence the
-			// garbage collector started attempting to delete all composed
-			// resources. With the help of a finalizer (namely
-			// `delay-deletion-of-using-resource`, see in the composition),
-			// we know that the using resource is still there and hence the
-			// deletion of the used resource should be blocked. We will assess
-			// that below.
-			Assess("OthersDeletedExceptUsed", funcs.AllOf(
-				// Using resource should have a deletion timestamp (i.e. deleted by the garbage collector).
-				funcs.ListedResourcesValidatedWithin(1*time.Minute, nopList, 1, func(object k8s.Object) bool {
-					return object.GetDeletionTimestamp() != nil
-				}, resources.WithLabelSelector(labels.FormatLabels(map[string]string{"usage": "using"}))),
-				// Usage resource should not have a deletion timestamp since it is owned by the using resource.
-				funcs.ListedResourcesValidatedWithin(1*time.Minute, usageList, 1, func(object k8s.Object) bool {
-					return object.GetDeletionTimestamp() == nil
-				}),
-				// Used resource should not have a deletion timestamp since it is still in use.
-				funcs.ListedResourcesValidatedWithin(1*time.Minute, nopList, 1, func(object k8s.Object) bool {
-					return object.GetDeletionTimestamp() == nil
-				}, resources.WithLabelSelector(labels.FormatLabels(map[string]string{"usage": "used"}))),
-			)).
-			Assess("UsingDeletedAllGone", funcs.AllOf(
-				// Remove the finalizer from the using resource.
-				funcs.ListedResourcesModifiedWith(nopList, 1, func(object k8s.Object) {
-					object.SetFinalizers(nil)
-				}, resources.WithLabelSelector(labels.FormatLabels(map[string]string{"usage": "using"}))),
-				// All composed resources should now be deleted including the Usage itself.
-				funcs.ListedResourcesDeletedWithin(2*time.Minute, nopList),
-				funcs.ListedResourcesDeletedWithin(2*time.Minute, usageList),
-			)).
-			WithTeardown("DeletePrerequisites", funcs.AllOf(
-				funcs.DeleteResources(manifests, "setup/*.yaml"),
-				funcs.ResourcesDeletedWithin(3*time.Minute, manifests, "setup/*.yaml"),
-			)).
-			// Disable our feature flag.
-			WithTeardown("DisableAlphaUsages", funcs.AllOf(
-				funcs.AsFeaturesFunc(environment.HelmUpgradeCrossplaneToBase()),
-				funcs.ReadyToTestWithin(1*time.Minute, namespace),
-			)).
-			Feature(),
-	)
-}
-
-func TestUsageCompositionWithPipeline(t *testing.T) {
-	manifests := "test/e2e/manifests/apiextensions/usage/composition-pipeline"
-
-	usageList := composed.NewList(composed.FromReferenceToList(corev1.ObjectReference{
-		APIVersion: "apiextensions.crossplane.io/v1alpha1",
-		Kind:       "Usage",
-	}))
-
 	environment.Test(t,
 		features.NewWithDescription(t.Name(), "Tests scenarios for Crossplane's `Usage` resource as part of a composition pipeline and decomposed properly.").
 			WithLabel(LabelStage, LabelStageBeta).