Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add CFN support for Declarative EC2 Policy #83

Merged
merged 1 commit into from
Dec 5, 2024
Merged

Add CFN support for Declarative EC2 Policy #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions aws-organizations-policy/aws-organizations-policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,16 @@
"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, CHATBOT_POLICY, RESOURCE_CONTROL_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, RESOURCE_CONTROL_POLICY,DECLARATIVE_POLICY_EC2",
"type": "string",
"enum": [
"SERVICE_CONTROL_POLICY",
"AISERVICES_OPT_OUT_POLICY",
"BACKUP_POLICY",
"TAG_POLICY",
"CHATBOT_POLICY",
"RESOURCE_CONTROL_POLICY"
"RESOURCE_CONTROL_POLICY",
"DECLARATIVE_POLICY_EC2"
]
},
"Content": {
Expand Down
4 changes: 2 additions & 2 deletions aws-organizations-policy/docs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, CHATBOT_POLICY, RESOURCE_CONTROL_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, RESOURCE_CONTROL_POLICY,DECLARATIVE_POLICY_EC2

_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> | <code>RESOURCE_CONTROL_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> | <code>DECLARATIVE_POLICY_EC2</code>

_Update requires_: [Replacement](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-replacement)

Expand Down
3 changes: 2 additions & 1 deletion ...anizations-policy/src/main/java/software/amazon/organizations/policy/PolicyConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ public enum PolicyType {
SERVICE_CONTROL_POLICY("SERVICE_CONTROL_POLICY"),
TAG_POLICY("TAG_POLICY"),
CHATBOT_POLICY("CHATBOT_POLICY"),
RESOURCE_CONTROL_POLICY("RESOURCE_CONTROL_POLICY");
RESOURCE_CONTROL_POLICY("RESOURCE_CONTROL_POLICY"),
DECLARATIVE_POLICY_EC2("DECLARATIVE_POLICY_EC2");

private final String policyType;

Expand Down
2 changes: 1 addition & 1 deletion ...nizations-policy/src/test/java/software/amazon/organizations/policy/AbstractTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "82F7D81E3153063EFDB101473B21E54C9722DED9EDFA270D59390F711ACD6B24";
protected static final String POLICY_SCHEMA_SHA256_HEXSTRING = "A182DD7473C4969EC112502EAE15828751A4C9714B158F0E3DE64065C6170842";
protected static final String POLICY_JSON_SCHEMA_FILE_NAME = "aws-organizations-policy.json";

protected static final Credentials MOCK_CREDENTIALS;
Expand Down
Loading