apigw warning cleanup

awslabs · Mar 25, 2024 · 98acd42 · 98acd42
1 parent 709c184
commit 98acd42
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 10 deletions.
diff --git a/compositions/upbound-aws-provider/apigw/definition.yaml b/compositions/upbound-aws-provider/apigw/definition.yaml
@@ -69,6 +69,10 @@ spec:
                       type: string
                     region:
                       type: string
+                    tags:
+                      additionalProperties:
+                        type: string
+                      type: object
                   required:
                   - region
                   type: object

diff --git a/compositions/upbound-aws-provider/apigw/rest.yaml b/compositions/upbound-aws-provider/apigw/rest.yaml
@@ -19,18 +19,9 @@ spec:
         - type: FromCompositeFieldPath
           fromFieldPath: spec.resourceConfig.deletionPolicy
           toFieldPath: spec.deletionPolicy
-        - type: FromCompositeFieldPath
-          fromFieldPath: spec.resourceConfig.region
-          toFieldPath: spec.forProvider.region
         - type: FromCompositeFieldPath
           fromFieldPath: spec.resourceConfig.providerConfigName
           toFieldPath: spec.providerConfigRef.name
-        - type: FromCompositeFieldPath
-          fromFieldPath: spec.resourceConfig.tags
-          toFieldPath: spec.forProvider.tags
-          policy:
-            mergeOptions:
-              keepMapValues: true
         - fromFieldPath: "metadata.name"
           toFieldPath: "metadata.name"
   resources:
@@ -48,6 +39,9 @@ spec:
       patches:
         - type: PatchSet
           patchSetName: common-fields
+        - type: FromCompositeFieldPath
+          fromFieldPath: spec.resourceConfig.region
+          toFieldPath: spec.forProvider.region
         - type: FromCompositeFieldPath
           fromFieldPath: metadata.name
           toFieldPath: metadata.name
@@ -88,6 +82,12 @@ spec:
                 type: Regexp
                 regexp:
                   match: \d{12,}          
+        - type: FromCompositeFieldPath
+          fromFieldPath: spec.resourceConfig.tags
+          toFieldPath: spec.forProvider.tags
+          policy:
+            mergeOptions:
+              keepMapValues: true
 
     - name: apigw-role
       base:
@@ -129,6 +129,12 @@ spec:
         - type: ToCompositeFieldPath
           fromFieldPath: status.atProvider.id
           toFieldPath: status.apigwRoleName
+        - type: FromCompositeFieldPath
+          fromFieldPath: spec.resourceConfig.tags
+          toFieldPath: spec.forProvider.tags
+          policy:
+            mergeOptions:
+              keepMapValues: true
 
     - name: api-deployment
       base:
@@ -142,6 +148,9 @@ spec:
       patches:
         - type: PatchSet
           patchSetName: common-fields
+        - type: FromCompositeFieldPath
+          fromFieldPath: spec.resourceConfig.region
+          toFieldPath: spec.forProvider.region
         - type: FromCompositeFieldPath
           fromFieldPath: metadata.name
           toFieldPath: metadata.name
@@ -184,6 +193,9 @@ spec:
       patches:
         - type: PatchSet
           patchSetName: common-fields
+        - type: FromCompositeFieldPath
+          fromFieldPath: spec.resourceConfig.region
+          toFieldPath: spec.forProvider.region
         - type: FromCompositeFieldPath
           fromFieldPath: metadata.name
           toFieldPath: metadata.name
@@ -205,6 +217,12 @@ spec:
         - type: ToCompositeFieldPath
           fromFieldPath: status.atProvider.stageName
           toFieldPath: status.apigwStageName
+        - type: FromCompositeFieldPath
+          fromFieldPath: spec.resourceConfig.tags
+          toFieldPath: spec.forProvider.tags
+          policy:
+            mergeOptions:
+              keepMapValues: true
 
     - name: api-access-logs-group
       base:
@@ -217,6 +235,9 @@ spec:
       patches:
         - type: PatchSet
           patchSetName: common-fields
+        - type: FromCompositeFieldPath
+          fromFieldPath: spec.resourceConfig.region
+          toFieldPath: spec.forProvider.region
         - type: FromCompositeFieldPath
           fromFieldPath: metadata.name
           toFieldPath: metadata.name
@@ -230,6 +251,12 @@ spec:
         - type: ToCompositeFieldPath
           fromFieldPath: status.atProvider.arn
           toFieldPath: status.apigwAccessLogsGroupArn
+        - type: FromCompositeFieldPath
+          fromFieldPath: spec.resourceConfig.tags
+          toFieldPath: spec.forProvider.tags
+          policy:
+            mergeOptions:
+              keepMapValues: true
 
     - name: apigw-logging-account
       base:
@@ -243,6 +270,9 @@ spec:
       patches:
         - type: PatchSet
           patchSetName: common-fields
+        - type: FromCompositeFieldPath
+          fromFieldPath: spec.resourceConfig.region
+          toFieldPath: spec.forProvider.region
         - type: FromCompositeFieldPath
           fromFieldPath: metadata.name
           toFieldPath: metadata.name
@@ -270,6 +300,9 @@ spec:
       patches:
         - type: PatchSet
           patchSetName: common-fields
+        - type: FromCompositeFieldPath
+          fromFieldPath: spec.resourceConfig.region
+          toFieldPath: spec.forProvider.region
         - type: FromCompositeFieldPath
           fromFieldPath: metadata.name
           toFieldPath: metadata.name
@@ -279,4 +312,4 @@ spec:
                 fmt: "%s-api-method-settings"
         - type: FromCompositeFieldPath
           fromFieldPath: spec.logLevel
-          toFieldPath: spec.forProvider.loggingLevel
+          toFieldPath: spec.forProvider.settings[0].loggingLevel