Skip to content

Commit 375d27c

Browse files
wyardleyapeabody
wyardley
and
apeabody
authored
fix: update resource names to snake_case (#2151)
Co-authored-by: Andrew Peabody <[email protected]>
1 parent bbc47f8 commit 375d27c

File tree

40 files changed

+710
-150
lines changed

40 files changed

+710
-150
lines changed

‎autogen/main/dns.tf.tmpl

+3-9
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
Manage kube-dns configmaps
2121
*****************************************/
2222

23-
resource "kubernetes_config_map_v1_data" "kube-dns" {
23+
resource "kubernetes_config_map_v1_data" "kube_dns" {
2424
count = local.custom_kube_dns_config && !local.upstream_nameservers_config ? 1 : 0
2525

2626
metadata {
@@ -44,7 +44,7 @@ EOF
4444
]
4545
}
4646

47-
resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" {
47+
resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers" {
4848
count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0
4949

5050
metadata {
@@ -68,13 +68,7 @@ EOF
6868
]
6969
}
7070

71-
# Fix the name typo in the previous ConfigMap creation call
72-
moved {
73-
from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers
74-
to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers
75-
}
76-
77-
resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers-and-stub-domains" {
71+
resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers_and_stub_domains" {
7872
count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0
7973

8074
metadata {

‎autogen/main/masq.tf.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
/******************************************
2020
Create ip-masq-agent confimap
2121
*****************************************/
22-
resource "kubernetes_config_map" "ip-masq-agent" {
22+
resource "kubernetes_config_map" "ip_masq_agent" {
2323
count = var.configure_ip_masq ? 1 : 0
2424

2525
metadata {

‎autogen/main/moved.tf.tmpl

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
/**
2+
* Copyright 2024 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
# Updates for kebab to snake case, to match best practices and Google style.
18+
moved {
19+
from = kubernetes_config_map_v1_data.kube-dns
20+
to = kubernetes_config_map_v1_data.kube_dns
21+
}
22+
23+
# Typo fix and snake case at the same time
24+
moved {
25+
from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers
26+
to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers
27+
}
28+
29+
moved {
30+
from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers-and-stub-domains
31+
to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers_and_stub_domains
32+
}
33+
34+
moved {
35+
from = kubernetes_config_map.ip-masq-agent
36+
to = kubernetes_config_map.ip_masq_agent
37+
}
38+
39+
moved {
40+
from = google_project_iam_member.cluster_service_account-nodeService_account
41+
to = google_project_iam_member.cluster_service_account_node_service_account
42+
}
43+
44+
moved {
45+
from = google_project_iam_member.cluster_service_account-metric_writer
46+
to = google_project_iam_member.cluster_service_account_metric_writer
47+
}
48+
49+
moved {
50+
from = google_project_iam_member.cluster_service_account-resourceMetadata-writer
51+
to = google_project_iam_member.cluster_service_account_resource_metadata_writer
52+
}
53+
54+
moved {
55+
from = google_project_iam_member.cluster_service_account-gcr
56+
to = google_project_iam_member.cluster_service_account_gcr
57+
}
58+
59+
moved {
60+
from = google_project_iam_member.cluster_service_account-artifact-registry
61+
to = google_project_iam_member.cluster_service_account_artifact_registry
62+
}

‎autogen/main/sa.tf.tmpl

+5-5
Original file line numberDiff line numberDiff line change
@@ -46,35 +46,35 @@ resource "google_service_account" "cluster_service_account" {
4646
display_name = "Terraform-managed service account for cluster ${var.name}"
4747
}
4848

49-
resource "google_project_iam_member" "cluster_service_account-nodeService_account" {
49+
resource "google_project_iam_member" "cluster_service_account_node_service_account" {
5050
count = var.create_service_account ? 1 : 0
5151
project = google_service_account.cluster_service_account[0].project
5252
role = "roles/container.defaultNodeServiceAccount"
5353
member = google_service_account.cluster_service_account[0].member
5454
}
5555

56-
resource "google_project_iam_member" "cluster_service_account-metric_writer" {
56+
resource "google_project_iam_member" "cluster_service_account_metric_writer" {
5757
count = var.create_service_account ? 1 : 0
5858
project = google_service_account.cluster_service_account[0].project
5959
role = "roles/monitoring.metricWriter"
6060
member = google_service_account.cluster_service_account[0].member
6161
}
6262

63-
resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
63+
resource "google_project_iam_member" "cluster_service_account_resource_metadata_writer" {
6464
count = var.create_service_account ? 1 : 0
6565
project = google_service_account.cluster_service_account[0].project
6666
role = "roles/stackdriver.resourceMetadata.writer"
6767
member = google_service_account.cluster_service_account[0].member
6868
}
6969

70-
resource "google_project_iam_member" "cluster_service_account-gcr" {
70+
resource "google_project_iam_member" "cluster_service_account_gcr" {
7171
for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : []
7272
project = each.key
7373
role = "roles/storage.objectViewer"
7474
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
7575
}
7676

77-
resource "google_project_iam_member" "cluster_service_account-artifact-registry" {
77+
resource "google_project_iam_member" "cluster_service_account_artifact_registry" {
7878
for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : []
7979
project = each.key
8080
role = "roles/artifactregistry.reader"

‎dns.tf

+3-9
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
Manage kube-dns configmaps
2121
*****************************************/
2222

23-
resource "kubernetes_config_map_v1_data" "kube-dns" {
23+
resource "kubernetes_config_map_v1_data" "kube_dns" {
2424
count = local.custom_kube_dns_config && !local.upstream_nameservers_config ? 1 : 0
2525

2626
metadata {
@@ -42,7 +42,7 @@ EOF
4242
]
4343
}
4444

45-
resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" {
45+
resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers" {
4646
count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0
4747

4848
metadata {
@@ -64,13 +64,7 @@ EOF
6464
]
6565
}
6666

67-
# Fix the name typo in the previous ConfigMap creation call
68-
moved {
69-
from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers
70-
to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers
71-
}
72-
73-
resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers-and-stub-domains" {
67+
resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers_and_stub_domains" {
7468
count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0
7569

7670
metadata {

‎masq.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
/******************************************
2020
Create ip-masq-agent confimap
2121
*****************************************/
22-
resource "kubernetes_config_map" "ip-masq-agent" {
22+
resource "kubernetes_config_map" "ip_masq_agent" {
2323
count = var.configure_ip_masq ? 1 : 0
2424

2525
metadata {

‎modules/beta-autopilot-private-cluster/dns.tf

+3-9
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
Manage kube-dns configmaps
2121
*****************************************/
2222

23-
resource "kubernetes_config_map_v1_data" "kube-dns" {
23+
resource "kubernetes_config_map_v1_data" "kube_dns" {
2424
count = local.custom_kube_dns_config && !local.upstream_nameservers_config ? 1 : 0
2525

2626
metadata {
@@ -41,7 +41,7 @@ EOF
4141
]
4242
}
4343

44-
resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" {
44+
resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers" {
4545
count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0
4646

4747
metadata {
@@ -62,13 +62,7 @@ EOF
6262
]
6363
}
6464

65-
# Fix the name typo in the previous ConfigMap creation call
66-
moved {
67-
from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers
68-
to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers
69-
}
70-
71-
resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers-and-stub-domains" {
65+
resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers_and_stub_domains" {
7266
count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0
7367

7468
metadata {

‎modules/beta-autopilot-private-cluster/masq.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
/******************************************
2020
Create ip-masq-agent confimap
2121
*****************************************/
22-
resource "kubernetes_config_map" "ip-masq-agent" {
22+
resource "kubernetes_config_map" "ip_masq_agent" {
2323
count = var.configure_ip_masq ? 1 : 0
2424

2525
metadata {

‎modules/beta-autopilot-private-cluster/moved.tf

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
/**
2+
* Copyright 2024 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
# Updates for kebab to snake case, to match best practices and Google style.
18+
moved {
19+
from = kubernetes_config_map_v1_data.kube-dns
20+
to = kubernetes_config_map_v1_data.kube_dns
21+
}
22+
23+
# Typo fix and snake case at the same time
24+
moved {
25+
from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers
26+
to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers
27+
}
28+
29+
moved {
30+
from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers-and-stub-domains
31+
to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers_and_stub_domains
32+
}
33+
34+
moved {
35+
from = kubernetes_config_map.ip-masq-agent
36+
to = kubernetes_config_map.ip_masq_agent
37+
}
38+
39+
moved {
40+
from = google_project_iam_member.cluster_service_account-nodeService_account
41+
to = google_project_iam_member.cluster_service_account_node_service_account
42+
}
43+
44+
moved {
45+
from = google_project_iam_member.cluster_service_account-metric_writer
46+
to = google_project_iam_member.cluster_service_account_metric_writer
47+
}
48+
49+
moved {
50+
from = google_project_iam_member.cluster_service_account-resourceMetadata-writer
51+
to = google_project_iam_member.cluster_service_account_resource_metadata_writer
52+
}
53+
54+
moved {
55+
from = google_project_iam_member.cluster_service_account-gcr
56+
to = google_project_iam_member.cluster_service_account_gcr
57+
}
58+
59+
moved {
60+
from = google_project_iam_member.cluster_service_account-artifact-registry
61+
to = google_project_iam_member.cluster_service_account_artifact_registry
62+
}

‎modules/beta-autopilot-private-cluster/sa.tf

+5-5
Original file line numberDiff line numberDiff line change
@@ -46,35 +46,35 @@ resource "google_service_account" "cluster_service_account" {
4646
display_name = "Terraform-managed service account for cluster ${var.name}"
4747
}
4848

49-
resource "google_project_iam_member" "cluster_service_account-nodeService_account" {
49+
resource "google_project_iam_member" "cluster_service_account_node_service_account" {
5050
count = var.create_service_account ? 1 : 0
5151
project = google_service_account.cluster_service_account[0].project
5252
role = "roles/container.defaultNodeServiceAccount"
5353
member = google_service_account.cluster_service_account[0].member
5454
}
5555

56-
resource "google_project_iam_member" "cluster_service_account-metric_writer" {
56+
resource "google_project_iam_member" "cluster_service_account_metric_writer" {
5757
count = var.create_service_account ? 1 : 0
5858
project = google_service_account.cluster_service_account[0].project
5959
role = "roles/monitoring.metricWriter"
6060
member = google_service_account.cluster_service_account[0].member
6161
}
6262

63-
resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
63+
resource "google_project_iam_member" "cluster_service_account_resource_metadata_writer" {
6464
count = var.create_service_account ? 1 : 0
6565
project = google_service_account.cluster_service_account[0].project
6666
role = "roles/stackdriver.resourceMetadata.writer"
6767
member = google_service_account.cluster_service_account[0].member
6868
}
6969

70-
resource "google_project_iam_member" "cluster_service_account-gcr" {
70+
resource "google_project_iam_member" "cluster_service_account_gcr" {
7171
for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : []
7272
project = each.key
7373
role = "roles/storage.objectViewer"
7474
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
7575
}
7676

77-
resource "google_project_iam_member" "cluster_service_account-artifact-registry" {
77+
resource "google_project_iam_member" "cluster_service_account_artifact_registry" {
7878
for_each = var.create_service_account && var.grant_registry_access ? toset(local.registry_projects_list) : []
7979
project = each.key
8080
role = "roles/artifactregistry.reader"

‎modules/beta-autopilot-public-cluster/dns.tf

+3-9
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
Manage kube-dns configmaps
2121
*****************************************/
2222

23-
resource "kubernetes_config_map_v1_data" "kube-dns" {
23+
resource "kubernetes_config_map_v1_data" "kube_dns" {
2424
count = local.custom_kube_dns_config && !local.upstream_nameservers_config ? 1 : 0
2525

2626
metadata {
@@ -41,7 +41,7 @@ EOF
4141
]
4242
}
4343

44-
resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers" {
44+
resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers" {
4545
count = !local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0
4646

4747
metadata {
@@ -62,13 +62,7 @@ EOF
6262
]
6363
}
6464

65-
# Fix the name typo in the previous ConfigMap creation call
66-
moved {
67-
from = kubernetes_config_map_v1_data.kube-dns-upstream-namservers
68-
to = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers
69-
}
70-
71-
resource "kubernetes_config_map_v1_data" "kube-dns-upstream-nameservers-and-stub-domains" {
65+
resource "kubernetes_config_map_v1_data" "kube_dns_upstream_nameservers_and_stub_domains" {
7266
count = local.custom_kube_dns_config && local.upstream_nameservers_config ? 1 : 0
7367

7468
metadata {

‎modules/beta-autopilot-public-cluster/masq.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
/******************************************
2020
Create ip-masq-agent confimap
2121
*****************************************/
22-
resource "kubernetes_config_map" "ip-masq-agent" {
22+
resource "kubernetes_config_map" "ip_masq_agent" {
2323
count = var.configure_ip_masq ? 1 : 0
2424

2525
metadata {

0 commit comments

Comments
 (0)