ApplicationCredential Tests and Config Samples

On-behalf-of: SAP nils.gondermann@sap.com

Author: gndrmnn

config/samples/openstack_v1alpha1_applicationcredential.yaml

@@ -5,10 +5,19 @@ metadata:
   name: applicationcredential-sample
 spec:
   cloudCredentialsRef:
-    # TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
     cloudName: openstack
     secretName: openstack-clouds
   managementPolicy: managed
   resource:
     description: Sample ApplicationCredential
-    # TODO(scaffolding): Add all fields the resource supports
+    name: application-credential
+    userRef: user-ref
+    secret:
+      secretRef: secret-ref
+    unrestricted: False
+    roles:
+      - name: "role-name"
+    accessRules:
+      - method: "GET"
+        service: "monitoring"
+    expiresAt: "2022-02-02T22:22:22.000000"

internal/controllers/applicationcredential/tests/applicationcredential-create-full/00-assert.yaml

@@ -7,7 +7,14 @@ status:
   resource:
     name: applicationcredential-create-full-override
     description: ApplicationCredential from "create full" test
-    # TODO(scaffolding): Add all fields the resource supports
+    unrestricted: true
+    roles:
+      - name: "reader"
+    accessRules:
+      - method: "GET"
+        service: "compute"
+        path: "/v2.1/servers"
+    expiresAt: "2033-03-03T22:22:22Z"
   conditions:
   - type: Available
     status: "True"
@@ -29,5 +36,5 @@ resourceRefs:
       ref: user
 assertAll:
     - celExpr: "applicationcredential.status.id != ''"
-    - celExpr: "applicationcredential.status.resource.userID == user.status.id"
-    # TODO(scaffolding): Add more checks
+    - celExpr: "applicationcredential.status.resource.roles[0].id != ''"
+    - celExpr: "applicationcredential.status.resource.accessRules[0].id != ''"

internal/controllers/applicationcredential/tests/applicationcredential-create-full/00-create-resource.yaml

@@ -5,25 +5,32 @@ metadata:
   name: applicationcredential-create-full
 spec:
   cloudCredentialsRef:
-    # TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
     cloudName: openstack
-    secretName: openstack-clouds
+    secretName: openstack-admin
   managementPolicy: managed
-  # TODO(scaffolding): Add the necessary fields to create the resource
-  resource: {}
+  resource:
+    description: applicationcredential-user
 ---
 apiVersion: openstack.k-orc.cloud/v1alpha1
 kind: ApplicationCredential
 metadata:
   name: applicationcredential-create-full
 spec:
   cloudCredentialsRef:
-    # TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
     cloudName: openstack
-    secretName: openstack-clouds
+    secretName: openstack-admin
   managementPolicy: managed
   resource:
     name: applicationcredential-create-full-override
     description: ApplicationCredential from "create full" test
     userRef: applicationcredential-create-full
-    # TODO(scaffolding): Add all fields the resource supports
+    unrestricted: true
+    secret:
+      secretRef: "application-credential-secret"
+    roles:
+      - name: "reader"
+    accessRules:
+      - method: "GET"
+        service: "compute"
+        path: "/v2.1/servers"
+    expiresAt: "2033-03-03T22:22:22Z"

internal/controllers/applicationcredential/tests/applicationcredential-create-full/00-secret.yaml

@@ -4,3 +4,5 @@ kind: TestStep
 commands:
   - command: kubectl create secret generic openstack-clouds --from-file=clouds.yaml=${E2E_KUTTL_OSCLOUDS} ${E2E_KUTTL_CACERT_OPT}
     namespaced: true
+  - command: kubectl create secret generic application-credential-secret --from-literal=value=abc123
+    namespaced: true

internal/controllers/applicationcredential/tests/applicationcredential-create-minimal/00-assert.yaml

@@ -5,8 +5,9 @@ metadata:
   name: applicationcredential-create-minimal
 status:
   resource:
+    # Name should default to object name
     name: applicationcredential-create-minimal
-    # TODO(scaffolding): Add all fields the resource supports
+    unrestricted: false
   conditions:
   - type: Available
     status: "True"
@@ -28,5 +29,5 @@ resourceRefs:
       ref: user
 assertAll:
     - celExpr: "applicationcredential.status.id != ''"
