Skip to content

Commit f0809b0

Browse files
mnitchevmnitchev
authored
Use tomap instead of map (#769)
map has been deprecated since terraform 0.12
1 parent 73c1025 commit f0809b0

16 files changed

+184
-184
lines changed

‎modules/aws/bastion/bastion.tf

+15-15
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ locals {
99

1010
common_tags = merge(
1111
var.additional_tags,
12-
map(
13-
"giantswarm.io/cluster", var.cluster_name,
14-
"giantswarm.io/installation", var.cluster_name,
15-
"giantswarm.io/cluster-type", "control-plane",
16-
"kubernetes.io/cluster/${var.cluster_name}", "owned"
17-
)
12+
tomap({
13+
"giantswarm.io/cluster" = var.cluster_name
14+
"giantswarm.io/installation" = var.cluster_name
15+
"giantswarm.io/cluster-type" = "control-plane"
16+
"kubernetes.io/cluster/${var.cluster_name}" = "owned"
17+
})
1818
)
1919
}
2020

@@ -41,9 +41,9 @@ resource "aws_instance" "bastion" {
4141

4242
tags = merge(
4343
local.common_tags,
44-
map(
45-
"Name", "${var.cluster_name}-bastion${count.index}"
46-
)
44+
tomap({
45+
"Name" = "${var.cluster_name}-bastion${count.index}"
46+
})
4747
)
4848
}
4949

@@ -94,9 +94,9 @@ resource "aws_security_group" "bastion" {
9494

9595
tags = merge(
9696
local.common_tags,
97-
map(
98-
"Name", "${var.cluster_name}-bastion"
99-
)
97+
tomap({
98+
"Name" = "${var.cluster_name}-bastion"
99+
})
100100
)
101101
}
102102

@@ -124,9 +124,9 @@ resource "aws_s3_bucket_object" "ignition_bastion_with_tags" {
124124

125125
tags = merge(
126126
var.additional_tags,
127-
map(
128-
"Name", "${var.cluster_name}-ignition-bastion"
129-
)
127+
tomap({
128+
"Name" = "${var.cluster_name}-ignition-bastion"
129+
})
130130
)
131131
}
132132

‎modules/aws/ingress/lb.tf

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
locals {
22
common_tags = merge(
33
var.additional_tags,
4-
map(
5-
"giantswarm.io/cluster", var.cluster_name,
6-
"giantswarm.io/installation", var.cluster_name,
7-
"kubernetes.io/cluster/${var.cluster_name}", "owned"
8-
)
4+
tomap({
5+
"giantswarm.io/cluster" = var.cluster_name
6+
"giantswarm.io/installation" = var.cluster_name
7+
"kubernetes.io/cluster/${var.cluster_name}" = "owned"
8+
})
99
)
1010
}
1111
resource "aws_elb" "worker" {
@@ -39,9 +39,9 @@ resource "aws_elb" "worker" {
3939

4040
tags = merge(
4141
local.common_tags,
42-
map(
43-
"Name", "${var.cluster_name}-worker"
44-
)
42+
tomap({
43+
"Name" = "${var.cluster_name}-worker"
44+
})
4545
)
4646
}
4747

@@ -77,9 +77,9 @@ resource "aws_security_group" "worker_elb" {
7777

7878
tags = merge(
7979
local.common_tags,
80-
map(
81-
"Name", "${var.cluster_name}-worker-elb"
82-
)
80+
tomap({
81+
"Name" = "${var.cluster_name}-worker-elb"
82+
})
8383
)
8484
}
8585

‎modules/aws/master/master-elb.tf

+12-12
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ resource "aws_elb" "master_api" {
2323

2424
tags = merge(
2525
local.common_tags,
26-
map(
27-
"Name", "${var.cluster_name}-master-api"
28-
)
26+
tomap({
27+
"Name" = "${var.cluster_name}-master-api"
28+
})
2929
)
3030
}
3131

@@ -54,9 +54,9 @@ resource "aws_elb" "master_api_internal" {
5454

5555
tags = merge(
5656
local.common_tags,
57-
map(
58-
"Name", "${var.cluster_name}-master-api-internal"
59-
)
57+
tomap({
58+
"Name" = "${var.cluster_name}-master-api-internal"
59+
})
6060
)
6161
}
6262

@@ -97,9 +97,9 @@ resource "aws_security_group" "master_elb_api" {
9797

9898
tags = merge(
9999
local.common_tags,
100-
map(
101-
"Name", "${var.cluster_name}-master-elb-api"
102-
)
100+
tomap({
101+
"Name" = "${var.cluster_name}-master-elb-api"
102+
})
103103
)
104104
}
105105

@@ -140,9 +140,9 @@ resource "aws_security_group" "master_elb_api_internal" {
140140

141141
tags = merge(
142142
local.common_tags,
143-
map(
144-
"Name", "${var.cluster_name}-master-elb-api-internal"
145-
)
143+
tomap({
144+
"Name" = "${var.cluster_name}-master-elb-api-internal"
145+
})
146146
)
147147
}
148148

‎modules/aws/master/master.tf

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
locals {
22
common_tags = merge(
33
var.additional_tags,
4-
map(
5-
"giantswarm.io/cluster", var.cluster_name,
6-
"giantswarm.io/installation", var.cluster_name,
7-
"giantswarm.io/cluster-type", "control-plane",
8-
"kubernetes.io/cluster/${var.cluster_name}", "owned"
9-
)
4+
tomap({
5+
"giantswarm.io/cluster" = var.cluster_name
6+
"giantswarm.io/installation" = var.cluster_name
7+
"giantswarm.io/cluster-type" = "control-plane"
8+
"kubernetes.io/cluster/${var.cluster_name}" = "owned"
9+
})
1010
)
1111

1212
common_tags_asg = join("",[for key, value in var.additional_tags : "{\"Key\":\"${key}\",\"Value\":\"${value}\",\"PropagateAtLaunch\": true},"])
@@ -156,9 +156,9 @@ resource "aws_ebs_volume" "master_etcd" {
156156

157157
tags = merge(
158158
local.common_tags,
159-
map(
160-
"Name", "${var.cluster_name}-master${count.index + 1}-etcd"
161-
)
159+
tomap({
160+
"Name" = "${var.cluster_name}-master${count.index + 1}-etcd"
161+
})
162162
)
163163
}
164164

@@ -200,9 +200,9 @@ resource "aws_security_group" "master" {
200200

201201
tags = merge(
202202
local.common_tags,
203-
map(
204-
"Name", "${var.cluster_name}-master"
205-
)
203+
tomap({
204+
"Name" = "${var.cluster_name}-master"
205+
})
206206
)
207207
}
208208

@@ -232,10 +232,10 @@ resource "aws_network_interface" "master" {
232232

233233
tags = merge(
234234
local.common_tags,
235-
map(
236-
"Name", "${var.cluster_name}-master${count.index + 1}-etcd",
237-
"node.k8s.amazonaws.com/no_manage", "true",
238-
)
235+
tomap({
236+
"Name" = "${var.cluster_name}-master${count.index + 1}-etcd"
237+
"node.k8s.amazonaws.com/no_manage" = "true"
238+
})
239239
)
240240

241241
lifecycle {
@@ -260,9 +260,9 @@ resource "aws_s3_bucket_object" "ignition_master_with_tags" {
260260

261261
tags = merge(
262262
var.additional_tags,
263-
map(
264-
"Name", "${var.cluster_name}-ignition-master"
265-
)
263+
tomap({
264+
"Name" = "${var.cluster_name}-ignition-master"
265+
})
266266
)
267267
}
268268

‎modules/aws/s3/s3.tf

+27-27
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
locals {
22
common_tags = merge(
33
var.additional_tags,
4-
map(
5-
"giantswarm.io/cluster", var.cluster_name,
6-
"giantswarm.io/installation", var.cluster_name,
7-
"giantswarm.io/cluster-type", "control-plane",
8-
"kubernetes.io/cluster/${var.cluster_name}", "owned"
9-
)
4+
tomap({
5+
"giantswarm.io/cluster" = var.cluster_name
6+
"giantswarm.io/installation" = var.cluster_name
7+
"giantswarm.io/cluster-type" = "control-plane"
8+
"kubernetes.io/cluster/${var.cluster_name}" = "owned"
9+
})
1010
)
1111
}
1212

@@ -39,9 +39,9 @@ resource "aws_s3_bucket" "logging" {
3939

4040
tags = merge(
4141
local.common_tags,
42-
map(
43-
"Name", "${var.s3_bucket_prefix}${var.cluster_name}-access-logs"
44-
)
42+
tomap({
43+
"Name" = "${var.s3_bucket_prefix}${var.cluster_name}-access-logs"
44+
})
4545
)
4646
}
4747

@@ -94,9 +94,9 @@ resource "aws_s3_bucket" "loki" {
9494

9595
tags = merge(
9696
local.common_tags,
97-
map(
98-
"Name", "${var.cluster_name}-g8s-loki"
99-
)
97+
tomap({
98+
"Name" = "${var.cluster_name}-g8s-loki"
99+
})
100100
)
101101
}
102102

@@ -149,9 +149,9 @@ resource "aws_s3_bucket" "mimir" {
149149

150150
tags = merge(
151151
local.common_tags,
152-
map(
153-
"Name", "${var.cluster_name}-g8s-mimir"
154-
)
152+
tomap({
153+
"Name" = "${var.cluster_name}-g8s-mimir"
154+
})
155155
)
156156
}
157157

@@ -195,9 +195,9 @@ resource "aws_s3_bucket" "mimir-ruler" {
195195

196196
tags = merge(
197197
local.common_tags,
198-
map(
199-
"Name", "${var.cluster_name}-g8s-mimir-ruler"
200-
)
198+
tomap({
199+
"Name" = "${var.cluster_name}-g8s-mimir-ruler"
200+
})
201201
)
202202
}
203203

@@ -250,9 +250,9 @@ resource "aws_s3_bucket" "tempo" {
250250

251251
tags = merge(
252252
local.common_tags,
253-
map(
254-
"Name", "${var.cluster_name}-g8s-tempo"
255-
)
253+
tomap({
254+
"Name" = "${var.cluster_name}-g8s-tempo"
255+
})
256256
)
257257
}
258258

@@ -302,9 +302,9 @@ resource "aws_s3_bucket" "ignition" {
302302

303303
tags = merge(
304304
local.common_tags,
305-
map(
306-
"Name", "${var.cluster_name}-ignition"
307-
)
305+
tomap({
306+
"Name" = "${var.cluster_name}-ignition"
307+
})
308308
)
309309
}
310310

@@ -347,8 +347,8 @@ resource "aws_cloudwatch_log_group" "control-plane" {
347347

348348
tags = merge(
349349
local.common_tags,
350-
map(
351-
"Name", "${var.cluster_name}-ignition"
352-
)
350+
tomap({
351+
"Name" = "${var.cluster_name}-ignition"
352+
})
353353
)
354354
}

‎modules/aws/sqs/sqs.tf

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
locals {
22
common_tags = merge(
33
var.additional_tags,
4-
map(
5-
"giantswarm.io/cluster", var.cluster_name,
6-
"giantswarm.io/installation", var.cluster_name,
7-
"giantswarm.io/cluster-type", "control-plane",
8-
"kubernetes.io/cluster/${var.cluster_name}", "owned"
9-
)
4+
tomap({
5+
"giantswarm.io/cluster" = var.cluster_name
6+
"giantswarm.io/installation" = var.cluster_name
7+
"giantswarm.io/cluster-type" = "control-plane"
8+
"kubernetes.io/cluster/${var.cluster_name}" = "owned"
9+
})
1010
)
1111

1212
queue_name = "${var.cluster_name}-node-termination"

‎modules/aws/vault/vault-elb.tf

+6-6
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ resource "aws_elb" "vault" {
2121

2222
tags = merge(
2323
local.common_tags,
24-
map(
25-
"Name", "${var.cluster_name}-vault"
26-
)
24+
tomap({
25+
"Name" = "${var.cluster_name}-vault"
26+
})
2727
)
2828
}
2929

@@ -60,9 +60,9 @@ resource "aws_security_group" "vault_elb" {
6060

6161
tags = merge(
6262
local.common_tags,
63-
map(
64-
"Name", "${var.cluster_name}-vault-elb"
65-
)
63+
tomap({
64+
"Name" = "${var.cluster_name}-vault-elb"
65+
})
6666
)
6767
}
6868

0 commit comments

Comments
 (0)