Skip to content

Commit e957469

Browse files
j8rbharathkkb
j8r
and
bharathkkb
authored
chore: Use google_service_account#member attribute (#1615)
Co-authored-by: Bharath KKB <bharathkrishnakb@gmail.com>
1 parent 5ef6852 commit e957469

File tree

10 files changed

+40
-40
lines changed
  • autogen/main
  • modules
    • beta-autopilot-private-cluster
    • beta-autopilot-public-cluster
    • beta-private-cluster-update-variant
    • beta-private-cluster
    • beta-public-cluster-update-variant
    • beta-public-cluster
    • private-cluster-update-variant
    • private-cluster
  • sa.tf

10 files changed

+40
-40
lines changed

‎autogen/main/sa.tf.tmpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,28 +49,28 @@ resource "google_project_iam_member" "cluster_service_account-log_writer" {
4949
count = var.create_service_account ? 1 : 0
5050
project = google_service_account.cluster_service_account[0].project
5151
role = "roles/logging.logWriter"
52-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
52+
member = google_service_account.cluster_service_account[0].member
5353
}
5454

5555
resource "google_project_iam_member" "cluster_service_account-metric_writer" {
5656
count = var.create_service_account ? 1 : 0
5757
project = google_project_iam_member.cluster_service_account-log_writer[0].project
5858
role = "roles/monitoring.metricWriter"
59-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
59+
member = google_service_account.cluster_service_account[0].member
6060
}
6161

6262
resource "google_project_iam_member" "cluster_service_account-monitoring_viewer" {
6363
count = var.create_service_account ? 1 : 0
6464
project = google_project_iam_member.cluster_service_account-metric_writer[0].project
6565
role = "roles/monitoring.viewer"
66-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
66+
member = google_service_account.cluster_service_account[0].member
6767
}
6868

6969
resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
7070
count = var.create_service_account ? 1 : 0
7171
project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
7272
role = "roles/stackdriver.resourceMetadata.writer"
73-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
73+
member = google_service_account.cluster_service_account[0].member
7474
}
7575

7676
resource "google_project_iam_member" "cluster_service_account-gcr" {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,28 +49,28 @@ resource "google_project_iam_member" "cluster_service_account-log_writer" {
4949
count = var.create_service_account ? 1 : 0
5050
project = google_service_account.cluster_service_account[0].project
5151
role = "roles/logging.logWriter"
52-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
52+
member = google_service_account.cluster_service_account[0].member
5353
}
5454

5555
resource "google_project_iam_member" "cluster_service_account-metric_writer" {
5656
count = var.create_service_account ? 1 : 0
5757
project = google_project_iam_member.cluster_service_account-log_writer[0].project
5858
role = "roles/monitoring.metricWriter"
59-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
59+
member = google_service_account.cluster_service_account[0].member
6060
}
6161

6262
resource "google_project_iam_member" "cluster_service_account-monitoring_viewer" {
6363
count = var.create_service_account ? 1 : 0
6464
project = google_project_iam_member.cluster_service_account-metric_writer[0].project
6565
role = "roles/monitoring.viewer"
66-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
66+
member = google_service_account.cluster_service_account[0].member
6767
}
6868

6969
resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
7070
count = var.create_service_account ? 1 : 0
7171
project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
7272
role = "roles/stackdriver.resourceMetadata.writer"
73-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
73+
member = google_service_account.cluster_service_account[0].member
7474
}
7575

7676
resource "google_project_iam_member" "cluster_service_account-gcr" {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,28 +49,28 @@ resource "google_project_iam_member" "cluster_service_account-log_writer" {
4949
count = var.create_service_account ? 1 : 0
5050
project = google_service_account.cluster_service_account[0].project
5151
role = "roles/logging.logWriter"
52-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
52+
member = google_service_account.cluster_service_account[0].member
5353
}
5454

5555
resource "google_project_iam_member" "cluster_service_account-metric_writer" {
5656
count = var.create_service_account ? 1 : 0
5757
project = google_project_iam_member.cluster_service_account-log_writer[0].project
5858
role = "roles/monitoring.metricWriter"
59-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
59+
member = google_service_account.cluster_service_account[0].member
6060
}
6161

6262
resource "google_project_iam_member" "cluster_service_account-monitoring_viewer" {
6363
count = var.create_service_account ? 1 : 0
6464
project = google_project_iam_member.cluster_service_account-metric_writer[0].project
6565
role = "roles/monitoring.viewer"
66-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
66+
member = google_service_account.cluster_service_account[0].member
6767
}
6868

6969
resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
7070
count = var.create_service_account ? 1 : 0
7171
project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
7272
role = "roles/stackdriver.resourceMetadata.writer"
73-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
73+
member = google_service_account.cluster_service_account[0].member
7474
}
7575

