create securityPolicy for collection test

michaelhtm · michaelhtm · commit 88579de0f39b · 2025-07-10T15:34:08.000-07:00
diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml
@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2025-06-19T21:14:45Z"
-  build_hash: 97e1ac99991554a8b5b15a3438a47d99b7a9fe5e
+  build_date: "2025-07-10T18:26:15Z"
+  build_hash: 49a32e72777469d874a917cf1da21809d988dccc
   go_version: go1.24.4
-  version: v0.48.0-1-g97e1ac9
-api_directory_checksum: 1ea4d7047f68b6a8dfbecdc4e58479448445ed9b
+  version: v0.48.0-2-g49a32e7
+api_directory_checksum: dbc5ac7c558bed32e348e97ad5a24ba6a1d11663
 api_version: v1alpha1
 aws_sdk_go_version: v1.32.6
 generator_config_info:
-  file_checksum: 4ec896af7b28defebc9c43c5e76a318966558ba0
+  file_checksum: 7a90e961a337ec92afdf159ec2eae7e86068cc85
   original_file_name: generator.yaml
 last_modification:
   reason: API generation
diff --git a/apis/v1alpha1/collection.go b/apis/v1alpha1/collection.go
diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml
@@ -17,6 +17,7 @@ operations:
   BatchGetCollection:
     operation_type:
     - List
+    output_wrapper_field_path: CollectionDetails
     resource_name: Collection
 resources:
   SecurityPolicy:
@@ -43,6 +44,12 @@ resources:
     fields:
       Type:
         go_tag: json:"type,omitempty"
+      Name:
+        is_immutable: true
+      StandbyReplicas:
+        is_immutable: true
+      Type:
+        is_immutable: true
     hooks:
       sdk_update_pre_build_request:
         template_path: hooks/collection/sdk_update_pre_build_request.go.tpl
diff --git a/config/crd/bases/opensearchserverless.services.k8s.aws_collections.yaml b/config/crd/bases/opensearchserverless.services.k8s.aws_collections.yaml
@@ -48,10 +48,16 @@ spec:
 
                   Regex Pattern: `^[a-z][a-z0-9-]+$`
                 type: string
+                x-kubernetes-validations:
+                - message: Value is immutable once set
+                  rule: self == oldSelf
               standbyReplicas:
                 description: Indicates whether standby replicas should be used for
                   a collection.
                 type: string
+                x-kubernetes-validations:
+                - message: Value is immutable once set
+                  rule: self == oldSelf
               tags:
                 description: |-
                   An arbitrary set of tags (key–value pairs) to associate with the OpenSearch
@@ -66,9 +72,12 @@ spec:
                       type: string
                   type: object
                 type: array
-              type:
+              type_:
                 description: The type of collection.
                 type: string
+                x-kubernetes-validations:
+                - message: Value is immutable once set
+                  rule: self == oldSelf
             required:
             - name
             type: object
diff --git a/generator.yaml b/generator.yaml
@@ -17,6 +17,7 @@ operations:
   BatchGetCollection:
     operation_type:
     - List
+    output_wrapper_field_path: CollectionDetails
     resource_name: Collection
 resources:
   SecurityPolicy:
@@ -43,6 +44,12 @@ resources:
     fields:
       Type:
         go_tag: json:"type,omitempty"
+      Name:
+        is_immutable: true
+      StandbyReplicas:
+        is_immutable: true
+      Type:
+        is_immutable: true
     hooks:
       sdk_update_pre_build_request:
         template_path: hooks/collection/sdk_update_pre_build_request.go.tpl
diff --git a/helm/crds/opensearchserverless.services.k8s.aws_collections.yaml b/helm/crds/opensearchserverless.services.k8s.aws_collections.yaml
@@ -48,10 +48,16 @@ spec:
 
                   Regex Pattern: `^[a-z][a-z0-9-]+$`
                 type: string
