Merge branch 'master' into fix/ssh-key-env-lookup

hamlet-io · Feb 7, 2024 · ffd9d70 · ffd9d70
2 parents 60fae60 + 550b0b7
commit ffd9d70
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/aws/components/user/id.ftl b/aws/components/user/id.ftl
@@ -13,3 +13,16 @@
             AWS_TRANSFER_SERVICE
         ]
 /]
+
+
+[@addResourceGroupAttributeValues
+    type=USER_COMPONENT_TYPE
+    provider=AWS_PROVIDER
+    extensions=[
+        {
+            "Names" : "PermissionsBoundaryPolicyArn",
+            "Types": STRING_TYPE,
+            "Description": "The Arn of a Permissions Boundary Policy Arn"
+        }
+    ]
+/]
diff --git a/aws/components/user/setup.ftl b/aws/components/user/setup.ftl
@@ -234,6 +234,10 @@
                 attributeIfContent(
                     "ManagedPolicyArns",
                     getManagedPoliciesFromSet(policySet)
+                ) +
+                attributeIfContent(
+                    "PermissionsBoundary",
+                    (solution["aws:PermissionsBoundaryPolicyArn"])!""
                 )
             outputs=USER_OUTPUT_MAPPINGS
             tags=getOccurrenceTags(occurrence)