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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 5 additions & 4 deletions
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‎

Lines changed: 1 addition & 0 deletions
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‎

Lines changed: 4 additions & 0 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 1 addition & 1 deletion
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"

0 commit comments

Comments
 (0)