Tighten SwiftContainer API and e2e assertions

Author: eshulman2

api/v1alpha1/swiftcontainer_types.go

@@ -178,14 +178,4 @@ type SwiftContainerResourceStatus struct {
 	// +kubebuilder:validation:MaxLength=1024
 	// +optional
 	Versions string `json:"versions,omitempty"`
-
-	// quotaBytes is the quota on the maximum number of bytes that can be
-	// stored in the container, if set.
-	// +optional
-	QuotaBytes *int64 `json:"quotaBytes,omitempty"`
-
-	// quotaCount is the quota on the maximum number of objects that can be
-	// stored in the container, if set.
-	// +optional
-	QuotaCount *int64 `json:"quotaCount,omitempty"`
 }

api/v1alpha1/zz_generated.deepcopy.go

@@ -385,18 +385,6 @@ spec:
                       container.
                     format: int64
                     type: integer
-                  quotaBytes:
-                    description: |-
-                      quotaBytes is the quota on the maximum number of bytes that can be
-                      stored in the container, if set.
-                    format: int64
-                    type: integer
-                  quotaCount:
-                    description: |-
-                      quotaCount is the quota on the maximum number of objects that can be
-                      stored in the container, if set.
-                    format: int64
-                    type: integer
                   storagePolicy:
                     description: storagePolicy is the name of the storage policy assigned
                       to the container.

cmd/models-schema/zz_generated.openapi.go

@@ -6,8 +6,11 @@ metadata:
 status:
   resource:
     name: swiftcontainer-create-full-override
+    bytesUsed: 0
+    objectCount: 0
     containerRead: ".r:*,.rlistings"
     containerWrite: "openstack:*"
+    storagePolicy: Policy-0
   conditions:
   - type: Available
     status: "True"
@@ -26,9 +29,6 @@ resourceRefs:
 assertAll:
     - celExpr: "swiftcontainer.status.id != ''"
     - celExpr: "swiftcontainer.status.id == 'swiftcontainer-create-full-override'"
-    - celExpr: "swiftcontainer.status.resource.name == 'swiftcontainer-create-full-override'"
-    - celExpr: "swiftcontainer.status.resource.containerRead == '.r:*,.rlistings'"
-    - celExpr: "swiftcontainer.status.resource.containerWrite == 'openstack:*'"
     - celExpr: "has(swiftcontainer.status.resource.metadata)"
     - celExpr: "swiftcontainer.status.resource.metadata.exists(m, m.name == 'Environment' && m.value == 'test')"
     - celExpr: "swiftcontainer.status.resource.metadata.exists(m, m.name == 'Owner' && m.value == 'orc-e2e')"

config/crd/bases/openstack.k-orc.cloud_swiftcontainers.yaml

@@ -17,3 +17,4 @@ spec:
         value: orc-e2e
     containerRead: ".r:*,.rlistings"
     containerWrite: "openstack:*"
+    storagePolicy: Policy-0

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

@@ -12,6 +12,8 @@ Validates that:
   `status.resource.metadata`.
 - Read ACL (`containerRead`) and write ACL (`containerWrite`) are configured
   and reflected in `status.resource`.
+- Storage policy (`storagePolicy`) is configured and reflected in
+  `status.resource`.
 - `Available=True` and `Progressing=False` conditions are set.
 
 ## Reference

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

@@ -6,6 +6,8 @@ metadata:
 status:
   resource:
     name: swiftcontainer-create-minimal
+    bytesUsed: 0
+    objectCount: 0
   conditions:
   - type: Available
     status: "True"

internal/controllers/swiftcontainer/tests/swiftcontainer-create-full/README.md

@@ -34,3 +34,5 @@ status:
       reason: Success
   resource:
     name: swiftcontainer-import-external
+    bytesUsed: 0
+    objectCount: 0

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

@@ -19,6 +19,8 @@ metadata:
 status:
   resource:
     name: swiftcontainer-update
+    bytesUsed: 0
+    objectCount: 0
   conditions:
   - type: Available
     status: "True"