7676
resource "google_project_iam_member" "cluster_service_account-gcr" {

‎modules/beta-private-cluster-update-variant/sa.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,28 +49,28 @@ resource "google_project_iam_member" "cluster_service_account-log_writer" {
4949
count = var.create_service_account ? 1 : 0
5050
project = google_service_account.cluster_service_account[0].project
5151
role = "roles/logging.logWriter"
52-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
52+
member = google_service_account.cluster_service_account[0].member
5353
}
5454

5555
resource "google_project_iam_member" "cluster_service_account-metric_writer" {
5656
count = var.create_service_account ? 1 : 0
5757
project = google_project_iam_member.cluster_service_account-log_writer[0].project
5858
role = "roles/monitoring.metricWriter"
59-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
59+
member = google_service_account.cluster_service_account[0].member
6060
}
6161

6262
resource "google_project_iam_member" "cluster_service_account-monitoring_viewer" {
6363
count = var.create_service_account ? 1 : 0
6464
project = google_project_iam_member.cluster_service_account-metric_writer[0].project
6565
role = "roles/monitoring.viewer"
66-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
66+
member = google_service_account.cluster_service_account[0].member
6767
}
6868

6969
resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
7070
count = var.create_service_account ? 1 : 0
7171
project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
7272
role = "roles/stackdriver.resourceMetadata.writer"
73-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
73+
member = google_service_account.cluster_service_account[0].member
7474
}
7575

7676
resource "google_project_iam_member" "cluster_service_account-gcr" {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,28 +49,28 @@ resource "google_project_iam_member" "cluster_service_account-log_writer" {
4949
count = var.create_service_account ? 1 : 0
5050
project = google_service_account.cluster_service_account[0].project
5151
role = "roles/logging.logWriter"
52-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
52+
member = google_service_account.cluster_service_account[0].member
5353
}
5454

5555
resource "google_project_iam_member" "cluster_service_account-metric_writer" {
5656
count = var.create_service_account ? 1 : 0
5757
project = google_project_iam_member.cluster_service_account-log_writer[0].project
5858
role = "roles/monitoring.metricWriter"
59-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
59+
member = google_service_account.cluster_service_account[0].member
6060
}
6161

6262
resource "google_project_iam_member" "cluster_service_account-monitoring_viewer" {
6363
count = var.create_service_account ? 1 : 0
6464
project = google_project_iam_member.cluster_service_account-metric_writer[0].project
6565
role = "roles/monitoring.viewer"
66-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
66+
member = google_service_account.cluster_service_account[0].member
6767
}
6868

6969
resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
7070
count = var.create_service_account ? 1 : 0
7171
project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
7272
role = "roles/stackdriver.resourceMetadata.writer"
73-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
73+
member = google_service_account.cluster_service_account[0].member
7474
}
7575

7676
resource "google_project_iam_member" "cluster_service_account-gcr" {

‎modules/beta-public-cluster-update-variant/sa.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,28 +49,28 @@ resource "google_project_iam_member" "cluster_service_account-log_writer" {
4949
count = var.create_service_account ? 1 : 0
5050
project = google_service_account.cluster_service_account[0].project
5151
role = "roles/logging.logWriter"
52-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
52+
member = google_service_account.cluster_service_account[0].member
5353
}
5454

5555
resource "google_project_iam_member" "cluster_service_account-metric_writer" {
5656
count = var.create_service_account ? 1 : 0
5757
project = google_project_iam_member.cluster_service_account-log_writer[0].project
5858
role = "roles/monitoring.metricWriter"
59-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
59+
member = google_service_account.cluster_service_account[0].member
6060
}
6161

6262
resource "google_project_iam_member" "cluster_service_account-monitoring_viewer" {
6363
count = var.create_service_account ? 1 : 0
6464
project = google_project_iam_member.cluster_service_account-metric_writer[0].project
6565
role = "roles/monitoring.viewer"
66-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
66+
member = google_service_account.cluster_service_account[0].member
6767
}
6868

6969
resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
7070
count = var.create_service_account ? 1 : 0
7171
project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
7272
role = "roles/stackdriver.resourceMetadata.writer"
73-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
73+
member = google_service_account.cluster_service_account[0].member
7474
}
7575

7676
resource "google_project_iam_member" "cluster_service_account-gcr" {

‎modules/beta-public-cluster/sa.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,28 +49,28 @@ resource "google_project_iam_member" "cluster_service_account-log_writer" {
4949
count = var.create_service_account ? 1 : 0
5050
project = google_service_account.cluster_service_account[0].project
5151
role = "roles/logging.logWriter"
52-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
52+
member = google_service_account.cluster_service_account[0].member
5353
}
5454

5555
resource "google_project_iam_member" "cluster_service_account-metric_writer" {
5656
count = var.create_service_account ? 1 : 0
5757
project = google_project_iam_member.cluster_service_account-log_writer[0].project
5858
role = "roles/monitoring.metricWriter"
59-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
59+
member = google_service_account.cluster_service_account[0].member
6060
}
6161

6262
resource "google_project_iam_member" "cluster_service_account-monitoring_viewer" {
6363
count = var.create_service_account ? 1 : 0
6464
project = google_project_iam_member.cluster_service_account-metric_writer[0].project
6565
role = "roles/monitoring.viewer"
66-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
66+
member = google_service_account.cluster_service_account[0].member
6767
}
6868

6969
resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
7070
count = var.create_service_account ? 1 : 0
7171
project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
7272
role = "roles/stackdriver.resourceMetadata.writer"
73-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
73+
member = google_service_account.cluster_service_account[0].member
7474
}
7575

