Skip to content

Commit 3f4aa80

Browse files
ravinadhruve10ravinadhruve10
committed
Update all templates
1 parent 63f097d commit 3f4aa80

File tree

4 files changed

+48
-73
lines changed

4 files changed

+48
-73
lines changed

‎modules/foundational.cft.yaml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Metadata:
1010
- ExternalID
1111
- TrustedIdentity
1212
- IsOrganizational
13-
#- OrganizationalUnitIDs
13+
- OrganizationalUnitIDs
1414
- Partition
1515
- RootOUID
1616
- IncludeOUIDs
@@ -25,8 +25,8 @@ Metadata:
2525
default: Trusted Identity
2626
IsOrganizational:
2727
default: Is Organizational
28-
#OrganizationalUnitIDs:
29-
# default: (Deprecated, use RootOUID or IncludeOUIDs instead) Organizational Unit IDs
28+
OrganizationalUnitIDs:
29+
default: (Deprecated, use RootOUID or IncludeOUIDs instead) Organizational Unit IDs
3030
Partition:
3131
default: AWS Partition
3232
RootOUID:
@@ -37,6 +37,8 @@ Metadata:
3737
default: Include AWS accounts
3838
ExcludeAccounts:
3939
default: Exclude AWS accounts
40+
UnusedParams: # cfn-lint ignore till we figure final solution
41+
OrganizationalUnitIDs: !Ref OrganizationalUnitIDs
4042
Parameters:
4143
NameSuffix:
4244
Type: String
@@ -57,9 +59,9 @@ Parameters:
5759
AllowedValues:
5860
- 'true'
5961
- 'false'
60-
# OrganizationalUnitIDs:
61-
# Type: CommaDelimitedList
62-
# Description: (Deprecated, use RootOUID or IncludeOUIDs instead) Comma separated list of organizational unit IDs to deploy
62+
OrganizationalUnitIDs:
63+
Type: CommaDelimitedList
64+
Description: (Deprecated, use RootOUID or IncludeOUIDs instead) Comma separated list of organizational unit IDs to deploy
6365
Partition:
6466
Type: String
6567
Description: AWS Partition of your account or organization to create resources in

‎modules/log_ingestion.events.cft.yaml‎

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
AWSTemplateFormatVersion: "2010-09-09"
2-
Transform: 'AWS::LanguageExtensions'
32
Description: EventBridge resources that forward CloudTrail logs to Sysdig Secure
43
Metadata:
54
AWS::CloudFormation::Interface:
@@ -22,7 +21,6 @@ Metadata:
2221
- Partition
2322
- RootOUID
2423
- IncludeOUIDs
25-
- ExcludeOUIDs
2624
- IncludeAccounts
2725
- ExcludeAccounts
2826
ParameterLabels:
@@ -50,12 +48,12 @@ Metadata:
5048
default: Root Organization Unit ID
5149
IncludeOUIDs:
5250
default: Include Organizational Unit IDs
53-
ExcludeOUIDs:
54-
default: Exclude Organizational Unit IDs
5551
IncludeAccounts:
5652
default: Include AWS accounts
5753
ExcludeAccounts:
5854
default: Exclude AWS accounts
55+
UnusedParams: # cfn-lint ignore till we figure final solution
56+
OrganizationalUnitIDs: !Ref OrganizationalUnitIDs
5957
Parameters:
6058
NameSuffix:
6159
Type: String
@@ -125,9 +123,6 @@ Parameters:
125123
IncludeOUIDs:
126124
Type: CommaDelimitedList
127125
Description: Comma separated list of organizational unit IDs to be included for deployment
128-
ExcludeOUIDs:
129-
Type: CommaDelimitedList
130-
Description: Comma separated list of organizational unit IDs to be excluded for deployment
131126
IncludeAccounts:
132127
Type: CommaDelimitedList
133128
Description: Comma separated list of AWS accounts in your organization to be included for deployment
@@ -144,43 +139,39 @@ Conditions:
144139
- !Condition IsOrganizational
145140
- !Not
146141
- !Equals
147-
- Fn::Length:
148-
- !Ref IncludeOUIDs
149-
- 0
142+
- !Join ["", !Ref IncludeOUIDs]
143+
- ''
150144
AccountInclusionsConfigured:
151145
!And
152146
- !Condition IsOrganizational
153147
- !Not
154148
- !Equals
155-
- Fn::Length:
156-
- !Ref IncludeAccounts
157-
- 0
149+
- !Join ["", !Ref IncludeAccounts]
150+
- ''
158151
# -----------------------------------------------------------------------------------------------------
159152
# Remove below condition once AWS issue is fixed and replace with using UNION filter -
160153
# https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-cloudformation/issues/100
161154
# -----------------------------------------------------------------------------------------------------
162155
# XXX: due to AWS bug of not having UNION filter fully working, there is no way to add those extra accounts requested.
163156
# to not miss out on those extra accounts, deploy the cloud resources across entire org and noop the UNION filter.
164-
# i.e till we can't deploy UNION, we deploy it all ()
157+
# i.e till we can't deploy UNION, we deploy it all
165158
AllowedInclusions:
166159
!And
167160
- !Condition OUInclusionsConfigured
168161
- !Not
169162
- !Condition AccountInclusionsConfigured
170163

