Skip to content
This repository was archived by the owner on Oct 4, 2024. It is now read-only.

Commit 19e14dc

Browse files
santiagocardenassantiagocardenas
committed
Update shorthands everywhere except for Sub. QS ID cleanup.
1 parent 5cd3408 commit 19e14dc

13 files changed

+57
-129
lines changed

‎templates/common/db/ds-db-abstract.template‎

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
AWSTemplateFormatVersion: 2010-09-09
33
Description: 'v5.4: This template is an abstraction layer for choosing PostgreSQL,
4-
Oracle or MSSQL when deploying Deep Security Manager (qs-1ngr590i4).'
4+
Oracle or MSSQL when deploying Deep Security Manager. (qs-1ngr590i4)'
55
Parameters:
66
DBIRDSInstanceSize:
77
Default: db.m3.large
@@ -122,7 +122,7 @@ Resources:
122122
Condition: DBTypeIsOracle
123123
Properties:
124124
TemplateURL:
125-
!Sub
125+
Fn::Sub:
126126
- https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}templates/common/db/ds-db-oracle-rds.template
127127
- QSS3Region:
128128
!If
@@ -145,7 +145,7 @@ Resources:
145145
Condition: DBTypeIsSQL
146146
Properties:
147147
TemplateURL:
148-
!Sub
148+
Fn::Sub:
149149
- https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}templates/common/db/ds-db-mssql-rds.template
150150
- QSS3Region:
151151
!If
@@ -168,7 +168,7 @@ Resources:
168168
Condition: DBTypeIsPostgreSQL
169169
Properties:
170170
TemplateURL:
171-
!Sub
171+
Fn::Sub:
172172
- https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}templates/common/db/ds-db-postgresql-rds.template
173173
- QSS3Region:
174174
!If
@@ -215,30 +215,18 @@ Outputs:
215215
Value:
216216
!If
217217
- DBTypeIsOracle
218-
- !GetAtt
219-
- DSOracleRDS
220-
- Outputs.DSDBEndpoint
218+
- !GetAtt DSOracleRDS.Outputs.DSDBEndpoint
221219
- !If
222220
- DBTypeIsPostgreSQL
223-
- !GetAtt
224-
- DSPostgreSQLRDS
225-
- Outputs.DSDBEndpoint
226-
- !GetAtt
227-
- DSSQLRDS
228-
- Outputs.DSDBEndpoint
221+
- !GetAtt DSPostgreSQLRDS.Outputs.DSDBEndpoint
222+
- !GetAtt DSSQLRDS.Outputs.DSDBEndpoint
229223
DSDBPort:
230224
Value:
231225
!If
232226
- DBTypeIsOracle
233-
- !GetAtt
234-
- DSOracleRDS
235-
- Outputs.DSDBPort
227+
- !GetAtt DSOracleRDS.Outputs.DSDBPort
236228
- !If
237229
- DBTypeIsPostgreSQL
238-
- !GetAtt
239-
- DSPostgreSQLRDS
240-
- Outputs.DSDBPort
241-
- !GetAtt
242-
- DSSQLRDS
243-
- Outputs.DSDBPort
230+
- !GetAtt DSPostgreSQLRDS.Outputs.DSDBPort
231+
- !GetAtt DSSQLRDS.Outputs.DSDBPort
244232
...

‎templates/common/db/ds-db-mssql-rds.template‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
AWSTemplateFormatVersion: 2010-09-09
33
Description: 'v5.4: This template deploys an MSSQL RDS Instance for Deep Security
4-
Manager (qs-1ngr590ij).'
4+
Manager. (qs-1ngr590ij)'
55
Parameters:
66
DBIRDSInstanceSize:
77
Default: db.m3.large
@@ -109,14 +109,8 @@ Conditions:
109109
Outputs:
110110
DSDBEndpoint:
111111
Description: Endpoint to be passed to DSM installation properties file
112-
Value:
113-
!GetAtt
114-
- DSDatabase
115-
- Endpoint.Address
112+
Value: !GetAtt DSDatabase.Endpoint.Address
116113
DSDBPort:
117114
Description: Port to be passed to DSM installation properties file
118-
Value:
119-
!GetAtt
120-
- DSDatabase
121-
- Endpoint.Port
115+
Value: !GetAtt DSDatabase.Endpoint.Port
122116
...

‎templates/common/db/ds-db-oracle-rds.template‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
AWSTemplateFormatVersion: 2010-09-09
33
Description: 'v5.4: This template deploys an Oracle RDS instance for Deep Security
4-
Manager (qs-1ngr590i9).'
4+
Manager. (qs-1ngr590i9)'
55
Parameters:
66
DBIRDSInstanceSize:
77
Default: db.m3.large
@@ -116,14 +116,8 @@ Conditions:
116116
Outputs:
117117
DSDBEndpoint:
118118
Description: Endpoint to be passed to DSM installation properties file
119-
Value:
120-
!GetAtt
121-
- DSDatabase
122-
- Endpoint.Address
119+
Value: !GetAtt DSDatabase.Endpoint.Address
123120
DSDBPort:
124121
Description: Port to be passed to DSM installation properties file
125-
Value:
126-
!GetAtt
127-
- DSDatabase
128-
- Endpoint.Port
122+
Value: !GetAtt DSDatabase.Endpoint.Port
129123
...

