Skip to content

Commit 8b76c0f

Browse files
lmilbaumkayman-mk
andauthored
refactor: extract data sources to its own dedicated file (#1021)
## Description Reducing main.tf file size will improve its readability. The data sources are moved to a separate file. ## Migrations required Nn ## Verification No verification done. Just moving the data sources. --------- Co-authored-by: Matthias Kay <[email protected]>
1 parent 68884fd commit 8b76c0f

File tree

3 files changed

+46
-43
lines changed

3 files changed

+46
-43
lines changed

data.tf

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
data "aws_caller_identity" "current" {}
2+
3+
data "aws_partition" "current" {}
4+
5+
data "aws_region" "current" {}
6+
7+
data "aws_subnet" "runners" {
8+
id = var.subnet_id
9+
}
10+
11+
data "aws_availability_zone" "runners" {
12+
name = data.aws_subnet.runners.availability_zone
13+
}
14+
15+
data "aws_ami" "runner" {
16+
most_recent = "true"
17+
18+
dynamic "filter" {
19+
for_each = var.runner_ami_filter
20+
content {
21+
name = filter.key
22+
values = filter.value
23+
}
24+
}
25+
26+
owners = var.runner_ami_owners
27+
}
28+
29+
data "aws_ami" "docker-machine" {
30+
count = var.runner_worker.type == "docker+machine" ? 1 : 0
31+
32+
most_recent = "true"
33+
34+
dynamic "filter" {
35+
for_each = var.runner_worker_docker_machine_ami_filter
36+
content {
37+
name = filter.key
38+
values = filter.value
39+
}
40+
}
41+
42+
owners = var.runner_worker_docker_machine_ami_owners
43+
}

main.tf

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
data "aws_caller_identity" "current" {}
2-
data "aws_partition" "current" {}
3-
data "aws_region" "current" {}
4-
5-
data "aws_subnet" "runners" {
6-
id = var.subnet_id
7-
}
8-
9-
data "aws_availability_zone" "runners" {
10-
name = data.aws_subnet.runners.availability_zone
11-
}
12-
131
# Parameter value is managed by the user-data script of the gitlab runner instance
142
resource "aws_ssm_parameter" "runner_registration_token" {
153
name = local.secure_parameter_store_runner_token_key
@@ -157,22 +145,6 @@ locals {
157145
)
158146
}
159147

160-
data "aws_ami" "docker-machine" {
161-
count = var.runner_worker.type == "docker+machine" ? 1 : 0
162-
163-
most_recent = "true"
164-
165-
dynamic "filter" {
166-
for_each = var.runner_worker_docker_machine_ami_filter
167-
content {
168-
name = filter.key
169-
values = filter.value
170-
}
171-
}
172-
173-
owners = var.runner_worker_docker_machine_ami_owners
174-
}
175-
176148
# ignores: Autoscaling Groups Supply Tags --> we use a "dynamic" block to create the tags
177149
# ignores: Auto Scaling Group With No Associated ELB --> that's simply not true, as the EC2 instance contacts GitLab. So no ELB needed here.
178150
# kics-scan ignore-line
@@ -240,20 +212,6 @@ resource "aws_autoscaling_schedule" "scale_out" {
240212
max_size = try(var.runner_schedule_config["scale_out_max_size"], var.runner_schedule_config["scale_out_count"])
241213
}
242214

243-
data "aws_ami" "runner" {
244-
most_recent = "true"
245-
246-
dynamic "filter" {
247-
for_each = var.runner_ami_filter
248-
content {
249-
name = filter.key
250-
values = filter.value
251-
}
252-
}
253-
254-
owners = var.runner_ami_owners
255-
}
256-
257215
resource "aws_launch_template" "gitlab_runner_instance" {
258216
# checkov:skip=CKV_AWS_341:Hop limit > 1 needed here in case of Docker builds. Otherwise the token is invalid within Docker.
259217
# checkov:skip=CKV_AWS_88:User can decide to add a public IP.

modules/terminate-agent-hook/iam.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
data "aws_partition" "current" {}
21
data "aws_caller_identity" "this" {}
2+
3+
data "aws_partition" "current" {}
4+
35
data "aws_region" "this" {}
46

57
# ----------------------------------------------------------------------------

0 commit comments

Comments
 (0)