171-
# cannot do OU exclusions since CFT templates are static and don't have a way to fetch dynamic data from AWS
164+
# cannot do OU exclusions from ExcludeOUIDs since CFT templates are static and don't have a way to fetch dynamic data from AWS
172165
AccountExclusionsConfigured:
173166
!And
174167
- !Condition IsOrganizational
175168
- !Equals
176-
- Fn::Length:
177-
- !Ref IncludeAccounts
178-
- 0
169+
- !Join ["", !Ref IncludeAccounts]
170+
- ''
179171
- !Not
180172
- !Equals
181-
- Fn::Length:
182-
- !Ref ExcludeAccounts
183-
- 0
173+
- !Join ["", !Ref ExcludeAccounts]
174+
- ''
184175
Resources:
185176
AdministrationRole:
186177
Type: AWS::IAM::Role
@@ -375,7 +366,7 @@ Resources:
375366
Fn::If:
376367
- AccountExclusionsConfigured
377368
- !Ref ExcludeAccounts
378-
- null
369+
- !Ref 'AWS::NoValue'
379370
Regions: [!Ref "AWS::Region"]
380371
TemplateBody: |
381372
AWSTemplateFormatVersion: "2010-09-09"
@@ -477,7 +468,7 @@ Resources:
477468
Fn::If:
478469
- AccountExclusionsConfigured
479470
- !Ref ExcludeAccounts
480-
- null
471+
- !Ref 'AWS::NoValue'
481472
Regions: !Ref Regions
482473
TemplateBody: |
483474
AWSTemplateFormatVersion: "2010-09-09"

‎modules/vm_workload_scanning.cft.yaml‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
AWSTemplateFormatVersion: '2010-09-09'
2-
Transform: 'AWS::LanguageExtensions'
32
Description: Sysdig Secure Agentless Workload Scanning Onboarding
43
Metadata:
54
AWS::CloudFormation::Interface:
@@ -15,7 +14,6 @@ Metadata:
1514
- OrganizationalUnitIDs
1615
- RootOUID
1716
- IncludeOUIDs
18-
- ExcludeOUIDs
1917
- IncludeAccounts
2018
- ExcludeAccounts
2119
ParameterLabels:
@@ -35,12 +33,12 @@ Metadata:
3533
default: Root Organization Unit ID
3634
IncludeOUIDs:
3735
default: Include Organizational Unit IDs
38-
ExcludeOUIDs:
39-
default: Exclude Organizational Unit IDs
4036
IncludeAccounts:
4137
default: Include AWS accounts
4238
ExcludeAccounts:
4339
default: Exclude AWS accounts
40+
UnusedParams: # cfn-lint ignore till we figure final solution
41+
OrganizationalUnitIDs: !Ref OrganizationalUnitIDs
4442
Parameters:
4543
NameSuffix:
4644
Type: String
@@ -77,9 +75,6 @@ Parameters:
7775
IncludeOUIDs:
7876
Type: CommaDelimitedList
7977
Description: Comma separated list of organizational unit IDs to be included for deployment
80-
ExcludeOUIDs:
81-
Type: CommaDelimitedList
82-
Description: Comma separated list of organizational unit IDs to be excluded for deployment
8378
IncludeAccounts:
8479
Type: CommaDelimitedList
8580
Description: Comma separated list of AWS accounts in your organization to be included for deployment
@@ -101,43 +96,39 @@ Conditions:
10196
- !Condition IsOrganizational
10297
- !Not
10398
- !Equals
104-
- Fn::Length:
105-
- !Ref IncludeOUIDs
106-
- 0
99+
- !Join ["", !Ref IncludeOUIDs]
100+
- ''
107101
AccountInclusionsConfigured:
108102
!And
109103
- !Condition IsOrganizational
110104
- !Not
111105
- !Equals
112-
- Fn::Length:
113-
- !Ref IncludeAccounts
114-
- 0
106+
- !Join ["", !Ref IncludeAccounts]
107+
- ''
115108
# -----------------------------------------------------------------------------------------------------
116109
# Remove below condition once AWS issue is fixed and replace with using UNION filter -
117110
# https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-cloudformation/issues/100
118111
# -----------------------------------------------------------------------------------------------------
119112
# XXX: due to AWS bug of not having UNION filter fully working, there is no way to add those extra accounts requested.
120113
# to not miss out on those extra accounts, deploy the cloud resources across entire org and noop the UNION filter.
121-
# i.e till we can't deploy UNION, we deploy it all ()
114+
# i.e till we can't deploy UNION, we deploy it all
122115
AllowedInclusions:
123116
!And
124117
- !Condition OUInclusionsConfigured
125118
- !Not
126119
- !Condition AccountInclusionsConfigured
127120