+                x-kubernetes-validations:
+                - message: Value is immutable once set
+                  rule: self == oldSelf
               standbyReplicas:
                 description: Indicates whether standby replicas should be used for
                   a collection.
                 type: string
+                x-kubernetes-validations:
+                - message: Value is immutable once set
+                  rule: self == oldSelf
               tags:
                 description: |-
                   An arbitrary set of tags (key–value pairs) to associate with the OpenSearch
@@ -66,9 +72,12 @@ spec:
                       type: string
                   type: object
                 type: array
-              type:
+              type_:
                 description: The type of collection.
                 type: string
+                x-kubernetes-validations:
+                - message: Value is immutable once set
+                  rule: self == oldSelf
             required:
             - name
             type: object
diff --git a/pkg/resource/collection/hooks.go b/pkg/resource/collection/hooks.go
@@ -14,8 +14,20 @@
 package collection
 
 import (
+	svcsdktypes "github.com/aws/aws-sdk-go-v2/service/opensearchserverless/types"
+
 	"github.com/aws-controllers-k8s/opensearchserverless-controller/pkg/sync"
 )
 
 var syncTags = sync.Tags
 var getTags = sync.GetTags
+
+
+// collectionIsActive returns true if the collection is active, or false if it is not active
+func collectionIsActive(desired *resource) bool {
+	if desired.ko.Status.Status != nil && *desired.ko.Status.Status == string(svcsdktypes.CollectionStatusActive) {
+		return true
+	}
+
+	return false
+}
diff --git a/pkg/resource/collection/sdk.go b/pkg/resource/collection/sdk.go
diff --git a/pkg/sync/tags.go b/pkg/sync/tags.go
@@ -26,7 +26,7 @@ import (
 	svcapitypes "github.com/aws-controllers-k8s/opensearchserverless-controller/apis/v1alpha1"
 )
 
-// SyncTags examines the Tags in the supplied Resource and calls the
+// Tags examines the Tags in the supplied Resource and calls the
 // TagResource and UntagResource APIs to ensure that the set of
 // associated Tags stays in sync with the Resource.Spec.Tags
 func Tags(
diff --git a/templates/hooks/collection/sdk_read_many_post_set_output.go.tpl b/templates/hooks/collection/sdk_read_many_post_set_output.go.tpl
@@ -1,4 +1,8 @@
-	r.ko.Spec.Tags, err = getTags(ctx, string(*ko.Status.ACKResourceMetadata.ARN), rm.sdkapi, rm.metrics)
+	ko.Spec.Tags, err = getTags(ctx, string(*ko.Status.ACKResourceMetadata.ARN), rm.sdkapi, rm.metrics)
 	if err != nil {
 		return &resource{ko}, err
-	}
+	}
+
+	if !collectionIsActive(&resource{ko}) {
+		ackcondition.SetSynced(&resource{ko}, corev1.ConditionFalse, aws.String("collection is not active"), nil)
+	}
diff --git a/templates/hooks/collection/sdk_update_pre_build_request.go.tpl b/templates/hooks/collection/sdk_update_pre_build_request.go.tpl
@@ -1,4 +1,7 @@
 	desired.SetStatus(latest)
