Skip to content

Commit 960a020

Browse files
Merge pull request try-bridgecrew#25 from try-bridgecrew/feature/tag
add Yor tags
2 parents b3724a8 + 411b424 commit 960a020

File tree

7 files changed

+225
-17
lines changed

7 files changed

+225
-17
lines changed

terraform/ecs.tf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,14 @@ resource "aws_ecs_task_definition" "service" {
2828
]
2929
}
3030
])
31+
tags = {
32+
git_commit = "28f961c9082f76fc6f16d55ad0c27de60d14b4a7"
33+
git_file = "terraform/ecs.tf"
34+
git_last_modified_at = "2022-10-11 17:12:10"
35+
git_last_modified_by = "[email protected]"
36+
git_modifiers = "104632309+mroberts-panw"
37+
git_org = "try-bridgecrew"
38+
git_repo = "codegoat"
39+
yor_trace = "54731c2c-d768-458c-8625-5e1fc91901ac"
40+
}
3141
}

terraform/iam-test.tf

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ resource "aws_iam_policy" "policy_resource_fail" {
2222
}
2323
]
2424
})
25+
tags = {
26+
git_commit = "998fa380a0b13b29df92d8edf55693d57e9a660b"
27+
git_file = "terraform/iam-test.tf"
28+
git_last_modified_at = "2022-10-26 12:53:34"
29+
git_last_modified_by = "[email protected]"
30+
git_modifiers = "mroberts"
31+
git_org = "try-bridgecrew"
32+
git_repo = "codegoat"
33+
yor_trace = "5c3c5011-041d-487a-a6e6-3072edc7b5e6"
34+
}
2535
}
2636

2737
resource "aws_iam_policy" "policy_resource_pass" {
@@ -48,6 +58,16 @@ resource "aws_iam_policy" "policy_resource_pass" {
4858
}
4959
]
5060
})
61+
tags = {
62+
git_commit = "998fa380a0b13b29df92d8edf55693d57e9a660b"
63+
git_file = "terraform/iam-test.tf"
64+
git_last_modified_at = "2022-10-26 12:53:34"
65+
git_last_modified_by = "[email protected]"
66+
git_modifiers = "mroberts"
67+
git_org = "try-bridgecrew"
68+
git_repo = "codegoat"
69+
yor_trace = "e56108da-6d0e-4e78-8fc5-f3f2567ffed9"
70+
}
5171
}
5272

