fix(tests): v2 wip

Author: devthejo

tests/e2e/e2e_test.go

@@ -35,10 +35,10 @@ func TestCrossplaneXFuncJS(t *testing.T) {
 	}
 
 	// Define GVR for SimpleConfigMap
-	xsimpleConfigMapGVR := schema.GroupVersionResource{
+	simpleConfigMapGVR := schema.GroupVersionResource{
 		Group:    "test.crossplane.io",
 		Version:  "v1beta1",
-		Resource: "xsimpleconfigmaps",
+		Resource: "simpleconfigmaps",
 	}
 
 	// Define GVR for ConfigMap
@@ -63,11 +63,11 @@ func TestCrossplaneXFuncJS(t *testing.T) {
 		t.Fatalf("Error creating namespace: %v", err)
 	}
 
-	// Create XSimpleConfigMap
-	xsimpleConfigMap := &unstructured.Unstructured{
+	// Create SimpleConfigMap
+	simpleConfigMap := &unstructured.Unstructured{
 		Object: map[string]interface{}{
 			"apiVersion": "test.crossplane.io/v1beta1",
-			"kind":       "XSimpleConfigMap",
+			"kind":       "SimpleConfigMap",
 			"metadata": map[string]interface{}{
 				"name":      "test-simple-configmap",
 				"namespace": "test-xfuncjs",
@@ -82,9 +82,9 @@ func TestCrossplaneXFuncJS(t *testing.T) {
 		},
 	}
 
-	_, err = client.Resource(xsimpleConfigMapGVR).Namespace("test-xfuncjs").Create(context.TODO(), xsimpleConfigMap, metav1.CreateOptions{})
+	_, err = client.Resource(simpleConfigMapGVR).Namespace("test-xfuncjs").Create(context.TODO(), simpleConfigMap, metav1.CreateOptions{})
 	if err != nil {
-		t.Fatalf("Error creating XSimpleConfigMap: %v", err)
+		t.Fatalf("Error creating SimpleConfigMap: %v", err)
 	}
 
 	// Wait for ConfigMap to be created

tests/fixtures/domain-sdk/functions/xsimpleconfigmaps/composition.fn.ts renamed to tests/fixtures/domain-sdk/functions/simpleconfigmaps/composition.fn.ts

@@ -1,9 +1,9 @@
 import { logger, FieldRef, v1 } from "@crossplane-js/sdk"
 import type { CrossplaneDesiredResources, CrossplaneObservedResources } from "@crossplane-js/sdk"
 
-import type { XSimpleConfigMap } from "@/models/test.crossplane.io/v1beta1"
+import type { SimpleConfigMap } from "@/models/test.crossplane.io/v1beta1"
 
-export default function(composite: XSimpleConfigMap, _resources: CrossplaneObservedResources): CrossplaneDesiredResources {
+export default function(composite: SimpleConfigMap, _resources: CrossplaneObservedResources): CrossplaneDesiredResources {
   logger.info("Composition function started")
 
   const namespace = composite.getNamespace()

tests/fixtures/domain-sdk/functions/xsimpleconfigmaps/xrd.yaml renamed to tests/fixtures/domain-sdk/functions/simpleconfigmaps/xrd.yaml

@@ -1,14 +1,14 @@
 apiVersion: apiextensions.crossplane.io/v2
 kind: CompositeResourceDefinition
 metadata:
-  name: xsimpleconfigmaps.test.crossplane.io
+  name: simpleconfigmaps.test.crossplane.io
 spec:
   scope: Namespaced
   group: test.crossplane.io
   names:
-    kind: XSimpleConfigMap
-    plural: xsimpleconfigmaps
-    singular: xsimpleconfigmap
+    kind: SimpleConfigMap
+    plural: simpleconfigmaps
+    singular: simpleconfigmap
   versions:
     - name: v1beta1
       served: true

tests/fixtures/domain-sdk/sample.yaml

@@ -1,5 +1,5 @@
 apiVersion: test.crossplane.io/v1beta1
-kind: XSimpleConfigMap
+kind: SimpleConfigMap
 metadata:
   name: sample-configmap
   namespace: test-xfuncjs

tests/integration/node-execution.test.ts

@@ -117,7 +117,7 @@ describe('JavaScript Code Execution', () => {
     const input = {
       input: {
         apiVersion: 'test.crossplane.io/v1beta1',
-        kind: 'XSimpleConfigMap',
+        kind: 'SimpleConfigMap',
         metadata: {
           name: 'test-simple-configmap',
           namespace: 'test-namespace'
@@ -134,7 +134,7 @@ describe('JavaScript Code Execution', () => {
         composite: {
           resource: {
             apiVersion: 'test.crossplane.io/v1beta1',
-            kind: 'XSimpleConfigMap',
+            kind: 'SimpleConfigMap',
             metadata: {
               name: 'test-simple-configmap',
               namespace: 'test-namespace'

tests/test-xfuncjs.sh

@@ -57,15 +57,15 @@ kubectl apply -f tests/fixtures/domain-sdk/manifests
 
 # Wait for XRD to be established
 echo "Waiting for XRD to be established..."
-kubectl wait --for=condition=established xrd/xsimpleconfigmaps.test.crossplane.io --timeout=60s || {
+kubectl wait --for=condition=established xrd/simpleconfigmaps.test.crossplane.io --timeout=60s || {
   echo "XRD not established within timeout"
   echo "Current XRD status:"
-  kubectl get xrd/xsimpleconfigmaps.test.crossplane.io -o yaml
+  kubectl get xrd/simpleconfigmaps.test.crossplane.io -o yaml
   exit 1
 }
 
-# Create a test XSimpleConfigMap
-echo "(Re)Creating test XSimpleConfigMap..."
+# Create a test SimpleConfigMap
+echo "(Re)Creating test SimpleConfigMap..."
 kubectl delete -f tests/fixtures/domain-sdk/sample.yaml || true
 kubectl apply -f tests/fixtures/domain-sdk/sample.yaml
 
@@ -80,10 +80,10 @@ for i in {1..60}; do
   fi
   echo "Waiting for ConfigMap to be created... ($i/60)"
 
-  # Check the status of the XSimpleConfigMap
+  # Check the status of the SimpleConfigMap
   if [ $((i % 5)) -eq 0 ]; then
-    echo "XSimpleConfigMap status:"
-    kubectl get xsimpleconfigmaps.test.crossplane.io -o yaml || true
+    echo "SimpleConfigMap status:"
+    kubectl get simpleconfigmaps.test.crossplane.io -o yaml || true
     echo "Crossplane Function status:"
     kubectl get functions.pkg.crossplane.io || true
     echo "FunctionRuntime status:"
@@ -95,8 +95,8 @@ done
 
 if [ "$configmap_created" = false ]; then
   echo "ConfigMap was not created within timeout"
-  echo "Final XSimpleConfigMap status:"
-  kubectl get xsimpleconfigmaps.test.crossplane.io -o yaml || true
+  echo "Final SimpleConfigMap status:"
+  kubectl get simpleconfigmaps.test.crossplane.io -o yaml || true
   echo "Final Crossplane Function status:"
   kubectl get functions.pkg.crossplane.io || true
   echo "Final FunctionRuntime status:"