+	if !collectionIsActive(desired) {
+		return desired, ackrequeue.Needed(fmt.Errorf("resource is %s", *desired.ko.Status.Status))
+	}
 	if delta.DifferentAt("Spec.Tags") {
 		arn := string(*latest.ko.Status.ACKResourceMetadata.ARN)
 		err = syncTags(
diff --git a/test/e2e/tests/test_collection.py b/test/e2e/tests/test_collection.py
@@ -24,19 +24,22 @@
 from e2e import service_marker, CRD_GROUP, CRD_VERSION, load_resource
 from e2e.replacement_values import REPLACEMENT_VALUES
 from e2e import collection
+from e2e.tests.test_security_policy import simple_security_policy
 
 COLLECTION_RESOURCE_PLURAL = "collections"
 DELETE_WAIT_AFTER_SECONDS = 10
 CHECK_STATUS_WAIT_SECONDS = 30
 MODIFY_WAIT_AFTER_SECONDS = 30
 INITIAL_DESCRIPTION = "Initial Description"
-UPDATED_DESCRIPTION = "UPDATEd Description"
+UPDATED_DESCRIPTION = "Updated Description"
 
 
-@pytest.fixture(scope="module")
-def simple_collection():
+@pytest.fixture
+def simple_collection(simple_security_policy):
+    # EncryptionType securityPolicy is required to create Collection resource
+    _, _ = simple_security_policy
+    
     collection_name = random_suffix_name("my-collection", 24)
-
     replacements = REPLACEMENT_VALUES.copy()
     replacements['COLLECTION_NAME'] = collection_name
     replacements['DESCRIPTION'] = "Initial Description"
@@ -92,10 +95,14 @@ def test_crud(self, simple_collection):
         desired_tags = cr['spec']['tags']
         tags.assert_ack_system_tags(
             tags=latest_tags,
+            key_member_name='key',
+            value_member_name='value'
         )
         tags.assert_equal_without_ack_tags(
             expected=desired_tags,
             actual=latest_tags,
+            key_member_name='key',
+            value_member_name='value'
         )
 
         # Update the collection
@@ -131,8 +138,12 @@ def test_crud(self, simple_collection):
         desired_tags = cr['spec']['tags']
         tags.assert_ack_system_tags(
             tags=latest_tags,
+            key_member_name='key',
+            value_member_name='value'
         )
         tags.assert_equal_without_ack_tags(
             expected=desired_tags,
             actual=latest_tags,
+            key_member_name='key',
+            value_member_name='value'
         )
diff --git a/test/e2e/tests/test_security_policy.py b/test/e2e/tests/test_security_policy.py
@@ -41,22 +41,28 @@
 UPDATED_NETWORK_POLICY = '[{"Rules": [{"ResourceType": "collection","Resource": ["collection/*"]},{"ResourceType": "dashboard","Resource": ["collection/logs*"]}],"AllowFromPublic": true}]'
 
 
-
 @pytest.fixture
 def simple_security_policy(request):
     sp_name = random_suffix_name("my-security-policy", 24)
     marker = request.node.get_closest_marker("resource_data")
-    assert marker is not None
-    data = marker.args[0]
-    # either encryption or network
-    assert 'type' in data
-    assert 'policy' in data
+    # We want to default to an encryptionPolicy that applies to all collections
+    # when no marker is provided. This will allow us to create SecurityPolicy
+    # seamlessly when testing Collections
+    sp_type = "encryption"
+    sp_policy = UPDATED_ENCRYPTION_POLICY
+    if marker is not None:
+        data = marker.args[0]
+        # either encryption or network
+        assert 'type' in data
+        sp_type = data['type']
+        assert 'policy' in data
+        sp_policy = data['policy']
 
     replacements = REPLACEMENT_VALUES.copy()
     replacements['SECURITY_POLICY_NAME'] = sp_name
     replacements['SECURITY_POLICY_DESCRIPTION'] = INITIAL_DESCRIPTION
-    replacements['SECURITY_POLICY_TYPE'] = data['type']
-    replacements['SECURITY_POLICY'] = data['policy']
+    replacements['SECURITY_POLICY_TYPE'] = sp_type
+    replacements['SECURITY_POLICY'] = sp_policy
 
     resource_data = load_resource(
         "security_policy",

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import (`
`26`	`26`	`svcapitypes "github.com/aws-controllers-k8s/opensearchserverless-controller/apis/v1alpha1"`
`27`	`27`	`)`
`28`	`28`
`29`		`-// SyncTags examines the Tags in the supplied Resource and calls the`
	`29`	`+// Tags examines the Tags in the supplied Resource and calls the`
`30`	`30`	`// TagResource and UntagResource APIs to ensure that the set of`
`31`	`31`	`// associated Tags stays in sync with the Resource.Spec.Tags`
`32`	`32`	`func Tags(`