More pytest cases and add CI report

Author: Patrick J. McNerthney

.github/workflows/ci.yaml

@@ -3,8 +3,8 @@ name: CI
 on:
   push:
     branches:
-      - main
-      - release-*
+    - main
+    - release-*
   pull_request: {}
   workflow_dispatch:
     inputs:
@@ -53,22 +53,38 @@ jobs:
   #     - name: Lint
   #       run: hatch run lint:check
 
-  unit-test:
+  test:
     runs-on: ubuntu-24.04
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-
-      - name: Setup Hatch
-        run: pipx install hatch==1.14.1
-
-      - name: Run Unit Tests
-        run: hatch run test:unit
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Setup Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ env.PYTHON_VERSION }}
+
+    - name: Setup Hatch
+      run: pipx install hatch==1.14.1
+
+    - name: Run Unit Tests
+      run: hatch run test:ci
+
+    - name: Pytest coverage comment
+      uses: MishaKav/pytest-coverage-comment@main
+      with:
+        title: Function Pythonic Title
+        junitxml-title: Function Pythonic Junit Title
+        badge-title: Function Pythonic Badge Title
+        junitxml-path: reports/pytest-junit.xml
+        pytest-xml-coverage-path: reports/pytest-coverage.xml
+        #hide-badge: false
+        #hide-report: false
+        #create-new-comment: false
+        #hide-comment: false
+        #report-only-changed-files: false
+        #remove-link-from-badge: false
+        #unique-id-for-comment: python3.8
 
   # We want to build most packages for the amd64 and arm64 architectures. To
   # speed this up we build single-platform packages in parallel. We then upload

.gitignore

@@ -53,6 +53,7 @@ coverage.xml
 .hypothesis/
 .pytest_cache/
 cover/
+reports/
 
 # Translations
 *.mo

examples/helm-copy-secret/composition.yaml

@@ -41,7 +41,7 @@ spec:
             #vcluster_secrets = self.requireds.Secret('v1', 'Secret', namespace, secret_name)
             vcluster_secrets = self.requireds.Secret('v1', 'Secret', labels={'vcluster-name':name})
             for secret in vcluster_secrets:
-              if secret.metadata.name != secret_name:
+              if secret.metadata.namespace != namespace or secret.metadata.name != secret_name:
                 continue
               argocd_secret = self.resources.secret('v1', 'Secret', 'argocd', secret_name)
               argocd_secret.metadata.labels['argocd.argoproj.io/secret-type'] = 'cluster'

examples/helm-copy-secret/xrd.yaml

@@ -0,0 +1,21 @@
+apiVersion: apiextensions.crossplane.io/v1
+kind: CompositeResourceDefinition
+metadata:
+  name: xclusters.example.joebowbeer.com
+spec:
+  group: example.joebowbeer.com
+  names:
+    kind: XCluster
+    plural: xclusters
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    served: true
+    referenceable: true
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          spec:
+            type: object
+            properties: {}

pyproject.toml

@@ -43,20 +43,29 @@ validate-bump = false            # Allow going from 0.0.0.dev0+x to 0.0.0.dev0+y
 type = "virtual"
 path = ".venv-default"
 dependencies = ["ipython==9.1.0"]
-scripts = { development = "python function/main.py --insecure --debug" }
+[tool.hatch.envs.default.scripts]
+development = "python function/main.py --insecure --debug"
 
 [tool.hatch.envs.lint]
 type = "virtual"
 detached = true
 path = ".venv-lint"
 dependencies = ["ruff==0.11.5"]
-scripts = { check = "ruff check function tests && ruff format --diff function tests" }
+[tool.hatch.envs.lint.scripts]
+check = "ruff check function tests && ruff format --diff function tests"
 
 [tool.hatch.envs.test]
 type = "virtual"
 path = ".venv-test"
-dependencies = ["pytest==8.4.1", "pytest-asyncio==1.1.0"]
-scripts = { unit = "python -m pytest tests" }
+dependencies = [
+  "pytest==8.4.1",
+  "pytest-asyncio==1.1.0",
+  "pytest-cov==6.2.1",
+]
+[tool.hatch.envs.test.scripts]
+run = "pytest tests"
+verbose = "pytest tests --verbose --verbose"
+ci = "pytest tests --junitxml=reports/pytest-junit.xml --cov --cov-report xml:reports/pytest-coverage.xml"
 
 [tool.ruff]
 target-version = "py311"

