Skip to content

Commit 357e0b5

Browse files
andywick-awsandywick-aws
committed
Updated SRASolutionVersion
1 parent a90f9c3 commit 357e0b5

File tree

29 files changed

+92
-84
lines changed

29 files changed

+92
-84
lines changed

‎aws_sra_examples/solutions/account/account_alternate_contacts/templates/sra-account-alternate-contacts-main-ssm.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Description:
99

1010
Metadata:
1111
SRA:
12-
Version: 1.0
12+
Version: 1.1
1313
Entry: Parameters for deploying solution resolving SSM parameters
1414
Order: 1
1515
AWS::CloudFormation::Interface:
@@ -300,8 +300,8 @@ Parameters:
300300
Description: The SRA solution name. The default value is the folder name of the solution.
301301
Type: String
302302
pSRASolutionVersion:
303-
AllowedValues: [v1.0]
304-
Default: v1.0
303+
AllowedValues: [v1.1]
304+
Default: v1.1
305305
Description: The SRA solution version. Used to trigger updates on the nested StackSets.
306306
Type: String
307307
pSRAStagingS3BucketName:

‎aws_sra_examples/solutions/account/account_alternate_contacts/templates/sra-account-alternate-contacts-main.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Description:
88
in the repo, https://github.com/aws-samples/aws-security-reference-architecture-examples (sra-1ssgnse6j)
99
Metadata:
1010
SRA:
11-
Version: 1.0
11+
Version: 1.1
1212
Entry: Parameters for deploying solution without resolving SSM parameters
1313
Order: 1
1414
AWS::CloudFormation::Interface:
@@ -294,8 +294,8 @@ Parameters:
294294
Description: The SRA solution name. The default value is the folder name of the solution.
295295
Type: String
296296
pSRASolutionVersion:
297-
AllowedValues: [v1.0]
298-
Default: v1.0
297+
AllowedValues: [v1.1]
298+
Default: v1.1
299299
Description: The SRA solution version. Used to trigger updates on the nested StackSets.
300300
Type: String
301301
pSRAStagingS3BucketName:

‎aws_sra_examples/solutions/cloudtrail/cloudtrail_org/templates/sra-cloudtrail-org-main-ssm.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Description:
1010

1111
Metadata:
1212
SRA:
13-
Version: 1.1
13+
Version: 1.2
1414
Entry: Parameters for deploying solution resolving SSM parameters
1515
Order: 1
1616
AWS::CloudFormation::Interface:
@@ -195,8 +195,8 @@ Parameters:
195195
Description: The SRA solution name. The default value is the folder name of the solution
196196
Type: String
197197
pSRASolutionVersion:
198-
AllowedValues: [v1.1]
199-
Default: v1.1
198+
AllowedValues: [v1.2]
199+
Default: v1.2
200200
Description: The SRA solution version. Used to trigger updates on the nested StackSets.
201201
Type: String
202202
pSRAStagingS3BucketName:

‎aws_sra_examples/solutions/cloudtrail/cloudtrail_org/templates/sra-cloudtrail-org-main.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Description:
1010

1111
Metadata:
1212
SRA:
13-
Version: 1.1
13+
Version: 1.2
1414
Entry: Parameters for deploying solution
1515
Order: 1
1616
AWS::CloudFormation::Interface:
@@ -180,8 +180,8 @@ Parameters:
180180
Description: The SRA solution name. The default value is the folder name of the solution
181181
Type: String
182182
pSRASolutionVersion:
183-
AllowedValues: [v1.1]
184-
Default: v1.1
183+
AllowedValues: [v1.2]
184+
Default: v1.2
185185
Description: The SRA solution version. Used to trigger updates on the nested StackSets.
186186
Type: String
187187
pSRAStagingS3BucketName:

‎aws_sra_examples/solutions/common/common_prerequisites/templates/sra-common-prerequisites-main-ssm.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Description:
88
repo, https://github.com/aws-samples/aws-security-reference-architecture-examples (sra-1ssgnse2h)
99
Metadata:
1010
SRA:
11-
Version: 1.2
11+
Version: 1.3
1212
Entry: Parameters for deploying solution resolving SSM parameters
1313
Order: 1
1414
AWS::CloudFormation::Interface:
@@ -201,8 +201,8 @@ Parameters:
201201
Description: The SRA solution name. The Description value is the folder name of the solution
202202
Type: String
203203
pSRASolutionVersion:
204-
AllowedValues: [v1.2]
205-
Default: v1.2
204+
AllowedValues: [v1.3]
205+
Default: v1.3
206206
Description: The SRA solution version. Used to trigger updates on the nested StackSets.
207207
Type: String
208208
pSRAStagingS3BucketNamePrefix:

‎aws_sra_examples/solutions/common/common_prerequisites/templates/sra-common-prerequisites-main.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Description:
88
https://github.com/aws-samples/aws-security-reference-architecture-examples (sra-1ssgnse2h)
99
Metadata:
1010
SRA:
11-
Version: 1.2
11+
Version: 1.3
1212
Entry: Parameters for deploying solution without resolving SSM parameters
1313
Order: 1
1414
AWS::CloudFormation::Interface:
@@ -193,8 +193,8 @@ Parameters:
193193
Description: The SRA solution name. The Description value is the folder name of the solution
194194
Type: String
195195
pSRASolutionVersion:
196-
AllowedValues: [v1.2]
197-
Default: v1.2
196+
AllowedValues: [v1.3]
197+
Default: v1.3
198198
Description: The SRA solution version. Used to trigger updates on the nested StackSets.
199199
Type: String
200200
pSRAStagingS3BucketNamePrefix:

‎aws_sra_examples/solutions/common/common_register_delegated_administrator/templates/sra-common-register-delegated-administrator-ssm.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Description:
1010

1111
Metadata:
1212
SRA:
13-
Version: 1.1
13+
Version: 1.2
1414
AWS::CloudFormation::Interface:
1515
ParameterGroups:
1616
- Label:

‎aws_sra_examples/solutions/common/common_register_delegated_administrator/templates/sra-common-register-delegated-administrator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Description:
1010

1111
Metadata:
1212
SRA:
13-
Version: 1.1
13+
Version: 1.2
1414
AWS::CloudFormation::Interface:
1515
ParameterGroups:
1616
- Label:

‎aws_sra_examples/solutions/config/config_aggregator_org/templates/sra-config-aggregator-org-main-ssm.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Description:
99

1010
Metadata:
1111
SRA:
12-
Version: 1.1
12+
Version: 1.2
1313
AWS::CloudFormation::Interface:
1414
ParameterGroups:
1515
- Label:
@@ -73,8 +73,8 @@ Parameters:
7373
Description: The SRA solution name. The default value is the folder name of the solution
7474
Type: String
7575
pSRASolutionVersion:
76-
AllowedValues: [v1.1]
77-
Default: v1.1
76+
AllowedValues: [v1.2]
77+
Default: v1.2
7878
Description: The SRA solution version. Used to trigger updates on the nested StackSets.
7979
Type: String
8080
pSRAStagingS3BucketName:

‎aws_sra_examples/solutions/config/config_aggregator_org/templates/sra-config-aggregator-org-main.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Description:
99

1010
Metadata:
1111
SRA:
12-
Version: 1.1
12+
Version: 1.2
1313
AWS::CloudFormation::Interface:
1414
ParameterGroups:
1515
- Label:
@@ -72,8 +72,8 @@ Parameters:
7272
Description: The SRA solution name. The default value is the folder name of the solution
7373
Type: String
7474
pSRASolutionVersion:
75-
AllowedValues: [v1.1]
76-
Default: v1.1
75+
AllowedValues: [v1.2]
76+
Default: v1.2
7777
Description: The SRA solution version. Used to trigger updates on the nested StackSets.
7878
Type: String
7979
pSRAStagingS3BucketName:

‎aws_sra_examples/solutions/config/config_conformance_pack_org/templates/sra-config-conformance-pack-org-main.yaml

+12-4
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ Description:
88
the repo, https://github.com/aws-samples/aws-security-reference-architecture-examples (sra-1ssgnse3o)
99
Metadata:
1010
SRA:
11-
Version: 1.1
11+
Version: 1.2
1212
AWS::CloudFormation::Interface:
1313
ParameterGroups:
1414
- Label:
1515
default: General Properties
1616
Parameters:
1717
- pSRASolutionName
1818
- pSRAStagingS3BucketName
19+
- pSRASolutionVersion
1920

2021
- Label:
2122
default: Conformance Pack Properties
@@ -55,6 +56,8 @@ Metadata:
5556
default: Register Delegated Admin Account
5657
pSRASolutionName:
5758
default: SRA Solution Name
59+
pSRASolutionVersion:
60+
default: SRA Solution Version
5861
pSRAStagingS3BucketName:
5962
default: SRA Staging S3 Bucket Name
6063

