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

Commit 60ec712

Browse files
trend-scott-broschelltrend-scott-broschell
committed
Updates from Pull Request comments
- Changed case of files to lower case. - Updated QSS3KeyPrefix to align with standards
1 parent e599d81 commit 60ec712

13 files changed

+82
-87
lines changed

templates/Common/DB/DSDBAbstract.template renamed to templates/common/db/ds-db-abstract.template

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
AWSTemplateFormatVersion: 2010-09-09
22
Description: >-
3-
v5.3: This template is an abstraction layer for choosing PostgreSQL, Oracle or
3+
v5.4: This template is an abstraction layer for choosing PostgreSQL, Oracle or
44
MSSQL when deploying Deep Security Manager (qs-1ngr590i4).
55
Parameters:
66
DBIRDSInstanceSize:
@@ -110,27 +110,26 @@ Parameters:
110110
It cannot start or end with a hyphen (-).
111111
Type: String
112112
QSS3KeyPrefix:
113-
AllowedPattern: ^[0-9a-zA-Z-]+(/[0-9a-zA-Z-]+)*$
113+
AllowedPattern: ^[0-9a-zA-Z-/]*$
114114
ConstraintDescription: Quick Start key prefix can include numbers, lowercase letters,
115-
uppercase letters, hyphens (-), and forward slash (/). It cannot start or end
116-
with forward slash (/) because they are automatically appended.
117-
Default: trendmicro/deepsecurity/latest
115+
uppercase letters, hyphens (-), and forward slash (/).",
116+
Default: trendmicro/deepsecurity/latest/
118117
Description: S3 key prefix for the Quick Start assets. Quick Start key prefix can
119-
include numbers, lowercase letters, uppercase letters, hyphens (-), and forward slash
120-
(/).
118+
include numbers, lowercase letters, uppercase letters, hyphens (-), and forward
119+
slash (/).
121120
Type: String
122121
Resources:
123122
DSOracleRDS:
124123
Type: 'AWS::CloudFormation::Stack'
125124
Condition: DBTypeIsOracle
126125
Properties:
127126
TemplateURL: !Sub
128-
- >-
129-
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/templates/common/db/DSDBOracleRDS.template
130-
- QSS3Region: !If
131-
- GovCloudCondition
132-
- s3-us-gov-west-1
133-
- s3
127+
- >-
128+
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/templates/common/db/ds-db-oracle-rds.template
129+
- QSS3Region: !If
130+
- GovCloudCondition
131+
- s3-us-gov-west-1
132+
- s3
134133
TimeoutInMinutes: '10'
135134
Parameters:
136135
DBIRDSInstanceSize: !Ref DBIRDSInstanceSize
@@ -147,12 +146,12 @@ Resources:
147146
Condition: DBTypeIsSQL
148147
Properties:
149148
TemplateURL: !Sub
150-
- >-
151-
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/templates/common/db/DSDBSQLRDS.template
152-
- QSS3Region: !If
153-
- GovCloudCondition
154-
- s3-us-gov-west-1
155-
- s3
149+
- >-
150+
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/templates/common/db/ds-db-mssql-rds.template
151+
- QSS3Region: !If
152+
- GovCloudCondition
153+
- s3-us-gov-west-1
154+
- s3
156155
TimeoutInMinutes: '10'
157156
Parameters:
158157
DBIRDSInstanceSize: !Ref DBIRDSInstanceSize
@@ -169,12 +168,12 @@ Resources:
169168
Condition: DBTypeIsPostgreSQL
170169
Properties:
171170
TemplateURL: !Sub
172-
- >-
173-
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/templates/common/db/DSDBPostgreSQL.template
174-
- QSS3Region: !If
175-
- GovCloudCondition
176-
- s3-us-gov-west-1
177-
- s3
171+
- >-
172+
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/templates/common/db/ds-db-postgresql-rds.template
173+
- QSS3Region: !If
174+
- GovCloudCondition
175+
- s3-us-gov-west-1
176+
- s3
178177
TimeoutInMinutes: '10'
179178
Parameters:
180179
DBIRDSInstanceSize: !Ref DBIRDSInstanceSize

templates/Common/DB/DSDBSQLRDS.template renamed to templates/common/db/ds-db-mssql-rds.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
AWSTemplateFormatVersion: 2010-09-09
22
Description: >-
3-
v5.3: This template deploys an MSSQL RDS Instance for Deep Security Manager (qs-1ngr590ij).
3+
v5.4: This template deploys an MSSQL RDS Instance for Deep Security Manager (qs-1ngr590ij).
44
Parameters:
55
DBIRDSInstanceSize:
66
Default: db.m3.large