-    - celExpr: "applicationcredential.status.resource.userID == user.status.id"
-    # TODO(scaffolding): Add more checks
+    - celExpr: "applicationcredential.status.resource.projectID != ''"
+    - celExpr: "!has(applicationcredential.status.resource.description)"

internal/controllers/applicationcredential/tests/applicationcredential-create-minimal/00-create-resource.yaml

@@ -5,24 +5,22 @@ metadata:
   name: applicationcredential-create-minimal
 spec:
   cloudCredentialsRef:
-    # TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
     cloudName: openstack
-    secretName: openstack-clouds
+    secretName: openstack-admin
   managementPolicy: managed
-  # TODO(scaffolding): Add the necessary fields to create the resource
-  resource: {}
+  resource:
+    description: applicationcredential-user
 ---
 apiVersion: openstack.k-orc.cloud/v1alpha1
 kind: ApplicationCredential
 metadata:
   name: applicationcredential-create-minimal
 spec:
   cloudCredentialsRef:
-    # TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
     cloudName: openstack
-    secretName: openstack-clouds
+    secretName: openstack-admin
   managementPolicy: managed
-  # TODO(scaffolding): Only add the mandatory fields. It's possible the resource
-  # doesn't have mandatory fields, in that case, leave it empty.
   resource:
     userRef: applicationcredential-create-minimal
+    secret:
+      secretRef: "application-credential-secret"

internal/controllers/applicationcredential/tests/applicationcredential-create-minimal/00-secret.yaml

@@ -4,3 +4,5 @@ kind: TestStep
 commands:
   - command: kubectl create secret generic openstack-clouds --from-file=clouds.yaml=${E2E_KUTTL_OSCLOUDS} ${E2E_KUTTL_CACERT_OPT}
     namespaced: true
+  - command: kubectl create secret generic application-credential-secret --from-literal=value=abc123
+    namespaced: true

internal/controllers/applicationcredential/tests/applicationcredential-create-minimal/01-delete-secret.yaml

@@ -5,3 +5,5 @@ commands:
   # We expect the deletion to hang due to the finalizer, so use --wait=false
   - command: kubectl delete secret openstack-clouds --wait=false
     namespaced: true
+  - command: kubectl delete secret application-credential-secret --wait=false
+    namespaced: true

internal/controllers/applicationcredential/tests/applicationcredential-dependency/00-create-resources-missing-deps.yaml

@@ -5,38 +5,34 @@ metadata:
   name: applicationcredential-dependency
 spec:
   cloudCredentialsRef:
-    # TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
     cloudName: openstack
-    secretName: openstack-clouds
+    secretName: openstack-admin
   managementPolicy: managed
-  # TODO(scaffolding): Add the necessary fields to create the resource
-  resource: {}
+  resource:
+    description: applicationcredential-user
 ---
 apiVersion: openstack.k-orc.cloud/v1alpha1
 kind: ApplicationCredential
 metadata:
   name: applicationcredential-dependency-no-user
 spec:
   cloudCredentialsRef:
-    # TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
     cloudName: openstack
-    secretName: openstack-clouds
+    secretName: openstack-admin
   managementPolicy: managed
   resource:
     userRef: applicationcredential-dependency-pending
-    # TODO(scaffolding): Add the necessary fields to create the resource
-
+    secret:
+      secretRef: "application-credential-secret"
 ---
 apiVersion: openstack.k-orc.cloud/v1alpha1
 kind: ApplicationCredential
 metadata:
   name: applicationcredential-dependency-no-secret
 spec:
   cloudCredentialsRef:
-    # TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
     cloudName: openstack
     secretName: applicationcredential-dependency
   managementPolicy: managed
-  # TODO(scaffolding): Add the necessary fields to create the resource
   resource:
     userRef: applicationcredential-dependency

internal/controllers/applicationcredential/tests/applicationcredential-dependency/00-secret.yaml

@@ -4,3 +4,5 @@ kind: TestStep
 commands:
   - command: kubectl create secret generic openstack-clouds --from-file=clouds.yaml=${E2E_KUTTL_OSCLOUDS} ${E2E_KUTTL_CACERT_OPT}
     namespaced: true
+  - command: kubectl create secret generic application-credential-secret --from-literal=value=abc123
+    namespaced: true