Fix e2e QueryRef from XR status (#13)

* Fix e2e QueryRef from XR status

* Do not fatal fail but worn on empty Query
* It will unblock the situation when XR status is getting updated by the
  Function pipeline and the referenced `status.queryField` is available
  only on the consequent reconciliation loop
* Update queryref-from-xr-status example to include
  function-go-templating constructig the query for illustrative e2e
  tetsing and example usage

Signed-off-by: Yury Tsarev <[email protected]>

* Fix example for e2e test

Signed-off-by: Yury Tsarev <[email protected]>

---------

Signed-off-by: Yury Tsarev <[email protected]>

Author: ytsarev

example/queryref-from-xr-status/Makefile

@@ -1,3 +1,3 @@
 .PHONY: render
 render:
-	crossplane render ./xr.yaml composition.yaml ../functions.yaml --function-credentials=../secrets/azure-creds.yaml  -rc
+	crossplane render ./xr.yaml composition.yaml ./functions.yaml --function-credentials=../secrets/azure-creds.yaml  -rc

example/queryref-from-xr-status/composition.yaml

@@ -8,17 +8,30 @@ spec:
     kind: XR
   mode: Pipeline
   pipeline:
-  - step: query-azresourcegraph
-    functionRef:
-      name: function-azresourcegraph
-    input:
-      apiVersion: azresourcegraph.fn.crossplane.io/v1alpha1
-      kind: Input
-      queryRef: "status.azResourceGraphQuery"
-      target: "context.azResourceGraphQueryResult"
-    credentials:
-      - name: azure-creds
-        source: Secret
-        secretRef:
-          namespace: upbound-system
-          name: azure-account-creds
+    - step: query-to-status
+      functionRef:
+        name: function-go-templating
+      input:
+        apiVersion: gotemplating.fn.crossplane.io/v1beta1
+        kind: GoTemplate
+        source: Inline
+        inline:
+          template: |
+            apiVersion: example.crossplane.io/v1
+            kind: XR
+            status:
+              azResourceGraphQuery: Resources | where type == "{{ .observed.composite.resource.spec.queryResourceType }}" | count
+    - step: query-azresourcegraph
+      functionRef:
+        name: function-azresourcegraph
+      input:
+        apiVersion: azresourcegraph.fn.crossplane.io/v1alpha1
+        kind: Input
+        queryRef: "status.azResourceGraphQuery"
+        target: "status.azResourceGraphQueryResult"
+      credentials:
+        - name: azure-creds
+          source: Secret
+          secretRef:
+            namespace: upbound-system
+            name: azure-account-creds

example/queryref-from-xr-status/definition.yaml

@@ -19,6 +19,10 @@ spec:
           spec:
             description: XRSpec defines the desired state of XR.
             type: object
+            properties:
+              queryResourceType:
+                description: resource type for az resource query construction
+                type: string
           status:
             description: XRStatus defines the observed state of XR.
             type: object
@@ -29,6 +33,9 @@ spec:
                 items:
                   type: object
                 x-kubernetes-preserve-unknown-fields: true
+              azResourceGraphQuery:
+                description: Freeform field containing query results from function-azresourcegraph
+                type: string
         required:
         - spec
         type: object

example/queryref-from-xr-status/functions.yaml

@@ -0,0 +1,17 @@
+---
+apiVersion: pkg.crossplane.io/v1beta1
+kind: Function
+metadata:
+  name: function-azresourcegraph
+  annotations:
+    # This tells crossplane beta render to connect to the function locally.
+    # render.crossplane.io/runtime: Development
+spec:
+  package: xpkg.upbound.io/upbound/function-azresourcegraph:v0.4.0-rc-test
+---
+apiVersion: pkg.crossplane.io/v1beta1
+kind: Function
+metadata:
+  name: function-go-templating
+spec:
+  package: xpkg.upbound.io/crossplane-contrib/function-go-templating:v0.9.0

example/queryref-from-xr-status/xr.yaml

@@ -3,6 +3,7 @@ apiVersion: example.crossplane.io/v1
 kind: XR
 metadata:
   name: example-xr
-spec: {}
+spec:
+  queryResourceType: microsoft.compute/virtualmachines
 status:
   azResourceGraphQuery: Resources| count

fn.go

@@ -90,8 +90,8 @@ func (f *Function) RunFunction(ctx context.Context, req *fnv1.RunFunctionRequest
 	}
 
 	if in.Query == "" {
-		response.Fatal(rsp, errors.New("Query is empty"))
-		f.log.Info("FAILURE: ", "query is empty", in.Query)
+		response.Warning(rsp, errors.New("Query is empty"))
+		f.log.Info("WARNING: ", "query is empty", in.Query)
 		return rsp, nil
 	}
 

fn_test.go

@@ -873,8 +873,8 @@ func TestRunFunction(t *testing.T) {
 				},
 			},
 		},
-		"FailIfQueryIsEmpty": {
-			reason: "The Function should fail if Query is empty",
+		"WarningIfQueryIsEmpty": {
+			reason: "The Function should warn if Query is empty",
 			args: args{
 				ctx: context.Background(),
 				req: &fnv1.RunFunctionRequest{
@@ -909,7 +909,7 @@ func TestRunFunction(t *testing.T) {
 					Meta: &fnv1.ResponseMeta{Tag: "hello", Ttl: durationpb.New(response.DefaultTTL)},
 					Results: []*fnv1.Result{
 						{
-							Severity: fnv1.Severity_SEVERITY_FATAL,
+							Severity: fnv1.Severity_SEVERITY_WARNING,
 							Message:  `Query is empty`,
 							Target:   fnv1.Target_TARGET_COMPOSITE.Enum(),
 						},