Skip to content

Commit 607159f

Browse files
author
Varun Rao Bhamidimarri
committed
Remove CopyS3Artifacts dependency and code format
1 parent 68f677d commit 607159f

File tree

2 files changed

+67
-69
lines changed

2 files changed

+67
-69
lines changed

‎aws_emr_blog_v3/cloudformation/step1_vpc-ec2-ad.template

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Parameters:
66
Availability Zones are used for this deployment, and the logical order of your
77
selections is preserved.
88
Default: us-east-1a,us-east-1b,us-east-1c
9-
# AllowedValues: ["us-east-1a,us-east-1b,us-east-1c"]
9+
# AllowedValues: ["us-east-1a,us-east-1b,us-east-1c"]
1010
Type: List<AWS::EC2::AvailabilityZone::Name>
1111
KeyPairName:
1212
Description: The name of an existing public/private key pair, which allows you
@@ -16,44 +16,44 @@ Parameters:
1616
AllowedPattern: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(1[6-9]|2[0-8]))$
1717
ConstraintDescription: CIDR block parameter must be in the form x.x.x.x/16-28
1818
Default: 10.0.0.0/19
19-
AllowedValues: ['10.0.0.0/19']
19+
AllowedValues: [ '10.0.0.0/19' ]
2020
Description: The CIDR block for private subnet 1 located in Availability Zone 1
2121
Type: String
2222
PrivateSubnet2CIDR:
2323
AllowedPattern: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(1[6-9]|2[0-8]))$
2424
ConstraintDescription: CIDR block parameter must be in the form x.x.x.x/16-28
2525
Default: 10.0.32.0/19
26-
AllowedValues: ['10.0.32.0/19']
26+
AllowedValues: [ '10.0.32.0/19' ]
2727
Description: The CIDR block for private subnet 2 located in Availability Zone 2
2828
Type: String
2929
PrivateSubnet3CIDR:
3030
AllowedPattern: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(1[6-9]|2[0-8]))$
3131
ConstraintDescription: CIDR block parameter must be in the form x.x.x.x/16-28
3232
Default: 10.0.64.0/19
33-
AllowedValues: ['10.0.64.0/19']
33+
AllowedValues: [ '10.0.64.0/19' ]
3434
Description: The CIDR block for private subnet 3 located in Availability Zone 3
3535
Type: String
3636
PublicSubnet1CIDR:
3737
AllowedPattern: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(1[6-9]|2[0-8]))$
3838
ConstraintDescription: CIDR block parameter must be in the form x.x.x.x/16-28
3939
Default: 10.0.128.0/20
40-
AllowedValues: ['10.0.128.0/20']
40+
AllowedValues: [ '10.0.128.0/20' ]
4141
Description: CIDR block for the public (DMZ) subnet 1 located in Availability
4242
Zone 1
4343
Type: String
4444
PublicSubnet2CIDR:
4545
AllowedPattern: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(1[6-9]|2[0-8]))$
4646
ConstraintDescription: CIDR block parameter must be in the form x.x.x.x/16-28
4747
Default: 10.0.144.0/20
48-
AllowedValues: ['10.0.144.0/20']
48+
AllowedValues: [ '10.0.144.0/20' ]
4949
Description: The CIDR block for the public (DMZ) subnet 2 located in Availability
5050
Zone 2
5151
Type: String
5252
PublicSubnet3CIDR:
5353
AllowedPattern: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(1[6-9]|2[0-8]))$
5454
ConstraintDescription: CIDR block parameter must be in the form x.x.x.x/16-28
5555
Default: 10.0.160.0/20
56-
AllowedValues: ['10.0.160.0/20']
56+
AllowedValues: [ '10.0.160.0/20' ]
5757
Description: The CIDR block for the public (DMZ) subnet 3 located in Availability
5858
Zone 3
5959
Type: String
@@ -67,7 +67,7 @@ Parameters:
6767
numbers, lowercase letters, uppercase letters, and hyphens (-). It cannot start
6868
or end with a hyphen (-).
6969
Type: String
70-
AllowedValues: ['aws-quickstart']
70+
AllowedValues: [ 'aws-quickstart' ]
7171
QSS3KeyPrefix:
7272
AllowedPattern: ^[0-9a-zA-Z-/.]*$
7373
ConstraintDescription: Quick Start key prefix can include numbers, lowercase letters,
@@ -77,7 +77,7 @@ Parameters:
7777
can include numbers, lowercase letters, uppercase letters, hyphens (-), dots(.) and
7878
forward slash (/).
7979
Type: String
80-
AllowedValues: ['quickstart-amazon-eks/']
80+
AllowedValues: [ 'quickstart-amazon-eks/' ]
8181
CIDRAccessToADAndBastion:
8282
AllowedPattern: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/([0-9]|[1-2][0-9]|3[0-2]))$
8383
ConstraintDescription: CIDR block parameter must be in the form x.x.x.x/x
@@ -89,12 +89,12 @@ Parameters:
8989
AllowedPattern: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(1[6-9]|2[0-8]))$
9090
ConstraintDescription: CIDR block parameter must be in the form x.x.x.x/16-28
9191
Default: 10.0.0.0/16
92-
AllowedValues: ['10.0.0.0/16']
92+
AllowedValues: [ '10.0.0.0/16' ]
9393
Description: The CIDR block for the VPC
9494
Type: String
9595
NumberOfAZs:
9696
Type: String
97-
AllowedValues: ["2", "3"]
97+
AllowedValues: [ "2", "3" ]
9898
Default: "3"
9999
Description: Number of Availability Zones to use in the VPC. This must match your selections in the list of Availability Zones parameter.
100100
S3Bucket:
@@ -111,12 +111,12 @@ Parameters:
111111
Description: S3Bucket where artifacts are stored
112112
Type: String
113113
Default: aws-bigdata-blog
114-
AllowedValues: ["aws-bigdata-blog"]
114+
AllowedValues: [ "aws-bigdata-blog" ]
115115
S3ArtifactKey:
116116
Description: S3Key of the Lambda code
117117
Type: String
118118
Default: artifacts/aws-blog-emr-ranger
119-
AllowedValues: ["artifacts/aws-blog-emr-ranger"]
119+
AllowedValues: [ "artifacts/aws-blog-emr-ranger" ]
120120
ProjectVersion:
121121
Default: 3.0
122122
Description: Project version
@@ -184,11 +184,11 @@ Mappings:
184184
PublicSubnet3CIDR: 10.0.5.0/24
185185
PrivateSubnet3CIDR: 10.0.6.0/24
186186
Conditions:
187-
3AZDeployment: !Equals [!Ref NumberOfAZs, "3"]
187+
3AZDeployment: !Equals [ !Ref NumberOfAZs, "3" ]
188188
2AZDeployment: !Or
189-
- !Equals [!Ref NumberOfAZs, "2"]
190-
- !Equals [!Ref NumberOfAZs, "3"]
191-
AttachAdditionalSourcePrefixToSG: !Equals [true, !Ref AttachAdditionalSourcePrefixToSG]
189+
- !Equals [ !Ref NumberOfAZs, "2" ]
190+
- !Equals [ !Ref NumberOfAZs, "3" ]
191+
AttachAdditionalSourcePrefixToSG: !Equals [ true, !Ref AttachAdditionalSourcePrefixToSG ]
192192
Resources:
193193
STEP1VPC:
194194
Type: AWS::CloudFormation::Stack
@@ -248,15 +248,15 @@ Resources:
248248
Properties:
249249
IpProtocol: '-1'
250250
SourcePrefixListId: !Ref AdditionalSourcePrefixToSG
251-
GroupId: !GetAtt [STEP1aBastionHost, Outputs.BastionSecurityGroupID]
251+
GroupId: !GetAtt [ STEP1aBastionHost, Outputs.BastionSecurityGroupID ]
252252
STEP2WinAD:
253253
DependsOn: STEP1VPC
254254
Type: AWS::CloudFormation::Stack
255255
Properties:
256-
TemplateURL: !Join ['', ['https://s3.amazonaws.com/', !Ref 'S3ArtifactBucket', '/', !Ref 'S3ArtifactKey', '/', !Ref 'ProjectVersion', '/cloudformation/', 'ec2-win-ad.template']]
256+
TemplateURL: !Join [ '', [ 'https://s3.amazonaws.com/', !Ref 'S3ArtifactBucket', '/', !Ref 'S3ArtifactKey', '/', !Ref 'ProjectVersion', '/cloudformation/', 'ec2-win-ad.template' ] ]
257257
Parameters:
258258
KeyPairName: !Ref 'KeyPairName'
259-
# ImageId: !GetAtt 'STEP0AMILookup.Outputs.AMIID'
259+
# ImageId: !GetAtt 'STEP0AMILookup.Outputs.AMIID'
260260
ImageId: !Ref ADServerAMI
261261
Subnet: !GetAtt 'STEP1VPC.Outputs.PublicSubnet1ID'
262262
VPC: !GetAtt 'STEP1VPC.Outputs.VPCID'
@@ -275,20 +275,20 @@ Resources:
275275
GroupId: !GetAtt [ STEP2WinAD, Outputs.ADSecurityGroupID ]
276276
Outputs:
277277
LDAPHostPrivateIP:
278-
Value: !GetAtt [STEP2WinAD, Outputs.LDAPHostPrivateIP]
278+
Value: !GetAtt [ STEP2WinAD, Outputs.LDAPHostPrivateIP ]
279279
Description: LDAP Host Private IP address
280280
VPC:
281-
Value: !GetAtt [STEP1VPC, Outputs.VPCID]
281+
Value: !GetAtt [ STEP1VPC, Outputs.VPCID ]
282282
Description: VPC ID
283283
PrivateSubnet1AID:
284-
Value: !GetAtt [STEP1VPC, Outputs.PrivateSubnet1AID]
284+
Value: !GetAtt [ STEP1VPC, Outputs.PrivateSubnet1AID ]
285285
Description: PrivateSubnet1AID
286286
PrivateSubnet2AID:
287-
Value: !GetAtt [STEP1VPC, Outputs.PrivateSubnet2AID]
287+
Value: !GetAtt [ STEP1VPC, Outputs.PrivateSubnet2AID ]
288288
Description: PrivateSubnet2AID
289289
PublicSubnet1AID:
290-
Value: !GetAtt [STEP1VPC, Outputs.PublicSubnet1ID]
290+
Value: !GetAtt [ STEP1VPC, Outputs.PublicSubnet1ID ]
291291
Description: PublicSubnet1AID
292292
PublicSubnet2AID:
293-
Value: !GetAtt [STEP1VPC, Outputs.PublicSubnet2ID]
293+
Value: !GetAtt [ STEP1VPC, Outputs.PublicSubnet2ID ]
294294
Description: PublicSubnet2AID

0 commit comments

Comments
 (0)