128-
# cannot do OU exclusions since CFT templates are static and don't have a way to fetch dynamic data from AWS
121+
# cannot do OU exclusions from ExcludeOUIDs since CFT templates are static and don't have a way to fetch dynamic data from AWS
129122
AccountExclusionsConfigured:
130123
!And
131124
- !Condition IsOrganizational
132125
- !Equals
133-
- Fn::Length:
134-
- !Ref IncludeAccounts
135-
- 0
126+
- !Join ["", !Ref IncludeAccounts]
127+
- ''
136128
- !Not
137129
- !Equals
138-
- Fn::Length:
139-
- !Ref ExcludeAccounts
140-
- 0
130+
- !Join ["", !Ref ExcludeAccounts]
131+
- ''
141132

142133
Resources:
143134
ScanningRole:
@@ -244,7 +235,7 @@ Resources:
244235
Fn::If:
245236
- AccountExclusionsConfigured
246237
- !Ref ExcludeAccounts
247-
- null
238+
- !Ref 'AWS::NoValue'
248239
Regions:
249240
- Ref: AWS::Region
250241
TemplateBody: |

‎modules/volume_access.cft.yaml‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
AWSTemplateFormatVersion: '2010-09-09'
2-
Transform: 'AWS::LanguageExtensions'
32
Description: Sysdig Agentless Scanning integration resources
43
Metadata:
54
AWS::CloudFormation::Interface:
@@ -16,7 +15,6 @@ Metadata:
1615
- OrganizationalUnitIDs
1716
- RootOUID
1817
- IncludeOUIDs
19-
- ExcludeOUIDs
2018
- IncludeAccounts
2119
- ExcludeAccounts
2220
ParameterLabels:
@@ -38,12 +36,12 @@ Metadata:
3836
default: Root Organization Unit ID
3937
IncludeOUIDs:
4038
default: Include Organizational Unit IDs
41-
ExcludeOUIDs:
42-
default: Exclude Organizational Unit IDs
4339
IncludeAccounts:
4440
default: Include AWS accounts
4541
ExcludeAccounts:
4642
default: Exclude AWS accounts
43+
UnusedParams: # cfn-lint ignore till we figure final solution
44+
OrganizationalUnitIDs: !Ref OrganizationalUnitIDs
4745

4846
Parameters:
4947
NameSuffix:
@@ -81,9 +79,6 @@ Parameters:
8179
IncludeOUIDs:
8280
Type: CommaDelimitedList
8381
Description: Comma separated list of organizational unit IDs to be included for deployment
84-
ExcludeOUIDs:
85-
Type: CommaDelimitedList
86-
Description: Comma separated list of organizational unit IDs to be excluded for deployment
8782
IncludeAccounts:
8883
Type: CommaDelimitedList
8984
Description: Comma separated list of AWS accounts in your organization to be included for deployment
@@ -101,43 +96,39 @@ Conditions:
10196
- !Condition IsOrganizational
10297
- !Not
10398
- !Equals
104-
- Fn::Length:
105-
- !Ref IncludeOUIDs
106-
- 0
99+
- !Join ["", !Ref IncludeOUIDs]
100+
- ''
107101
AccountInclusionsConfigured:
108102
!And
109103
- !Condition IsOrganizational
110104
- !Not
111105
- !Equals
112-
- Fn::Length:
113-
- !Ref IncludeAccounts
114-
- 0
106+
- !Join ["", !Ref IncludeAccounts]
107+
- ''
115108
# -----------------------------------------------------------------------------------------------------
116109
# Remove below condition once AWS issue is fixed and replace with using UNION filter -
117110
# https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-cloudformation/issues/100
118111
# -----------------------------------------------------------------------------------------------------
119112
# XXX: due to AWS bug of not having UNION filter fully working, there is no way to add those extra accounts requested.
120113
# to not miss out on those extra accounts, deploy the cloud resources across entire org and noop the UNION filter.
121-
# i.e till we can't deploy UNION, we deploy it all ()
114+
# i.e till we can't deploy UNION, we deploy it all
122115
AllowedInclusions:
123116
!And
124117
- !Condition OUInclusionsConfigured
125118
- !Not
126119
- !Condition AccountInclusionsConfigured
127120

128-
# cannot do OU exclusions since CFT templates are static and don't have a way to fetch dynamic data from AWS
121+
# cannot do OU exclusions from ExcludeOUIDs since CFT templates are static and don't have a way to fetch dynamic data from AWS
129122
AccountExclusionsConfigured:
130123
!And
131124
- !Condition IsOrganizational
132125
- !Equals
133-
- Fn::Length:
134-
- !Ref IncludeAccounts
135-
- 0
126+
- !Join ["", !Ref IncludeAccounts]
127+
- ''
136128
- !Not
137129
- !Equals
138-
- Fn::Length:
139-
- !Ref ExcludeAccounts
140-
- 0
130+
- !Join ["", !Ref ExcludeAccounts]
131+
- ''
141132

142133
Resources:
143134
AdministrationRole:
@@ -411,7 +402,7 @@ Resources:
411402
Fn::If:
412403
- AccountExclusionsConfigured
413404
- !Ref ExcludeAccounts
414-
- null
405+
- !Ref 'AWS::NoValue'
415406
Regions: !Ref Regions
416407
TemplateBody: |
417408
AWSTemplateFormatVersion: "2010-09-09"

0 commit comments

Comments
 (0)