templates/Common/DB/DSDBOracleRDS.template renamed to templates/common/db/ds-db-oracle-rds.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
AWSTemplateFormatVersion: 2010-09-09
22
Description: >-
3-
v5.3: This template deploys an Oracle RDS instance for Deep Security Manager (qs-1ngr590i9).
3+
v5.4: This template deploys an Oracle RDS instance for Deep Security Manager (qs-1ngr590i9).
44
Parameters:
55
DBIRDSInstanceSize:
66
Default: db.m3.large

templates/common/db/DSDBPostgreSQL.template renamed to templates/common/db/ds-db-postgresql-rds.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
AWSTemplateFormatVersion: 2010-09-09
22
Description: >-
3-
v5.3: This template deploys a PostgreSQL RDS instance for Deep Security
3+
v5.4: This template deploys a PostgreSQL RDS instance for Deep Security
44
Manager (qs-1ngr590ie).
55
Parameters:
66
DBIRDSInstanceSize:

templates/Common/DSMELB.template renamed to templates/common/dsm-elb.template

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
AWSTemplateFormatVersion: 2010-09-09
22
Description: >-
3-
v5.3: Deploys Elastic Load Balancers and Security Groups for Deep Security (qs-1ngr590je).
3+
v5.4: Deploys Elastic Load Balancers and Security Groups for Deep Security (qs-1ngr590je).
44
Manager.
55
Parameters:
66
AWSIVPC:
@@ -51,22 +51,21 @@ Parameters:
5151
It cannot start or end with a hyphen (-).
5252
Type: String
5353
QSS3KeyPrefix:
54-
AllowedPattern: ^[0-9a-zA-Z-]+(/[0-9a-zA-Z-]+)*$
54+
AllowedPattern: ^[0-9a-zA-Z-/]*$
5555
ConstraintDescription: Quick Start key prefix can include numbers, lowercase letters,
56-
uppercase letters, hyphens (-), and forward slash (/). It cannot start or end
57-
with forward slash (/) because they are automatically appended.
58-
Default: trendmicro/deepsecurity/latest
56+
uppercase letters, hyphens (-), and forward slash (/).",
57+
Default: trendmicro/deepsecurity/latest/
5958
Description: S3 key prefix for the Quick Start assets. Quick Start key prefix can
60-
include numbers, lowercase letters, uppercase letters, hyphens (-), and forward slash
61-
(/).
59+
include numbers, lowercase letters, uppercase letters, hyphens (-), and forward
60+
slash (/).
6261
Type: String
6362
Resources:
6463
ELBSG:
6564
Type: 'AWS::CloudFormation::Stack'
6665
Properties:
6766
TemplateURL: !Sub
6867
- >-
69-
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/templates/common/security-groups/DSELBSG.template
68+
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/templates/common/security-groups/ds-elb-sg.template
7069
- QSS3Region: !If
7170
- GovCloudCondition
7271
- s3-us-gov-west-1

templates/common/security-groups/DSELBSG.template renamed to templates/common/security-groups/ds-elb-sg.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
AWSTemplateFormatVersion: 2010-09-09
22
Description: >-
3-
v5.3: This template creates security groups for the ELB for Deep Security
3+
v5.4: This template creates security groups for the ELB for Deep Security
44
Manager (qs-1ngr590io).
55
Parameters:
66
AWSIVPC:

templates/common/security-groups/DSMSecurityGroup.template renamed to templates/common/security-groups/dsm-security-group.template

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

templates/common/security-groups/DSMSGIngressRules.template renamed to templates/common/security-groups/dsm-sg-ingress-rules.template

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

templates/common/security-groups/RDSSecurityGroup.template renamed to templates/common/security-groups/rds-security-group.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
AWSTemplateFormatVersion: 2010-09-09
22
Description: >-
3-
v5.3: This template creates the security group to allow communication from
3+
v5.4: This template creates the security group to allow communication from
44
Deep Security Managers to their RDS Instance (qs-1ngr590j9).
55
Parameters:
66
AWSIVPC:

templates/Marketplace/DSMMP.template renamed to templates/marketplace/dsm-mp.template

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
AWSTemplateFormatVersion: 2010-09-09
22
Description: >-
3-
v5.3: Deploys Deep Security Manager to AWS. This template is designed to be
3+
v5.4: Deploys Deep Security Manager to AWS. This template is designed to be
44
nested in a stack, and requires several passed parameters to launch.
55
**WARNING** This template creates Amazon EC2 instances and related resources.
66
You will be billed for the AWS resources used if you create a stack from this
@@ -197,14 +197,13 @@ Parameters:
197197
It cannot start or end with a hyphen (-).
198198
Type: String
199199
QSS3KeyPrefix:
200-
AllowedPattern: ^[0-9a-zA-Z-]+(/[0-9a-zA-Z-]+)*$
200+
AllowedPattern: ^[0-9a-zA-Z-/]*$
201201
ConstraintDescription: Quick Start key prefix can include numbers, lowercase letters,
202-
uppercase letters, hyphens (-), and forward slash (/). It cannot start or end
203-
with forward slash (/) because they are automatically appended.
204-
Default: trendmicro/deepsecurity/latest
202+
uppercase letters, hyphens (-), and forward slash (/).",
203+
Default: trendmicro/deepsecurity/latest/
205204
Description: S3 key prefix for the Quick Start assets. Quick Start key prefix can
206-
include numbers, lowercase letters, uppercase letters, hyphens (-), and forward slash
207-
(/).
205+
include numbers, lowercase letters, uppercase letters, hyphens (-), and forward
206+
slash (/).
208207
Type: String
209208
DSCLicenseType:
210209
Type: String
@@ -598,7 +597,7 @@ Resources:
598597
/etc/cfn/set-aia-settings.sh:
599598
source: !Sub
600599
- >-
601-
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/scripts/set-aia-settings.sh
600+
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}scripts/set-aia-settings.sh
602601
- QSS3Region: !If
603602
- GovCloudCondition
604603
- s3-us-gov-west-1
@@ -608,7 +607,7 @@ Resources:
608607
/etc/cfn/kill-mp-web-installer.sh:
609608
source: !Sub
610609
- >-
611-
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/scripts/kill-mp-web-installer.sh
610+
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}scripts/kill-mp-web-installer.sh
612611
- QSS3Region: !If
613612
- GovCloudCondition
614613
- s3-us-gov-west-1
@@ -618,7 +617,7 @@ Resources:
618617
/etc/cfn/add-aws-account-with-instance-role.sh:
619618
source: !Sub
620619
- >-
621-
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/scripts/add-aws-account-with-instance-role.sh
620+
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}scripts/add-aws-account-with-instance-role.sh
622621
- QSS3Region: !If
623622
- GovCloudCondition
624623
- s3-us-gov-west-1
@@ -667,12 +666,12 @@ Resources:
667666
- - 'cd /etc/cfn/rhel-scripts; curl -O '
668667
- !Sub
669668
- >-
670-
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/scripts/create-dsm-db.py
669+
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}scripts/create-dsm-db.py
671670
- QSS3Region: !If
672671
- GovCloudCondition
673672
- s3-us-gov-west-1
674673
- s3
675-
- ' chmod 755 create-dsm-db.py'
674+
- '; chmod 755 create-dsm-db.py'
676675
ignoreErrors: 'false'
677676
2-create-db:
678677
command: !Join
@@ -703,7 +702,7 @@ Resources:
703702
/etc/cfn/create-console-listener.sh:
704703
source: !Sub
705704
- >-
706-
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/scripts/create-console-listener.sh
705+
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}scripts/create-console-listener.sh
707706
- QSS3Region: !If
708707
- GovCloudCondition
709708
- s3-us-gov-west-1
@@ -713,7 +712,7 @@ Resources:
713712
/etc/cfn/set-lb-settings.sh:
714713
source: !Sub
715714
- >-
716-
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/scripts/set-lb-settings.sh
715+
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}scripts/set-lb-settings.sh
717716
- QSS3Region: !If
718717
- GovCloudCondition
719718
- s3-us-gov-west-1
@@ -765,7 +764,7 @@ Resources:
765764
/etc/cfn/reactivate-manager.sh:
766765
source: !Sub
767766
- >-
768-
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}/scripts/reactivate-manager.sh
767+
https://${QSS3BucketName}.${QSS3Region}.amazonaws.com/${QSS3KeyPrefix}scripts/reactivate-manager.sh
769768
- QSS3Region: !If
770769
- GovCloudCondition
771770
- s3-us-gov-west-1

0 commit comments

Comments
 (0)