Add support for new policy type RESOURCE_CONTROL_POLICY

aws-cloudformation · Nov 20, 2024 · 449ca07 · 449ca07
1 parent 5868cd8
commit 449ca07
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/aws-organizations-policy/aws-organizations-policy.json b/aws-organizations-policy/aws-organizations-policy.json
@@ -18,7 +18,8 @@
         "AISERVICES_OPT_OUT_POLICY",
         "BACKUP_POLICY",
         "TAG_POLICY",
-        "CHATBOT_POLICY"
+        "CHATBOT_POLICY",
+        "RESOURCE_CONTROL_POLICY"
       ]
     },
     "Content": {

diff --git a/aws-organizations-policy/docs/README.md b/aws-organizations-policy/docs/README.md
@@ -63,7 +63,7 @@ _Required_: Yes
 
 _Type_: String
 
-_Allowed Values_: <code>SERVICE_CONTROL_POLICY</code> | <code>AISERVICES_OPT_OUT_POLICY</code> | <code>BACKUP_POLICY</code> | <code>TAG_POLICY</code> | <code>CHATBOT_POLICY</code>
+_Allowed Values_: <code>SERVICE_CONTROL_POLICY</code> | <code>AISERVICES_OPT_OUT_POLICY</code> | <code>BACKUP_POLICY</code> | <code>TAG_POLICY</code> | <code>CHATBOT_POLICY</code> | <code>RESOURCE_CONTROL_POLICY</code>
 
 _Update requires_: [Replacement](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-replacement)
 

diff --git a/...anizations-policy/src/main/java/software/amazon/organizations/policy/PolicyConstants.java b/...anizations-policy/src/main/java/software/amazon/organizations/policy/PolicyConstants.java
@@ -7,7 +7,8 @@ public enum PolicyType {
         BACKUP_POLICY("BACKUP_POLICY"),
         SERVICE_CONTROL_POLICY("SERVICE_CONTROL_POLICY"),
         TAG_POLICY("TAG_POLICY"),
-        CHATBOT_POLICY("CHATBOT_POLICY");
+        CHATBOT_POLICY("CHATBOT_POLICY"),
+        RESOURCE_CONTROL_POLICY("RESOURCE_CONTROL_POLICY");
 
         private final String policyType;
 

diff --git a/...nizations-policy/src/test/java/software/amazon/organizations/policy/AbstractTestBase.java b/...nizations-policy/src/test/java/software/amazon/organizations/policy/AbstractTestBase.java
@@ -49,7 +49,7 @@ public class AbstractTestBase {
     protected static final Set<String> TEST_TARGET_IDS = ImmutableSet.of(TEST_TARGET_ROOT_ID, TEST_TARGET_OU_ID);
     protected static final Set<String> TEST_UPDATED_TARGET_IDS = ImmutableSet.of(TEST_TARGET_ROOT_ID, TEST_TARGET_ACCOUNT_ID);
     protected static final String TEST_NEXT_TOKEN = "mockNextTokenItem";
-    protected static final String POLICY_SCHEMA_SHA256_HEXSTRING = "570EA2A5670352042505D77D1921807BDD013D474A62202278E616BC94423BF0";
+    protected static final String POLICY_SCHEMA_SHA256_HEXSTRING = "05B235E4D98BCD33B4BBD400B693EF938899CABA1F8EB6359BA50B663D96B90D";
     protected static final String POLICY_JSON_SCHEMA_FILE_NAME = "aws-organizations-policy.json";
 
     protected static final Credentials MOCK_CREDENTIALS;