Skip to content

Commit 9ce4be3

Browse files
hayk99hayk99
authored
feat: Allow deploying all resources in management account (#112)
* feat: allow deploy all reosurces in managment account * chore: update min tf version * chore: run precommit * chore: remove aliased provider and fix precommit * fix: precommit version * chore: fix variable name * chore: remove unned resource group * fix: docs
1 parent 29b399e commit 9ce4be3

File tree

48 files changed

+86
-75
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+86
-75
lines changed

‎examples-internal/organizational-k8s-threat-reuse_cloudtrail_s3/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ $ terraform apply
8787

8888
| Name | Version |
8989
|------|---------|
90-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
90+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
9191
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.50.0 |
9292
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >=2.3.0 |
9393
| <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | >= 0.5.33 |

‎examples-internal/organizational-k8s-threat-reuse_cloudtrail_s3/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.15.0"
2+
required_version = ">= 1.0.0"
33
required_providers {
44
aws = {
55
version = ">= 3.50.0"

‎examples/organizational/README.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -137,17 +137,17 @@ $ terraform apply
137137

138138
| Name | Version |
139139
|------|---------|
140-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
140+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
141141
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0.0 |
142142
| <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | >= 0.5.33 |
143143

144144
## Providers
145145

146146
| Name | Version |
147147
|------|---------|
148-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.20.1 |
149-
| <a name="provider_aws.member"></a> [aws.member](#provider\_aws.member) | 4.20.1 |
150-
| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | 0.5.37 |
148+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0.0 |
149+
| <a name="provider_aws.member"></a> [aws.member](#provider\_aws.member) | >= 4.0.0 |
150+
| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | >= 0.5.33 |
151151

152152
## Modules
153153

@@ -168,6 +168,7 @@ $ terraform apply
168168
| Name | Type |
169169
|------|------|
170170
| [aws_iam_role.connector_ecs_task](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
171+
| [aws_caller_identity.me](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
171172
| [aws_iam_policy_document.task_assume_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
172173
| [aws_region.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/region) | data source |
173174
| [sysdig_secure_connection.current](https://registry.terraform.io/providers/sysdiglabs/sysdig/latest/docs/data-sources/secure_connection) | data source |

‎examples/organizational/data.tf

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
data "aws_region" "current" {}
22
data "sysdig_secure_connection" "current" {}
3+
data "aws_caller_identity" "me" {}

‎examples/organizational/main.tf

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
# resources deployed always in management account
33
# with default provider
44
#-------------------------------------
5+
locals {
6+
deploy_same_account = data.aws_caller_identity.me.account_id == var.sysdig_secure_for_cloud_member_account_id
7+
}
58

69
module "resource_group" {
710
source = "../../modules/infrastructure/resource-group"
@@ -10,6 +13,7 @@ module "resource_group" {
1013
}
1114

1215
module "resource_group_secure_for_cloud_member" {
16+
count = local.deploy_same_account ? 0 : 1
1317
providers = {
1418
aws = aws.member
1519
}

‎examples/organizational/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.15.0"
2+
required_version = ">= 1.0.0"
33
required_providers {
44
aws = {
55
version = ">= 4.0.0"

‎examples/single-account-apprunner/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ $ terraform apply
6464

6565
| Name | Version |
6666
|------|---------|
67-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
67+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
6868
| <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | >= 0.5.33 |
6969

7070
## Providers
7171

7272
| Name | Version |
7373
|------|---------|
74-
| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | 0.5.37 |
74+
| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | >= 0.5.33 |
7575

7676
## Modules
7777

‎examples/single-account-apprunner/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.15.0"
2+
required_version = ">= 1.0.0"
33
required_providers {
44
sysdig = {
55
source = "sysdiglabs/sysdig"

‎examples/single-account-ecs/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ $ terraform apply
6464

6565
| Name | Version |
6666
|------|---------|
67-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
67+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
6868
| <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | >= 0.5.33 |
6969

7070
## Providers
7171

7272
| Name | Version |
7373
|------|---------|
74-
| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | 0.5.37 |
74+
| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | >= 0.5.33 |
7575

7676
## Modules
7777

‎examples/single-account-ecs/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.15.0"
2+
required_version = ">= 1.0.0"
33
required_providers {
44
sysdig = {
55
source = "sysdiglabs/sysdig"

‎examples/single-account-k8s/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ $ terraform apply
7575

7676
| Name | Version |
7777
|------|---------|
78-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
78+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
7979
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.50.0 |
8080
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >=2.3.0 |
8181
| <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | >= 0.5.33 |
@@ -84,9 +84,9 @@ $ terraform apply
8484

8585
| Name | Version |
8686
|------|---------|
87-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.20.1 |
88-
| <a name="provider_helm"></a> [helm](#provider\_helm) | 2.6.0 |
89-
| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | 0.5.37 |
87+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.50.0 |
88+
| <a name="provider_helm"></a> [helm](#provider\_helm) | >=2.3.0 |
89+
| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | >= 0.5.33 |
9090

9191
## Modules
9292

‎examples/single-account-k8s/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.15.0"
2+
required_version = ">= 1.0.0"
33
required_providers {
44
aws = {
55
version = ">= 3.50.0"

‎examples/trigger-events/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ $ terraform apply
4242

4343
| Name | Version |
4444
|------|---------|
45-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
45+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
4646
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.50.0 |
4747

4848
## Providers
4949

5050
| Name | Version |
5151
|------|---------|
52-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.20.1 |
52+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.50.0 |
5353

5454
## Modules
5555

‎examples/trigger-events/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.15.0"
2+
required_version = ">= 1.0.0"
33
required_providers {
44
aws = {
55
version = ">= 3.50.0"

‎modules/infrastructure/cloudtrail/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
| Name | Version |
77
|------|---------|
8-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
8+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
99
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0.0 |
1010

1111
## Providers
1212

1313
| Name | Version |
1414
|------|---------|
15-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.20.1 |
15+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0.0 |
1616

1717
## Modules
1818

‎modules/infrastructure/cloudtrail/main.tf

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ resource "aws_cloudtrail" "cloudtrail" {
1818
tags = var.tags
1919

2020
## note: seems required to avoid racing conditions (InsufficientSnsTopicPolicyException on cloudtrail creation) /shrug
21-
depends_on = [aws_s3_bucket_policy.cloudtrail_s3, aws_sns_topic_policy.allow_cloudtrail_publish]
21+
depends_on = [
22+
aws_s3_bucket_policy.cloudtrail_s3,
23+
aws_sns_topic_policy.allow_cloudtrail_publish
24+
]
2225
}
2326

2427
data "aws_caller_identity" "me" {}

‎modules/infrastructure/cloudtrail/sns_permissions.tf

+4-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ data "aws_iam_policy_document" "cloudtrail_sns" {
2525
sid = "AllowSysdigSecureForCloudSubscribe"
2626
effect = "Allow"
2727
principals {
28-
identifiers = ["arn:aws:iam::${var.organizational_config.sysdig_secure_for_cloud_member_account_id}:role/${var.organizational_config.organizational_role_per_account}"]
29-
type = "AWS"
28+
identifiers = [
29+
"arn:aws:iam::${var.organizational_config.sysdig_secure_for_cloud_member_account_id}:role/${var.organizational_config.organizational_role_per_account}"
30+
]
31+
type = "AWS"
3032
# more open policy but without requiring aws provider role
3133
# identifiers = ["sqs.amazonaws.com"]
3234
# type = "Service"

‎modules/infrastructure/cloudtrail/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.15.0"
2+
required_version = ">= 1.0.0"
33
required_providers {
44
aws = {
55
version = ">= 4.0.0"

‎modules/infrastructure/cloudtrail_s3-sns-sqs/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ EVENT FILTER/fine-tunning, regarding what we want to send to Sysdig Cloud-Connec
3939

4040
| Name | Version |
4141
|------|---------|
42-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
42+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
4343
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.50.0 |
4444

4545
## Providers
4646

4747
| Name | Version |
4848
|------|---------|
49-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.20.1 |
49+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.50.0 |
5050

5151
## Modules
5252

‎modules/infrastructure/cloudtrail_s3-sns-sqs/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.15.0"
2+
required_version = ">= 1.0.0"
33
required_providers {
44
aws = {
55
version = ">= 3.50.0"

‎modules/infrastructure/codebuild/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
| Name | Version |
77
|------|---------|
8-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
8+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
99
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.50.0 |
1010

1111
## Providers
1212

1313
| Name | Version |
1414
|------|---------|
15-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.20.1 |
15+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.50.0 |
1616

1717
## Modules
1818

‎modules/infrastructure/codebuild/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.15.0"
2+
required_version = ">= 1.0.0"
33
required_providers {
44
aws = {
55
version = ">= 3.50.0"

‎modules/infrastructure/ecs-vpc/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66

77
| Name | Version |
88
|------|---------|
9-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
9+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
1010
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.50.0 |
1111

1212
## Providers
1313

1414
| Name | Version |
1515
|------|---------|
16-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.20.1 |
16+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.50.0 |
1717

1818
## Modules
1919

‎modules/infrastructure/ecs-vpc/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.15.0"
2+
required_version = ">= 1.0.0"
33
required_providers {
44
aws = {
55
version = ">= 3.50.0"

‎modules/infrastructure/eks/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.15.0"
2+
required_version = ">= 1.0.0"
33
required_providers {
44
aws = {
55
version = ">= 3.50.0"

‎modules/infrastructure/permissions/cloud-connector/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
| Name | Version |
77
|------|---------|
8-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
8+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
99
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.50.0 |
1010

1111
## Providers
1212

1313
| Name | Version |
1414
|------|---------|
15-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.20.1 |
15+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.50.0 |
1616

1717
## Modules
1818

‎modules/infrastructure/permissions/cloud-connector/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.15.0"
2+
required_version = ">= 1.0.0"
33
required_providers {
44
aws = {
55
version = ">= 3.50.0"

‎modules/infrastructure/permissions/cloud-scanning/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
| Name | Version |
77
|------|---------|
8-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
8+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
99
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.50.0 |
1010

1111
## Providers
1212

1313
| Name | Version |
1414
|------|---------|
15-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.20.1 |
15+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.50.0 |
1616

1717
## Modules
1818

‎modules/infrastructure/permissions/cloud-scanning/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.15.0"
2+
required_version = ">= 1.0.0"
33
required_providers {
44
aws = {
55
version = ">= 3.50.0"

‎modules/infrastructure/permissions/general/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ General permissions that apply to both cloud-connector and cloud-scanning module
88

99
| Name | Version |
1010
|------|---------|
11-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
11+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
1212
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.50.0 |
1313

1414
## Providers
1515

1616
| Name | Version |
1717
|------|---------|
18-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.20.1 |
18+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.50.0 |
1919

2020
## Modules
2121

‎modules/infrastructure/permissions/general/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.15.0"
2+
required_version = ">= 1.0.0"
33
required_providers {
44
aws = {
55
version = ">= 3.50.0"

‎modules/infrastructure/permissions/iam-user/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ Note: Contact us if this authentication system does not match your requirement.
3838

3939
| Name | Version |
4040
|------|---------|
41-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
41+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
4242
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.50.0 |
4343

4444
## Providers
4545

4646
| Name | Version |
4747
|------|---------|
48-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.20.1 |
48+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.50.0 |
4949

5050
## Modules
5151

‎modules/infrastructure/permissions/iam-user/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.15.0"
2+
required_version = ">= 1.0.0"
33
required_providers {
44
aws = {
55
version = ">= 3.50.0"

0 commit comments

Comments
 (0)