‎templates/common/db/ds-db-postgresql-rds.template‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
AWSTemplateFormatVersion: 2010-09-09
33
Description: 'v5.4: This template deploys a PostgreSQL RDS instance for Deep Security
4-
Manager (qs-1ngr590ie).'
4+
Manager. (qs-1ngr590ie)'
55
Parameters:
66
DBIRDSInstanceSize:
77
Default: db.m3.large
@@ -121,14 +121,8 @@ Conditions:
121121
Outputs:
122122
DSDBEndpoint:
123123
Description: Endpoint to be passed to DSM installation properties file
124-
Value:
125-
!GetAtt
126-
- DSDatabase
127-
- Endpoint.Address
124+
Value: !GetAtt DSDatabase.Endpoint.Address
128125
DSDBPort:
129126
Description: Port to be passed to DSM installation properties file
130-
Value:
131-
!GetAtt
132-
- DSDatabase
133-
- Endpoint.Port
127+
Value: !GetAtt DSDatabase.Endpoint.Port
134128
...

‎templates/common/dsm-elb.template‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Resources:
6363
Type: AWS::CloudFormation::Stack
6464
Properties:
6565
TemplateURL:
66-
!Sub
66+
Fn::Sub:
6767
- https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}templates/common/security-groups/ds-elb-sg.template
6868
- QSS3Region:
6969
!If
@@ -120,30 +120,15 @@ Conditions:
120120
- us-gov-west-1
121121
Outputs:
122122
ELBFQDN:
123-
Value:
124-
!GetAtt
125-
- DSMELB
126-
- DNSName
123+
Value: !GetAtt DSMELB.DNSName
127124
ELBSourceSecurityGroup:
128-
Value:
129-
!GetAtt
130-
- ELBSG
131-
- Outputs.ELBSG
125+
Value: !GetAtt ELBSG.Outputs.ELBSG
132126
ELSBSourceSecurityGroupOnwerID:
133-
Value:
134-
!GetAtt
135-
- DSMELB
136-
- SourceSecurityGroup.OwnerAlias
127+
Value: !GetAtt DSMELB.SourceSecurityGroup.OwnerAlias
137128
DSIELB:
138129
Value: !Ref DSMELB
139130
ELBCanonicalHostedZoneNameID:
140-
Value:
141-
!GetAtt
142-
- DSMELB
143-
- CanonicalHostedZoneNameID
131+
Value: !GetAtt DSMELB.CanonicalHostedZoneNameID
144132
ELBDNSName:
145-
Value:
146-
!GetAtt
147-
- DSMELB
148-
- DNSName
133+
Value: !GetAtt DSMELB.DNSName
149134
...

‎templates/common/security-groups/ds-elb-sg.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
AWSTemplateFormatVersion: 2010-09-09
33
Description: 'v5.4: This template creates security groups for the ELB for Deep Security
4-
Manager (qs-1ngr590io).'
4+
Manager. (qs-1ngr590io)'
55
Parameters:
66
AWSIVPC:
77
Description: Existing VPC to deploy Deep Security Manager

‎templates/common/security-groups/dsm-security-group.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
AWSTemplateFormatVersion: 2010-09-09
33
Description: 'v5.4: This template creates the security group to allow inbound communication
4-
to Deep Security Manager (qs-1ngr590iu).'
4+
to Deep Security Manager. (qs-1ngr590iu)'
55
Parameters:
66
AWSIVPC:
77
Description: Existing VPC to deploy Deep Security Manager

‎templates/common/security-groups/dsm-sg-ingress-rules.template‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
AWSTemplateFormatVersion: 2010-09-09
3-
Description: 'v5.4: This template creates the ingress rules for Deep Security Managers
4-
(qs-1ngr590j4).'
3+
Description: 'v5.4: This template creates the ingress rules for Deep Security Managers.
4+
(qs-1ngr590j4)'
55
Parameters:
66
DSMSG:
77
Description: Deep Security Manager Security Group

‎templates/common/security-groups/rds-security-group.template‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
AWSTemplateFormatVersion: 2010-09-09
33
Description: 'v5.4: This template creates the security group to allow communication
4-
from Deep Security Managers to their RDS Instance (qs-1ngr590j9).'
4+
from Deep Security Managers to their RDS Instance. (qs-1ngr590j9)'
55
Parameters:
66
AWSIVPC:
77
Description: Existing VPC to deploy Deep Security Manager
@@ -65,8 +65,5 @@ Conditions:
6565
- PostgreSQL
6666
Outputs:
6767
RDSSG:
68-
Value:
69-
!GetAtt
70-
- RDSSG
71-
- GroupId
68+
Value: !GetAtt RDSSG.GroupId
7269
...

‎templates/marketplace/dsm-mp.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ AWSTemplateFormatVersion: 2010-09-09
33
Description: 'v5.4: Deploys Deep Security Manager to AWS. This template is designed
44
to be nested in a stack, and requires several passed parameters to launch. **WARNING**
55
This template creates Amazon EC2 instances and related resources. You will be billed
6-
for the AWS resources used if you create a stack from this template (qs-1ngr590jo).'
6+
for the AWS resources used if you create a stack from this template. (qs-1ngr590jo)'
77
Parameters:
88
AWSIKeyPairName:
99
Description: Existing key pair to use for connecting to your Deep Security Manager

0 commit comments

Comments
 (0)