Set the MaxItems=1 constraint on aws_s3_directory_bucket.location

Signed-off-by: Alper Rifat Ulucinar <[email protected]>
crossplane-contrib · Aug 29, 2024 · c7e4f5e · c7e4f5e
1 parent 01316ae
commit c7e4f5e
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 46 deletions.
diff --git a/apis/s3/v1beta1/zz_directorybucket_types.go b/apis/s3/v1beta1/zz_directorybucket_types.go
diff --git a/apis/s3/v1beta1/zz_generated.deepcopy.go b/apis/s3/v1beta1/zz_generated.deepcopy.go
diff --git a/config/overrides.go b/config/overrides.go
@@ -213,3 +213,23 @@ func injectFieldRenamingConversionFunctions() config.ResourceOption {
 		}
 	}
 }
+
+// setMaxItemsConstraintsOnFrameworkResources configures the MaxItems
+// constraints on framework resources. For some Terraform framework resources
+// such as the aws_s3_directory_bucket, the max items constraint is specified
+// via the listvalidator.SizeAtMost validator:
+// https://github.com/hashicorp/terraform-provider-aws/blob/3d69baf5b6762008170af6bf17c963ccc17d5174/internal/service/s3/directory_bucket.go#L121
+// Unfortunately, this constraint is *not* available in the JSON schema
+// and thus, is not available to the singleton list embedder.
+// So, for now, we need to manually configure the MaxItems SDK constraint for
+// the resource.
+func setMaxItemsConstraintsOnFrameworkResources() config.ResourceOption {
+	return func(r *config.Resource) {
+		switch r.Name {
+		case "aws_s3_directory_bucket":
+			r.TerraformResource.Schema["location"].MaxItems = 1
+		default:
+			return
+		}
+	}
+}
diff --git a/config/registry.go b/config/registry.go
@@ -161,6 +161,7 @@ func GetProvider(ctx context.Context, generationProvider bool) (*config.Provider
 			NamePrefixRemoval(),
 			DocumentationForTags(),
 			injectFieldRenamingConversionFunctions(),
+			setMaxItemsConstraintsOnFrameworkResources(),
 		),
 	)
 	pc.BasePackages.ControllerMap["internal/controller/eks/clusterauth"] = "eks"

diff --git a/examples/s3/v1beta1/directorybucket.yaml b/examples/s3/v1beta1/directorybucket.yaml
@@ -11,5 +11,5 @@ metadata:
 spec:
   forProvider:
     location:
-    - name: usw2-az1
+      name: usw2-az1
     region: us-west-2
diff --git a/package/crds/s3.aws.upbound.io_directorybuckets.yaml b/package/crds/s3.aws.upbound.io_directorybuckets.yaml
@@ -87,16 +87,14 @@ spec:
                     type: boolean
                   location:
                     description: Bucket location. See Location below for more details.
-                    items:
-                      properties:
-                        name:
-                          description: Availability Zone ID.
-                          type: string
-                        type:
-                          description: 'Location type. Valid values: AvailabilityZone.'
-                          type: string
-                      type: object
-                    type: array
+                    properties:
+                      name:
+                        description: Availability Zone ID.
+                        type: string
+                      type:
+                        description: 'Location type. Valid values: AvailabilityZone.'
+                        type: string
+                    type: object
                   region:
                     description: Region is the region you'd like your resource to
                       be created in.
@@ -134,16 +132,14 @@ spec:
                     type: boolean
                   location:
                     description: Bucket location. See Location below for more details.
-                    items:
-                      properties:
-                        name:
-                          description: Availability Zone ID.
-                          type: string
-                        type:
-                          description: 'Location type. Valid values: AvailabilityZone.'
-                          type: string
-                      type: object
-                    type: array
+                    properties:
+                      name:
+                        description: Availability Zone ID.
+                        type: string
+                      type:
+                        description: 'Location type. Valid values: AvailabilityZone.'
+                        type: string
+                    type: object
                   type:
                     description: 'Bucket type. Valid values: Directory.'
                     type: string
@@ -340,16 +336,14 @@ spec:
                     type: string
                   location:
                     description: Bucket location. See Location below for more details.
-                    items:
-                      properties:
-                        name:
-                          description: Availability Zone ID.
-                          type: string
-                        type:
-                          description: 'Location type. Valid values: AvailabilityZone.'
-                          type: string
-                      type: object
-                    type: array
+                    properties:
+                      name:
+                        description: Availability Zone ID.
+                        type: string
+                      type:
+                        description: 'Location type. Valid values: AvailabilityZone.'
+                        type: string
+                    type: object
                   type:
                     description: 'Bucket type. Valid values: Directory.'
                     type: string