7676
resource "google_project_iam_member" "cluster_service_account-gcr" {

‎modules/private-cluster-update-variant/sa.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,28 +49,28 @@ resource "google_project_iam_member" "cluster_service_account-log_writer" {
4949
count = var.create_service_account ? 1 : 0
5050
project = google_service_account.cluster_service_account[0].project
5151
role = "roles/logging.logWriter"
52-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
52+
member = google_service_account.cluster_service_account[0].member
5353
}
5454

5555
resource "google_project_iam_member" "cluster_service_account-metric_writer" {
5656
count = var.create_service_account ? 1 : 0
5757
project = google_project_iam_member.cluster_service_account-log_writer[0].project
5858
role = "roles/monitoring.metricWriter"
59-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
59+
member = google_service_account.cluster_service_account[0].member
6060
}
6161

6262
resource "google_project_iam_member" "cluster_service_account-monitoring_viewer" {
6363
count = var.create_service_account ? 1 : 0
6464
project = google_project_iam_member.cluster_service_account-metric_writer[0].project
6565
role = "roles/monitoring.viewer"
66-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
66+
member = google_service_account.cluster_service_account[0].member
6767
}
6868

6969
resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
7070
count = var.create_service_account ? 1 : 0
7171
project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
7272
role = "roles/stackdriver.resourceMetadata.writer"
73-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
73+
member = google_service_account.cluster_service_account[0].member
7474
}
7575

7676
resource "google_project_iam_member" "cluster_service_account-gcr" {

‎modules/private-cluster/sa.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,28 +49,28 @@ resource "google_project_iam_member" "cluster_service_account-log_writer" {
4949
count = var.create_service_account ? 1 : 0
5050
project = google_service_account.cluster_service_account[0].project
5151
role = "roles/logging.logWriter"
52-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
52+
member = google_service_account.cluster_service_account[0].member
5353
}
5454

5555
resource "google_project_iam_member" "cluster_service_account-metric_writer" {
5656
count = var.create_service_account ? 1 : 0
5757
project = google_project_iam_member.cluster_service_account-log_writer[0].project
5858
role = "roles/monitoring.metricWriter"
59-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
59+
member = google_service_account.cluster_service_account[0].member
6060
}
6161

6262
resource "google_project_iam_member" "cluster_service_account-monitoring_viewer" {
6363
count = var.create_service_account ? 1 : 0
6464
project = google_project_iam_member.cluster_service_account-metric_writer[0].project
6565
role = "roles/monitoring.viewer"
66-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
66+
member = google_service_account.cluster_service_account[0].member
6767
}
6868

6969
resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
7070
count = var.create_service_account ? 1 : 0
7171
project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
7272
role = "roles/stackdriver.resourceMetadata.writer"
73-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
73+
member = google_service_account.cluster_service_account[0].member
7474
}
7575

7676
resource "google_project_iam_member" "cluster_service_account-gcr" {

‎sa.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,28 +49,28 @@ resource "google_project_iam_member" "cluster_service_account-log_writer" {
4949
count = var.create_service_account ? 1 : 0
5050
project = google_service_account.cluster_service_account[0].project
5151
role = "roles/logging.logWriter"
52-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
52+
member = google_service_account.cluster_service_account[0].member
5353
}
5454

5555
resource "google_project_iam_member" "cluster_service_account-metric_writer" {
5656
count = var.create_service_account ? 1 : 0
5757
project = google_project_iam_member.cluster_service_account-log_writer[0].project
5858
role = "roles/monitoring.metricWriter"
59-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
59+
member = google_service_account.cluster_service_account[0].member
6060
}
6161

6262
resource "google_project_iam_member" "cluster_service_account-monitoring_viewer" {
6363
count = var.create_service_account ? 1 : 0
6464
project = google_project_iam_member.cluster_service_account-metric_writer[0].project
6565
role = "roles/monitoring.viewer"
66-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
66+
member = google_service_account.cluster_service_account[0].member
6767
}
6868

6969
resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
7070
count = var.create_service_account ? 1 : 0
7171
project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
7272
role = "roles/stackdriver.resourceMetadata.writer"
73-
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
73+
member = google_service_account.cluster_service_account[0].member
7474
}
7575

7676
resource "google_project_iam_member" "cluster_service_account-gcr" {

0 commit comments

Comments
 (0)