Skip to content

Commit 3684eac

Browse files
committed
Add pre / post install and delete parameter
1 parent b44f4b3 commit 3684eac

File tree

1 file changed

+28
-32
lines changed

1 file changed

+28
-32
lines changed

modules/runners/main.tf

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,16 @@
1-
2-
resource "aws_resourcegroups_group" "resourcegroups_group" {
3-
name = "${var.environment}-group"
4-
5-
resource_query {
6-
query = <<-JSON
7-
{
8-
"ResourceTypeFilters": [
9-
"AWS::AllSupported"
10-
],
11-
"TagFilters": [
12-
{
13-
"Key": "ResourceGroup",
14-
"Values": ["${var.environment}"]
15-
}
16-
]
17-
}
18-
JSON
19-
}
20-
}
21-
22-
231
locals {
2+
name_sg = var.overrides["name_sg"] == "" ? local.tags["Name"] : var.overrides["name_sg"]
243
s3_location_runner_distribution = "s3://${aws_s3_bucket.action_dist.id}/${var.action_runner_dist_bucket_location}"
4+
5+
tags = merge(
6+
{
7+
"Name" = format("%s", var.environment)
8+
},
9+
{
10+
"Environment" = format("%s", var.environment)
11+
},
12+
var.tags,
13+
)
2514
}
2615

2716
data "aws_ami" "runner" {
@@ -104,15 +93,22 @@ resource "aws_security_group" "runner_sg" {
10493
)
10594
}
10695

107-
locals {
108-
name_sg = var.overrides["name_sg"] == "" ? local.tags["Name"] : var.overrides["name_sg"]
109-
tags = merge(
110-
{
111-
"Name" = format("%s", var.environment)
112-
},
96+
resource "aws_resourcegroups_group" "resourcegroups_group" {
97+
name = "${var.environment}-group"
98+
99+
resource_query {
100+
query = <<-JSON
101+
{
102+
"ResourceTypeFilters": [
103+
"AWS::AllSupported"
104+
],
105+
"TagFilters": [
113106
{
114-
"Environment" = format("%s", var.environment)
115-
},
116-
var.tags,
117-
)
107+
"Key": "ResourceGroup",
108+
"Values": ["${var.environment}"]
109+
}
110+
]
111+
}
112+
JSON
113+
}
118114
}

0 commit comments

Comments
 (0)