From ddeec34c4f45435544f8d4795e163f16739fe218 Mon Sep 17 00:00:00 2001 From: Ron Lewis Date: Thu, 26 Sep 2024 12:29:37 -0700 Subject: [PATCH] add support for new policy type CHATBOT_POLICY --- aws-organizations-policy/aws-organizations-policy.json | 5 +++-- aws-organizations-policy/docs/README.md | 4 ++-- .../amazon/organizations/policy/PolicyConstants.java | 3 ++- .../amazon/organizations/policy/AbstractTestBase.java | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/aws-organizations-policy/aws-organizations-policy.json b/aws-organizations-policy/aws-organizations-policy.json index 3e05291..1920010 100644 --- a/aws-organizations-policy/aws-organizations-policy.json +++ b/aws-organizations-policy/aws-organizations-policy.json @@ -11,13 +11,14 @@ "maxLength": 128 }, "Type": { - "description": "The type of policy to create. You can specify one of the following values: AISERVICES_OPT_OUT_POLICY, BACKUP_POLICY, SERVICE_CONTROL_POLICY, TAG_POLICY", + "description": "The type of policy to create. You can specify one of the following values: AISERVICES_OPT_OUT_POLICY, BACKUP_POLICY, SERVICE_CONTROL_POLICY, TAG_POLICY, CHATBOT_POLICY", "type": "string", "enum": [ "SERVICE_CONTROL_POLICY", "AISERVICES_OPT_OUT_POLICY", "BACKUP_POLICY", - "TAG_POLICY" + "TAG_POLICY", + "CHATBOT_POLICY" ] }, "Content": { diff --git a/aws-organizations-policy/docs/README.md b/aws-organizations-policy/docs/README.md index 6a94885..511bd74 100644 --- a/aws-organizations-policy/docs/README.md +++ b/aws-organizations-policy/docs/README.md @@ -57,13 +57,13 @@ _Update requires_: [No interruption](https://docs.aws.amazon.com/AWSCloudFormati #### Type -The type of policy to create. You can specify one of the following values: AISERVICES_OPT_OUT_POLICY, BACKUP_POLICY, SERVICE_CONTROL_POLICY, TAG_POLICY +The type of policy to create. You can specify one of the following values: AISERVICES_OPT_OUT_POLICY, BACKUP_POLICY, SERVICE_CONTROL_POLICY, TAG_POLICY, CHATBOT_POLICY _Required_: Yes _Type_: String -_Allowed Values_: SERVICE_CONTROL_POLICY | AISERVICES_OPT_OUT_POLICY | BACKUP_POLICY | TAG_POLICY +_Allowed Values_: SERVICE_CONTROL_POLICY | AISERVICES_OPT_OUT_POLICY | BACKUP_POLICY | TAG_POLICY | CHATBOT_POLICY _Update requires_: [Replacement](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-replacement) diff --git a/aws-organizations-policy/src/main/java/software/amazon/organizations/policy/PolicyConstants.java b/aws-organizations-policy/src/main/java/software/amazon/organizations/policy/PolicyConstants.java index 733bc49..f6bb6c0 100644 --- a/aws-organizations-policy/src/main/java/software/amazon/organizations/policy/PolicyConstants.java +++ b/aws-organizations-policy/src/main/java/software/amazon/organizations/policy/PolicyConstants.java @@ -6,7 +6,8 @@ public enum PolicyType { AISERVICES_OPT_OUT_POLICY("AISERVICES_OPT_OUT_POLICY"), BACKUP_POLICY("BACKUP_POLICY"), SERVICE_CONTROL_POLICY("SERVICE_CONTROL_POLICY"), - TAG_POLICY("TAG_POLICY"); + TAG_POLICY("TAG_POLICY"), + CHATBOT_POLICY("CHATBOT_POLICY"); private final String policyType; diff --git a/aws-organizations-policy/src/test/java/software/amazon/organizations/policy/AbstractTestBase.java b/aws-organizations-policy/src/test/java/software/amazon/organizations/policy/AbstractTestBase.java index 5237ecf..9486f38 100644 --- a/aws-organizations-policy/src/test/java/software/amazon/organizations/policy/AbstractTestBase.java +++ b/aws-organizations-policy/src/test/java/software/amazon/organizations/policy/AbstractTestBase.java @@ -49,7 +49,7 @@ public class AbstractTestBase { protected static final Set TEST_TARGET_IDS = ImmutableSet.of(TEST_TARGET_ROOT_ID, TEST_TARGET_OU_ID); protected static final Set 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 = "A562D1A859C2312EDE249C91077773796CD3DB7FFD41624D8B3D0D3C7481D6AA"; + protected static final String POLICY_SCHEMA_SHA256_HEXSTRING = "2D6EC3A321FCB847C3D82D496E0E831B047C74ABE67B4E797CB9C30DD1E149DF"; protected static final String POLICY_JSON_SCHEMA_FILE_NAME = "aws-organizations-policy.json"; protected static final Credentials MOCK_CREDENTIALS;