Skip to content

Commit 98123ae

Browse files
iakov-awsiakov-aws
authored
set default no avoid breaking update (#152)
1 parent 9def864 commit 98123ae

File tree

4 files changed

+82
-123
lines changed

4 files changed

+82
-123
lines changed

‎data-collection/deploy/deploy-data-collection.yaml‎

Lines changed: 30 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -157,93 +157,78 @@ Parameters:
157157
IncludeTAModule:
158158
Type: String
159159
Description: Collects AWS Trusted Advisor recommendations data
160-
AllowedValues:
161-
- "yes"
162-
- "no"
160+
AllowedValues: ['yes', 'no']
161+
Default: 'no'
163162
IncludeRightsizingModule:
164163
Type: String
165164
Description: "Collects AWS Cost Explorer Rightsizing Recommendations"
166-
AllowedValues:
167-
- "yes"
168-
- "no"
165+
AllowedValues: ['yes', 'no']
166+
Default: 'no'
169167
IncludeCostAnomalyModule:
170168
Type: String
171169
Description: "Collects AWS Cost Explorer Cost Anomalies Recommendations"
172-
AllowedValues:
173-
- "yes"
174-
- "no"
170+
AllowedValues: ['yes', 'no']
171+
Default: 'no'
175172
IncludeInventoryCollectorModule:
176173
Type: String
177174
Description: Collects data about AMIs, EBS volumes and snapshots
178-
AllowedValues:
179-
- "yes"
180-
- "no"
175+
AllowedValues: ['yes', 'no']
176+
Default: 'no'
181177
IncludeComputeOptimizerModule:
182178
Type: String
183179
Description: Collects AWS Compute Optimizer service recommendations
184-
AllowedValues:
185-
- "yes"
186-
- "no"
180+
AllowedValues: ['yes', 'no']
181+
Default: 'no'
187182
IncludeECSChargebackModule:
188183
Type: String
189184
Description: Collects data which shows costs associated with ECS Tasks leveraging EC2 instances within a Cluster
190-
AllowedValues:
191-
- "yes"
192-
- "no"
185+
AllowedValues: ['yes', 'no']
186+
Default: 'no'
193187
IncludeRDSUtilizationModule:
194188
Type: String
195189
Description: Collects RDS CloudWatch metrics from your accounts
196-
AllowedValues:
197-
- "yes"
198-
- "no"
190+
AllowedValues: ['yes', 'no']
191+
Default: 'no'
199192
IncludeOrgDataModule:
200193
Type: String
201194
Description: Collects AWS Organizations data such as account Id, account name, organization parent and specified tags
202-
AllowedValues:
203-
- "yes"
204-
- "no"
195+
AllowedValues: ['yes', 'no']
196+
Default: 'no'
205197
IncludeBudgetsModule:
206198
Type: String
207199
Description: Collects AWS Budgets
208-
AllowedValues:
209-
- "yes"
210-
- "no"
200+
AllowedValues: ['yes', 'no']
201+
Default: 'no'
211202
IncludeTransitGatewayModule:
212203
Type: String
213204
Description: Collects AWS TransitGateway data
214-
AllowedValues:
215-
- "yes"
216-
- "no"
205+
AllowedValues: ['yes', 'no']
206+
Default: 'no'
217207
IncludeBackupModule:
218208
Type: String
219209
Description: Collects AWS Backup data
220-
AllowedValues:
221-
- "yes"
222-
- "no"
210+
AllowedValues: ['yes', 'no']
211+
Default: 'no'
223212
IncludeCostOptimizationHubModule:
224213
Type: String
225214
Description: Collects CostOptimizationHub data
226-
AllowedValues:
227-
- "yes"
228-
- "no"
215+
AllowedValues: ['yes', 'no']
216+
Default: 'no'
229217
IncludeAWSFeedsModule:
230218
Type: String
231219
Description: Collects AWS Feeds data
232-
AllowedValues:
233-
- "yes"
234-
- "no"
220+
AllowedValues: ['yes', 'no']
221+
Default: 'no'
235222
IncludeHealthEventsModule:
236223
Type: String
237224
Description: Collects AWS Health Events data
238-
AllowedValues:
239-
- "yes"
240-
- "no"
225+
AllowedValues: ['yes', 'no']
226+
Default: 'no'
241227
IncludeLicenseManagerModule:
242228
Type: String
243229
Description: Collects Marketplace Licenses and Grants
244-
AllowedValues:
245-
- "yes"
246-
- "no"
230+
AllowedValues: ['yes', 'no']
231+
Default: 'no'
247232

248233
Outputs:
249234
S3Bucket:

‎data-collection/deploy/deploy-data-read-permissions.yaml‎

Lines changed: 26 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -103,81 +103,68 @@ Parameters:
103103
IncludeBudgetsModule:
104104
Type: String
105105
Description: Collects budgets from your accounts
106-
AllowedValues:
107-
- "yes"
108-
- "no"
106+
AllowedValues: ['yes', 'no']
107+
Default: 'no'
109108
IncludeComputeOptimizerModule:
110109
Type: String
111110
Description: Collects AWS Compute Optimizer service recommendations
112-
AllowedValues:
113-
- "yes"
114-
- "no"
111+
AllowedValues: ['yes', 'no']
112+
Default: 'no'
115113
IncludeCostAnomalyModule:
116114
Type: String
117115
Description: "Collects AWS Cost Explorer Cost Anomalies Recommendations"
118-
AllowedValues:
119-
- "yes"
120-
- "no"
116+
AllowedValues: ['yes', 'no']
117+
Default: 'no'
121118
IncludeECSChargebackModule:
122119
Type: String
123120
Description: Collects data which shows costs associated with ECS Tasks leveraging EC2 instances within a Cluster
124-
AllowedValues:
125-
- "yes"
126-
- "no"
121+
AllowedValues: ['yes', 'no']
122+
Default: 'no'
127123
IncludeInventoryCollectorModule:
128124
Type: String
129125
Description: Collects data about AMIs, EBS volumes and snapshots
130-
AllowedValues:
131-
- "yes"
132-
- "no"
126+
AllowedValues: ['yes', 'no']
127+
Default: 'no'
133128
IncludeRDSUtilizationModule:
134129
Type: String
135130
Description: Collects RDS CloudWatch metrics from your accounts
136-
AllowedValues:
137-
- "yes"
138-
- "no"
131+
AllowedValues: ['yes', 'no']
132+
Default: 'no'
139133
IncludeRightsizingModule:
140134
Type: String
141135
Description: "Collects AWS Cost Explorer Rightsizing Recommendations"
142-
AllowedValues:
143-
- "yes"
144-
- "no"
136+
AllowedValues: ['yes', 'no']
137+
Default: 'no'
145138
IncludeTAModule:
146139
Type: String
147140
Description: Collects AWS Trusted Advisor recommendations data
148-
AllowedValues:
149-
- "yes"
150-
- "no"
141+
AllowedValues: ['yes', 'no']
142+
Default: 'no'
151143
IncludeTransitGatewayModule:
152144
Type: String
153145
Description: Collects TransitGateway from your accounts
154-
AllowedValues:
155-
- "yes"
156-
- "no"
146+
AllowedValues: ['yes', 'no']
147+
Default: 'no'
157148
IncludeBackupModule:
158149
Type: String
159150
Description: Collects AWS Backup events from your accounts
160-
AllowedValues:
161-
- "yes"
162-
- "no"
151+
AllowedValues: ['yes', 'no']
152+
Default: 'no'
163153
IncludeCostOptimizationHubModule:
164154
Type: String
165155
Description: Collects CostOptimizationHub Recommendations from your accounts
166-
AllowedValues:
167-
- "yes"
168-
- "no"
156+
AllowedValues: ['yes', 'no']
157+
Default: 'no'
169158
IncludeHealthEventsModule:
170159
Type: String
171160
Description: Collects AWS Health Events from your accounts
172-
AllowedValues:
173-
- "yes"
174-
- "no"
161+
AllowedValues: ['yes', 'no']
162+
Default: 'no'
175163
IncludeLicenseManagerModule:
176164
Type: String
177165
Description: Collects Marketplace Licensing information
178-
AllowedValues:
179-
- "yes"
180-
- "no"
166+
AllowedValues: ['yes', 'no']
167+
Default: 'no'
181168

182169
Conditions:
183170
DeployModuleReadInMgmt: !Equals [!Ref AllowModuleReadInMgmt, "yes"]

‎data-collection/deploy/deploy-in-linked-account.yaml‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -52,39 +52,33 @@ Parameters:
5252
IncludeTAModule:
5353
Type: String
5454
Description: Collects AWS Trusted Advisor recommendations data
55-
AllowedValues:
56-
- "yes"
57-
- "no"
55+
AllowedValues: ['yes', 'no']
56+
Default: 'no'
5857
IncludeInventoryCollectorModule:
5958
Type: String
6059
Description: Collects data about AMIs, EBS volumes and snapshots
61-
AllowedValues:
62-
- "yes"
63-
- "no"
60+
AllowedValues: ['yes', 'no']
61+
Default: 'no'
6462
IncludeECSChargebackModule:
6563
Type: String
6664
Description: Collects data which shows costs associated with ECS Tasks leveraging EC2 instances within a Cluster
67-
AllowedValues:
68-
- "yes"
69-
- "no"
65+
AllowedValues: ['yes', 'no']
66+
Default: 'no'
7067
IncludeRDSUtilizationModule:
7168
Type: String
7269
Description: Collects RDS CloudWatch metrics from your accounts
73-
AllowedValues:
74-
- "yes"
75-
- "no"
70+
AllowedValues: ['yes', 'no']
71+
Default: 'no'
7672
IncludeBudgetsModule:
7773
Type: String
7874
Description: Collects budgets from your accounts
79-
AllowedValues:
80-
- "yes"
81-
- "no"
75+
AllowedValues: ['yes', 'no']
76+
Default: 'no'
8277
IncludeTransitGatewayModule:
8378
Type: String
8479
Description: Collects TransitGateway from your accounts
85-
AllowedValues:
86-
- "yes"
87-
- "no"
80+
AllowedValues: ['yes', 'no']
81+
Default: 'no'
8882

8983
Conditions:
9084
IncludeTAModulePolicy: !Equals

‎data-collection/deploy/deploy-in-management-account.yaml‎

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -55,45 +55,38 @@ Parameters:
5555
IncludeComputeOptimizerModule:
5656
Type: String
5757
Description: Collects AWS Compute Optimizer service recommendations
58-
AllowedValues:
59-
- "yes"
60-
- "no"
58+
AllowedValues: ['yes', 'no']
59+
Default: 'no'
6160
IncludeCostAnomalyModule:
6261
Type: String
6362
Description: "Collects AWS Cost Explorer Cost Anomalies Recommendations"
64-
AllowedValues:
65-
- "yes"
66-
- "no"
63+
AllowedValues: ['yes', 'no']
64+
Default: 'no'
6765
IncludeRightsizingModule:
6866
Type: String
6967
Description: "Collects AWS Cost Explorer Rightsizing Recommendations"
70-
AllowedValues:
71-
- "yes"
72-
- "no"
68+
AllowedValues: ['yes', 'no']
69+
Default: 'no'
7370
IncludeBackupModule:
7471
Type: String
7572
Description: Collects TransitGateway from your accounts
76-
AllowedValues:
77-
- "yes"
78-
- "no"
73+
AllowedValues: ['yes', 'no']
74+
Default: 'no'
7975
IncludeCostOptimizationHubModule:
8076
Type: String
8177
Description: Collects CostOptimizationHub Recommendations from your accounts
82-
AllowedValues:
83-
- "yes"
84-
- "no"
78+
AllowedValues: ['yes', 'no']
79+
Default: 'no'
8580
IncludeHealthEventsModule:
8681
Type: String
8782
Description: Collects AWS Health Events from your accounts
88-
AllowedValues:
89-
- "yes"
90-
- "no"
83+
AllowedValues: ['yes', 'no']
84+
Default: 'no'
9185
IncludeLicenseManagerModule:
9286
Type: String
9387
Description: Collects Marketplace Licensing Information from your accounts
94-
AllowedValues:
95-
- "yes"
96-
- "no"
88+
AllowedValues: ['yes', 'no']
89+
Default: 'no'
9790

9891
Conditions:
9992
EnableComputeOptimizerModule: !Equals [!Ref IncludeComputeOptimizerModule, "yes"]

0 commit comments

Comments
 (0)