changing tags structure

awslabs · Sep 10, 2023 · 263fbaf · 263fbaf
1 parent 46fa6df
commit 263fbaf
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 22 deletions.
diff --git a/compositions/upbound-aws-provider/cloudwatch-logs/subscriptionfilter.yaml b/compositions/upbound-aws-provider/cloudwatch-logs/subscriptionfilter.yaml
@@ -31,7 +31,7 @@ spec:
           toFieldPath: spec.forProvider.tags
           policy:
             mergeOptions:
-              appendSlice: true
+              keepMapValues: true
         - type: FromCompositeFieldPath
           fromFieldPath: spec.resourceConfig.name
           toFieldPath: metadata.annotations[crossplane.io/external-name]

diff --git a/compositions/upbound-aws-provider/event-source-mapping/sqs.yaml b/compositions/upbound-aws-provider/event-source-mapping/sqs.yaml
@@ -25,7 +25,7 @@ spec:
           toFieldPath: spec.forProvider.tags
           policy:
             mergeOptions:
-              appendSlice: true
+              keepMapValues: true
         - fromFieldPath: "metadata.name"
           toFieldPath: "metadata.name"
           transforms:

diff --git a/compositions/upbound-aws-provider/kinesis-data-firehose-app/log-forwarder.yaml b/compositions/upbound-aws-provider/kinesis-data-firehose-app/log-forwarder.yaml
@@ -36,7 +36,7 @@ spec:
           toFieldPath: spec.forProvider.tags
           policy:
             mergeOptions:
-              appendSlice: true
+              keepMapValues: true
         - fromFieldPath: "metadata.name"
           toFieldPath: "metadata.name"
   environment:

diff --git a/compositions/upbound-aws-provider/kinesis-data-firehose/kinesis-data-firehose.yaml b/compositions/upbound-aws-provider/kinesis-data-firehose/kinesis-data-firehose.yaml
@@ -30,7 +30,7 @@ spec:
           toFieldPath: spec.forProvider.tags
           policy:
             mergeOptions:
-              appendSlice: true
+              keepMapValues: true
         - type: FromCompositeFieldPath
           fromFieldPath: spec.resourceConfig.name
           toFieldPath: metadata.annotations[crossplane.io/external-name]

diff --git a/compositions/upbound-aws-provider/kms/kms.yaml b/compositions/upbound-aws-provider/kms/kms.yaml
@@ -29,7 +29,7 @@ spec:
           toFieldPath: spec.forProvider.tags
           policy:
             mergeOptions:
-              appendSlice: true
+              keepMapValues: true
   resources:
     - name: key
       base:

diff --git a/compositions/upbound-aws-provider/lambda/container.yaml b/compositions/upbound-aws-provider/lambda/container.yaml
@@ -27,7 +27,7 @@ spec:
           toFieldPath: spec.forProvider.tags
           policy:
             mergeOptions:
-              appendSlice: true
+              keepMapValues: true
         - fromFieldPath: "metadata.name"
           toFieldPath: "metadata.name"
   resources:

diff --git a/compositions/upbound-aws-provider/lambda/zip.yaml b/compositions/upbound-aws-provider/lambda/zip.yaml
@@ -27,7 +27,7 @@ spec:
           toFieldPath: spec.forProvider.tags
           policy:
             mergeOptions:
-              appendSlice: true
+              keepMapValues: true
         - fromFieldPath: "metadata.name"
           toFieldPath: "metadata.name"
   resources:

diff --git a/compositions/upbound-aws-provider/s3/definition.yaml b/compositions/upbound-aws-provider/s3/definition.yaml
@@ -42,17 +42,9 @@ spec:
                     region:
                       type: string
                     tags:
-                      items:
-                        properties:
-                          key:
-                            type: string
-                          value:
-                            type: string
-                        required:
-                        - key
-                        - value
-                        type: object
-                      type: array
+                      additionalProperties:
+                        type: string
+                      type: object
                   required:
                   - providerConfigName
                   - region

diff --git a/compositions/upbound-aws-provider/s3/general-purpose.yaml b/compositions/upbound-aws-provider/s3/general-purpose.yaml
@@ -30,7 +30,7 @@ spec:
           toFieldPath: spec.forProvider.tags
           policy:
             mergeOptions:
-              appendSlice: true
+              keepMapValues: true
         - type: FromCompositeFieldPath
           fromFieldPath: spec.resourceConfig.name
           toFieldPath: metadata.annotations[crossplane.io/external-name]

diff --git a/compositions/upbound-aws-provider/sns-sqs/sns-sqs.yaml b/compositions/upbound-aws-provider/sns-sqs/sns-sqs.yaml
@@ -40,7 +40,7 @@ spec:
           toFieldPath: spec.forProvider.tags
           policy:
             mergeOptions:
-              appendSlice: true
+              keepMapValues: true
         - type: FromCompositeFieldPath
           fromFieldPath: spec.resourceConfig.name
           toFieldPath: metadata.annotations[crossplane.io/external-name]

diff --git a/compositions/upbound-aws-provider/sns/sns.yaml b/compositions/upbound-aws-provider/sns/sns.yaml
@@ -31,7 +31,7 @@ spec:
           toFieldPath: spec.forProvider.tags
           policy:
             mergeOptions:
-              appendSlice: true
+              keepMapValues: true
         - type: FromCompositeFieldPath
           fromFieldPath: spec.resourceConfig.name
           toFieldPath: metadata.annotations[crossplane.io/external-name]

diff --git a/compositions/upbound-aws-provider/sqs/sqs.yaml b/compositions/upbound-aws-provider/sqs/sqs.yaml
@@ -29,7 +29,7 @@ spec:
           toFieldPath: spec.forProvider.tags
           policy:
             mergeOptions:
-              appendSlice: true
+              keepMapValues: true
         - type: FromCompositeFieldPath
           fromFieldPath: spec.resourceConfig.name
           toFieldPath: metadata.annotations[crossplane.io/external-name]