tests/fn_cases/get-started-app.yaml

@@ -0,0 +1,95 @@
+request:
+  observed:
+    composite:
+      resource:
+        metadata:
+          name: my-app
+        spec:
+          image: nginx
+    resources:
+      deployment:
+        resource:
+          status:
+            availableReplicas: 2
+            conditions:
+            - type: Available
+              status: 'True'
+              reason: MinimumReplicasAvailable
+              message: Deployment has minimum availability
+      service:
+        resource:
+          spec:
+            clusterIP: 10.96.196.65
+  input:
+    composite: |
+        class Composite(BaseComposite):
+          def compose(self):
+            labels = {'example.crossplane.io/app': self.metadata.name}
+
+            d = self.resources.deployment('apps/v1', 'Deployment')
+            d.metadata.labels = labels
+            d.spec.replicas = 2
+            d.spec.selector.matchLabels = labels
+            d.spec.template.metadata.labels = labels
+            d.spec.template.spec.containers[0].name = 'app'
+            d.spec.template.spec.containers[0].image = self.spec.image
+            d.spec.template.spec.containers[0].ports[0].containerPort = 80
+            d.ready = d.conditions.Available.status
+
+            s = self.resources.service('v1', 'Service')
+            s.metadata.labels = labels
+            s.spec.selector = labels
+            s.spec.ports[0].protocol = 'TCP'
+            s.spec.ports[0].port = 8080
+            s.spec.ports[0].targetPort = 80
+            s.ready = s.observed.spec.clusterIP
+
+            self.status.replicas = d.status.availableReplicas
+            self.status.address = s.observed.spec.clusterIP
+
+response:
+  desired:
+    composite:
+      resource:
+        status:
+          replicas: 2
+          address: 10.96.196.65
+    resources:
+      deployment:
+        resource:
+          apiVersion: apps/v1
+          kind: Deployment
+          metadata:
+            labels:
+              example.crossplane.io/app: my-app
+          spec:
+            replicas: 2
+            selector:
+              matchLabels:
+                example.crossplane.io/app: my-app
+            template:
+              metadata:
+                labels:
+                  example.crossplane.io/app: my-app
+              spec:
+                containers:
+                - image: nginx
+                  name: app
+                  ports:
+                  - containerPort: 80
+        ready: 1
+      service:
+        resource:
+          apiVersion: v1
+          kind: Service
+          metadata:
+            labels:
+              example.crossplane.io/app: my-app
+          spec:
+            selector:
+              example.crossplane.io/app: my-app
+            ports:
+            - protocol: TCP
+              port: 8080
+              targetPort: 80
+        ready: 1

tests/utils.py

@@ -154,6 +154,11 @@ def message_dict(message):
                     value = message_list_list(field, value)
             else:
                 value = message_dict(value)
+        elif field.type in (field.TYPE_DOUBLE, field.TYPE_FLOAT):
+            if value.is_integer():
+                value = int(value)
+        elif field.type == field.TYPE_BYTES:
+            value = value.decode()
         result[field.name] = value
     return result
 
@@ -173,6 +178,9 @@ def message_map_dict(descriptor, message):
                     value = message_list_list(value)
             else:
                 value = message_dict(value)
+        elif descriptor.type in (descriptor.TYPE_DOUBLE, descriptor.TYPE_FLOAT):
+            if value.is_integer():
+                value = int(value)
         elif descriptor.type == descriptor.TYPE_BYTES:
             value = value.decode()
         result[field] = value
@@ -193,6 +201,9 @@ def message_list_list(descriptor, message):
                     value = message_list_list(value)
             else:
                 value = message_dict(value)
+        elif descriptor.type in (descriptor.TYPE_DOUBLE, descriptor.TYPE_FLOAT):
+            if value.is_integer():
+                value = int(value)
         elif descriptor.type == descriptor.TYPE_BYTES:
             value = value.decode()
         result.append(value)
@@ -205,6 +216,9 @@ def map_dict(message):
             value = map_dict(value)
         elif isinstance(value, ListValue):
             value = list_list(value)
+        elif isinstance(value, float):
+            if value.is_integer():
+                value = int(value)
         result[field] = value
     return result
 
@@ -215,5 +229,8 @@ def list_list(message):
             value = map_dict(value)
         elif isinstance(value, ListValue):
             value = list_list(value)
+        elif isinstance(value, float):
+            if value.is_integer():
+                value = int(value)
         result.append(value)
     return result