5373
data "aws_iam_policy_document" "policy_data_fail" {

terraform/main.tf

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,30 @@ module "instance" {
6161
subnet_id = module.subnet.subnet_id_primary
6262

6363
tags = {
64-
Environment = var.env
64+
Environment = var.env
65+
git_commit = "f5abc4fc41b394b145ee8a23429986184e150ef1"
66+
git_file = "terraform/main.tf"
67+
git_last_modified_at = "2022-09-22 19:07:11"
68+
git_last_modified_by = "[email protected]"
69+
git_modifiers = "mroberts"
70+
git_org = "try-bridgecrew"
71+
git_repo = "codegoat"
72+
yor_trace = "a5ffaaa3-e604-4f84-934e-ff1877ca74e0"
6573
}
6674
}
6775

6876

6977
resource "aws_ebs_volume" "i" {
7078
availability_zone = "${var.region}a"
7179
size = 40
80+
tags = {
81+
git_commit = "f5abc4fc41b394b145ee8a23429986184e150ef1"
82+
git_file = "terraform/main.tf"
83+
git_last_modified_at = "2022-09-22 19:07:11"
84+
git_last_modified_by = "[email protected]"
85+
git_modifiers = "mroberts"
86+
git_org = "try-bridgecrew"
87+
git_repo = "codegoat"
88+
yor_trace = "1c06a9c0-4d81-4137-8d86-24cf1260ca17"
89+
}
7290
}

terraform/modules/iam/main.tf

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
data "aws_iam_policy_document" "example-policy" {
22
statement {
3-
actions = ["*"]
3+
actions = ["*"]
44
resources = ["*"]
55
}
66
}
@@ -9,4 +9,14 @@ resource "aws_iam_role" "admin-role" {
99
name = "${var.environment}_admin_role"
1010
assume_role_policy = data.aws_iam_policy_document.example-policy.json # (not shown)
1111
managed_policy_arns = []
12+
tags = {
13+
git_commit = "f5abc4fc41b394b145ee8a23429986184e150ef1"
14+
git_file = "terraform/modules/iam/main.tf"
15+
git_last_modified_at = "2022-09-22 19:07:11"
16+
git_last_modified_by = "[email protected]"
17+
git_modifiers = "mroberts"
18+
git_org = "try-bridgecrew"
19+
git_repo = "codegoat"
20+
yor_trace = "6b7b8033-6e0a-482d-acc4-05584f723771"
21+
}
1222
}

terraform/modules/storage/main.tf

Lines changed: 100 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ resource "aws_db_subnet_group" "example_rds_subnet_grp" {
44

55
tags = merge(var.default_tags, {
66
Name = "example_rds_subnet_grp_${var.environment}"
7+
}, {
8+
git_commit = "f5abc4fc41b394b145ee8a23429986184e150ef1"
9+
git_file = "terraform/modules/storage/main.tf"
10+
git_last_modified_at = "2022-09-22 19:07:11"
11+
git_last_modified_by = "[email protected]"
12+
git_modifiers = "mroberts"
13+
git_org = "try-bridgecrew"
14+
git_repo = "codegoat"
15+
yor_trace = "f2a1cfe5-e3d1-4f3e-8934-4d6114ead100"
716
})
817
}
918

@@ -13,6 +22,15 @@ resource "aws_security_group" "example_rds_sg" {
1322

1423
tags = merge(var.default_tags, {
1524
Name = "example_rds_sg_${var.environment}"
25+
}, {
26+
git_commit = "f5abc4fc41b394b145ee8a23429986184e150ef1"
27+
git_file = "terraform/modules/storage/main.tf"
28+
git_last_modified_at = "2022-09-22 19:07:11"
29+
git_last_modified_by = "[email protected]"
30+
git_modifiers = "mroberts"
31+
git_org = "try-bridgecrew"
32+
git_repo = "codegoat"
33+
yor_trace = "a135de5a-372b-4b70-98ad-3775ef91c7fb"
1634
})
1735

1836
ingress {
@@ -37,6 +55,15 @@ resource "aws_kms_key" "example_db_kms_key" {
3755

3856
tags = merge(var.default_tags, {
3957
Name = "example_db_kms_key_${var.environment}"
58+
}, {
59+
git_commit = "f5abc4fc41b394b145ee8a23429986184e150ef1"
60+
git_file = "terraform/modules/storage/main.tf"
61+
git_last_modified_at = "2022-09-22 19:07:11"
62+
git_last_modified_by = "[email protected]"
63+
git_modifiers = "mroberts"
64+
git_org = "try-bridgecrew"
65+
git_repo = "codegoat"
66+
yor_trace = "988b0096-39e5-4077-99dd-120eb990cd1d"
4067
})
4168
}
4269

@@ -58,6 +85,15 @@ resource "aws_db_instance" "example_db" {
5885
kms_key_id = aws_kms_key.example_db_kms_key.arn
5986
tags = merge(var.default_tags, {
6087
Name = "example_db_${var.environment}"
88+
}, {
89+
git_commit = "c5ab3fd5b4eef4d47c12b1fb7ef14cdd9feaca15"
90+
git_file = "terraform/modules/storage/main.tf"
91+
git_last_modified_at = "2022-09-26 18:17:07"
92+
git_last_modified_by = "[email protected]"
93+
git_modifiers = "mroberts"
94+
git_org = "try-bridgecrew"
95+
git_repo = "codegoat"
96+
yor_trace = "402cb8e8-703c-4778-af81-f322be4fc5d9"
6197
})
6298
}
6399

@@ -67,7 +103,16 @@ resource "aws_ssm_parameter" "example_ssm_db_host" {
67103
type = "String"
68104
value = aws_db_instance.example_db.endpoint
69105

70-
tags = merge(var.default_tags, {})
106+
tags = merge(var.default_tags, {}, {
107+
git_commit = "f5abc4fc41b394b145ee8a23429986184e150ef1"
108+
git_file = "terraform/modules/storage/main.tf"
109+
git_last_modified_at = "2022-09-22 19:07:11"
110+
git_last_modified_by = "[email protected]"
111+
git_modifiers = "mroberts"
112+
git_org = "try-bridgecrew"
113+
git_repo = "codegoat"
114+
yor_trace = "4fbfdb10-f5bf-424b-af46-ab69cbb0df3c"
115+
})
71116
}
72117

73118
resource "aws_ssm_parameter" "example_ssm_db_password" {
@@ -76,7 +121,16 @@ resource "aws_ssm_parameter" "example_ssm_db_password" {
76121
type = "String"
77122
value = aws_db_instance.example_db.password
78123

79-
tags = merge(var.default_tags, {})
124+
tags = merge(var.default_tags, {}, {
125+
git_commit = "f5abc4fc41b394b145ee8a23429986184e150ef1"
126+
git_file = "terraform/modules/storage/main.tf"
127+
git_last_modified_at = "2022-09-22 19:07:11"
128+
git_last_modified_by = "[email protected]"
129+
git_modifiers = "mroberts"
130+
git_org = "try-bridgecrew"
131+
git_repo = "codegoat"
132+
yor_trace = "d066cbee-4067-495c-8377-3294ec8f5509"
133+
})
80134
}
81135

82136
resource "aws_ssm_parameter" "example_ssm_db_user" {
@@ -85,7 +139,16 @@ resource "aws_ssm_parameter" "example_ssm_db_user" {
85139
type = "String"
86140
value = aws_db_instance.example_db.username
87141

88-
tags = merge(var.default_tags, {})
142+
tags = merge(var.default_tags, {}, {
143+
git_commit = "f5abc4fc41b394b145ee8a23429986184e150ef1"
144+
git_file = "terraform/modules/storage/main.tf"
145+
git_last_modified_at = "2022-09-22 19:07:11"
146+
git_last_modified_by = "[email protected]"
147+
git_modifiers = "mroberts"
148+
git_org = "try-bridgecrew"
149+
git_repo = "codegoat"
150+
yor_trace = "218214f1-78c9-49f0-bef6-b65b3da80461"
151+
})
89152
}
90153
resource "aws_ssm_parameter" "example_ssm_db_name" {
91154
name = "/example-${var.environment}/DB_NAME"
@@ -95,6 +158,15 @@ resource "aws_ssm_parameter" "example_ssm_db_name" {
95158

96159
tags = merge(var.default_tags, {
97160
environment = "${var.environment}"
161+
}, {
162+
git_commit = "f5abc4fc41b394b145ee8a23429986184e150ef1"
163+
git_file = "terraform/modules/storage/main.tf"
164+
git_last_modified_at = "2022-09-22 19:07:11"
165+
git_last_modified_by = "[email protected]"
166+
git_modifiers = "mroberts"
167+
git_org = "try-bridgecrew"
168+
git_repo = "codegoat"
169+
yor_trace = "f6cfbef0-a5d1-4630-a933-52adf04af603"
98170
})
99171
}
100172

@@ -103,33 +175,51 @@ resource "aws_s3_bucket" "my-private-bucket" {
103175

104176
tags = merge(var.default_tags, {
105177
name = "example_private_${var.environment}"
178+
}, {
179+
git_commit = "5e4524cf776f0c30044fcb6c8c82ee9c379f7cd1"
180+
git_file = "terraform/modules/storage/main.tf"
181+
git_last_modified_at = "2022-09-26 20:54:59"
182+
git_last_modified_by = "[email protected]"
183+
git_modifiers = "mroberts"
184+
git_org = "try-bridgecrew"
185+
git_repo = "codegoat"
186+
yor_trace = "26ecaeea-c233-4e1f-a4ae-a8bcb8854244"
106187
})
107188
}
108189

109190
resource "aws_s3_bucket" "public-bucket-oops" {
110191
bucket = "my-public-bucket-oops-demo"
111-
192+
112193
tags = merge(var.default_tags, {
113194
name = "example_public_${var.environment}"
195+
}, {
196+
git_commit = "5e4524cf776f0c30044fcb6c8c82ee9c379f7cd1"
197+
git_file = "terraform/modules/storage/main.tf"
198+
git_last_modified_at = "2022-09-26 20:54:59"
199+
git_last_modified_by = "[email protected]"
200+
git_modifiers = "mroberts"
201+
git_org = "try-bridgecrew"
202+
git_repo = "codegoat"
203+
yor_trace = "7ecefeab-6519-4a8e-a3f6-8c849f9eff19"
114204
})
115205
}
116206

117207
resource "aws_s3_bucket_public_access_block" "private_access" {
118208
bucket = aws_s3_bucket.my-private-bucket.id
119209

120-
ignore_public_acls = true
121-
block_public_acls = true
122-
block_public_policy = true
210+
ignore_public_acls = true
211+
block_public_acls = true
212+
block_public_policy = true
123213
restrict_public_buckets = true
124214
}
125215

126216

127217
resource "aws_s3_bucket_public_access_block" "public_access" {
128218
bucket = aws_s3_bucket.public-bucket-oops.id
129219

130-
ignore_public_acls = var.public_var
131-
block_public_acls = var.public_var
132-
block_public_policy = var.public_var
220+
ignore_public_acls = var.public_var
221+
block_public_acls = var.public_var
222+
block_public_policy = var.public_var
133223
restrict_public_buckets = var.public_var
134224
}
135225

terraform/modules/subnet/main.tf

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,31 @@
11
resource "aws_subnet" "primary" {
2-
vpc_id = var.vpc_id
3-
cidr_block = var.cidr_primary
2+
vpc_id = var.vpc_id
3+
cidr_block = var.cidr_primary
44
availability_zone = "${var.region}a"
5+
tags = {
6+
git_commit = "f5abc4fc41b394b145ee8a23429986184e150ef1"
7+
git_file = "terraform/modules/subnet/main.tf"
8+
git_last_modified_at = "2022-09-22 19:07:11"
9+
git_last_modified_by = "[email protected]"
10+
git_modifiers = "mroberts"
11+
git_org = "try-bridgecrew"
12+
git_repo = "codegoat"
13+
yor_trace = "de17a83e-d2cf-41c2-833f-c959687ccca6"
14+
}
515
}
616

717
resource "aws_subnet" "secondary" {
8-
vpc_id = var.vpc_id
9-
cidr_block = var.cidr_secondary
18+
vpc_id = var.vpc_id
19+
cidr_block = var.cidr_secondary
1020
availability_zone = "${var.region}c"
21+
tags = {
22+
git_commit = "f5abc4fc41b394b145ee8a23429986184e150ef1"
23+
git_file = "terraform/modules/subnet/main.tf"
24+
git_last_modified_at = "2022-09-22 19:07:11"
25+
git_last_modified_by = "[email protected]"
26+
git_modifiers = "mroberts"
27+
git_org = "try-bridgecrew"
28+
git_repo = "codegoat"
29+
yor_trace = "7c0c6cf6-3882-483b-937c-801545bb27f0"
30+
}
1131
}

0 commit comments

Comments
 (0)