@@ -120,6 +123,11 @@ Parameters:
120123
Default: sra-config-conformance-pack-org
121124
Description: The SRA solution name. The default value is the folder name of the solution
122125
Type: String
126+
pSRASolutionVersion:
127+
AllowedValues: [v1.2]
128+
Default: v1.2
129+
Description: The SRA solution version. Used to trigger updates on the nested StackSets.
130+
Type: String
123131
pSRAStagingS3BucketName:
124132
AllowedPattern: '^([\w.-]{1,900})$|^(\/[\w.-]{1,900})*[\w.-]{1,900}$'
125133
ConstraintDescription:
@@ -155,7 +163,7 @@ Resources:
155163
StackSetName: sra-config-conformance-pack-org-delivery-bucket
156164
AdministrationRoleARN: !Sub arn:${AWS::Partition}:iam::${AWS::AccountId}:role/service-role/AWSControlTowerStackSetRole
157165
CallAs: SELF
158-
Description: Creates S3 bucket to store the conformance pack results
166+
Description: !Sub ${pSRASolutionVersion} - Creates S3 bucket to store the conformance pack results
159167
ExecutionRoleName: AWSControlTowerExecution
160168
ManagedExecution:
161169
Active: true
@@ -190,12 +198,12 @@ Resources:
190198
Description: !If
191199
- cRegisterDelegatedAdmin
192200
- !Sub [
193-
"This template creates an AWS Organizations Config Conformance Pack in the Control Tower Audit account. - 'config_conformance_pack_org'
201+
"${pSRASolutionVersion} - This template creates an AWS Organizations Config Conformance Pack in the Control Tower Audit account. - 'config_conformance_pack_org'
194202
solution in the repo, https://github.com/aws-samples/aws-security-reference-architecture-examples. Delegated Admin Solution -
195203
${SolutionName}",
196204
SolutionName: !GetAtt rCommonRegisterDelegatedAdminStack.Outputs.oSRASolutionName,
197205
]
198-
- This template creates an AWS Organizations Config Conformance Pack in the Control Tower Audit account. - 'config_conformance_pack_org'
206+
- !Sub ${pSRASolutionVersion} - This template creates an AWS Organizations Config Conformance Pack in the Control Tower Audit account. - 'config_conformance_pack_org'
199207
solution in repo, https://github.com/aws-samples/aws-security-reference-architecture-examples.
200208
ExecutionRoleName: AWSControlTowerExecution
201209
ManagedExecution:

‎aws_sra_examples/solutions/config/config_management_account/templates/sra-config-management-account-main-ssm.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Description:
1010

1111
Metadata:
1212
SRA:
13-
Version: 1.1
13+
Version: 1.2
1414
Entry: Parameters for deploying solution resolving SSM parameters
1515
Order: 1
1616
AWS::CloudFormation::Interface:
@@ -177,8 +177,8 @@ Parameters:
177177
Description: The SRA solution name. The default value is the folder name of the solution
178178
Type: String
179179
pSRASolutionVersion:
180-
AllowedValues: [v1.1]
181-
Default: v1.1
180+
AllowedValues: [v1.2]
181+
Default: v1.2
182182
Description: The SRA solution version. Used to trigger updates on the nested StackSets.
183183
Type: String
184184
pSRAStagingS3BucketName:

‎aws_sra_examples/solutions/config/config_management_account/templates/sra-config-management-account-main.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Description:
99
(sra-1ssgnse2s)
1010
Metadata:
1111
SRA:
12-
Version: 1.1
12+
Version: 1.2
1313
Entry: Parameters for deploying solution without resolving SSM parameters
1414
Order: 1
1515
AWS::CloudFormation::Interface:
@@ -168,8 +168,8 @@ Parameters:
168168
Description: The SRA solution name. The default value is the folder name of the solution
169169
Type: String
170170
pSRASolutionVersion:
171-
AllowedValues: [v1.1]
172-
Default: v1.1
171+
AllowedValues: [v1.2]
172+
Default: v1.2
173173
Description: The SRA solution version. Used to trigger updates on the nested StackSets.
174174
Type: String
175175
pSRAStagingS3BucketName:

‎aws_sra_examples/solutions/ec2/ec2_default_ebs_encryption/templates/sra-ec2-default-ebs-encryption-main-ssm.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Description:
99

1010
Metadata:
1111
SRA:
12-
Version: 1.2
12+
Version: 1.3
1313
Entry: Parameters for deploying solution resolving SSM parameters
1414
Order: 1
1515
AWS::CloudFormation::Interface:
@@ -156,8 +156,8 @@ Parameters:
156156
Description: The SRA solution name. The default value is the folder name of the solution
157157
Type: String
158158
pSRASolutionVersion:
159-
AllowedValues: [v1.2]
160-
Default: v1.2
159+
AllowedValues: [v1.3]
160+
Default: v1.3
161161
Description: The SRA solution version. Used to trigger updates on the nested StackSets.
162162
Type: String
163163
pSRAStagingS3BucketName:

‎aws_sra_examples/solutions/ec2/ec2_default_ebs_encryption/templates/sra-ec2-default-ebs-encryption-main.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Description:
99

1010
Metadata:
1111
SRA:
12-
Version: 1.2
12+
Version: 1.3
1313
Entry: Parameters for deploying solution
1414
Order: 1
1515
AWS::CloudFormation::Interface:
@@ -152,8 +152,8 @@ Parameters:
152152
Description: The SRA solution name. The default value is the folder name of the solution
153153
Type: String
154154
pSRASolutionVersion:
155-
AllowedValues: [v1.2]
156-
Default: v1.2
155+
AllowedValues: [v1.3]
156+
Default: v1.3
157157
Description: The SRA solution version. Used to trigger updates on the nested StackSets.
158158
Type: String
159159
pSRAStagingS3BucketName:

‎aws_sra_examples/solutions/firewall_manager/firewall_manager_org/templates/sra-firewall-manager-org-main-ssm.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Description:
99

1010
Metadata:
1111
SRA:
12-
Version: 1.3
12+
Version: 1.4
1313
Entry: Parameters for deploying solution resolving SSM parameters
1414
Order: 1
1515
AWS::CloudFormation::Interface:
@@ -127,8 +127,8 @@ Parameters:
127127
Description: The SRA solution name. The default value is the folder name of the solution
128128
Type: String
129129
pSRASolutionVersion:
130-
AllowedValues: [v1.3]
131-
Default: v1.3
130+
AllowedValues: [v1.4]
131+
Default: v1.4
132132
Description: The SRA solution version. Used to trigger updates on the nested StackSets.
133133
Type: String
134134
pSRAStagingS3BucketName:

‎aws_sra_examples/solutions/firewall_manager/firewall_manager_org/templates/sra-firewall-manager-org-main.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Description:
99

1010
Metadata:
1111
SRA:
12-
Version: 1.3
12+
Version: 1.4
1313
Entry: Parameters for deploying solution
1414
Order: 1
1515
AWS::CloudFormation::Interface:
@@ -125,8 +125,8 @@ Parameters:
125125
Description: The SRA solution name. The default value is the folder name of the solution
126126
Type: String
127127
pSRASolutionVersion:
128-
AllowedValues: [v1.3]
129-
Default: v1.3
128+
AllowedValues: [v1.4]
129+
Default: v1.4
130130
Description: The SRA solution version. Used to trigger updates on the nested StackSets.
131131
Type: String
132132
pSRAStagingS3BucketName:

‎aws_sra_examples/solutions/guardduty/guardduty_org/templates/sra-guardduty-org-main-ssm.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Description:
1010

1111
Metadata:
1212
SRA:
13-
Version: 1.1
13+
Version: 1.2
1414
Entry: Parameters for deploying solution resolving SSM parameters
1515
Order: 1
1616
AWS::CloudFormation::Interface:
@@ -205,8 +205,8 @@ Parameters:
205205
name can include numbers, lowercase letters, uppercase letters, and hyphens (-). It cannot start or end with a hyphen (-).
206206
Type: AWS::SSM::Parameter::Value<String>
207207
pSRASolutionVersion:
208-
AllowedValues: [v1.1]
209-
Default: v1.1
208+
AllowedValues: [v1.2]
209+
Default: v1.2
210210
Description: The SRA solution version. Used to trigger updates on the nested StackSets.
211211
Type: String
212212

‎aws_sra_examples/solutions/guardduty/guardduty_org/templates/sra-guardduty-org-main.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Description:
1010

1111
Metadata:
1212
SRA:
13-
Version: 1.1
13+
Version: 1.2
1414
Entry: Parameters for deploying solution
1515
Order: 1
1616
AWS::CloudFormation::Interface:
@@ -199,8 +199,8 @@ Parameters:
199199
numbers, lowercase letters, uppercase letters, and hyphens (-). It cannot start or end with a hyphen (-).
200200
Type: String
201201
pSRASolutionVersion:
202-
AllowedValues: [v1.1]
203-
Default: v1.1
202+
AllowedValues: [v1.2]
203+
Default: v1.2
204204
Description: The SRA solution version. Used to trigger updates on the nested StackSets.
205205
Type: String
206206

0 commit comments

Comments
 (0)