This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2551
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-2551 by this push:
new 216261925 [DATALAB-2551]: fixed some arguments
216261925 is described below
commit 21626192583a0acef08fe2f384ec9563c5a5eca0
Author: leonidfrolov <[email protected]>
AuthorDate: Wed May 18 15:39:44 2022 +0300
[DATALAB-2551]: fixed some arguments
---
infrastructure-provisioning/terraform/gcp/endpoint/main/bucket.tf | 1 +
infrastructure-provisioning/terraform/gcp/endpoint/main/iam.tf | 1 +
infrastructure-provisioning/terraform/gcp/modules/common/iam.tf | 1 +
3 files changed, 3 insertions(+)
diff --git a/infrastructure-provisioning/terraform/gcp/endpoint/main/bucket.tf
b/infrastructure-provisioning/terraform/gcp/endpoint/main/bucket.tf
index 9551d656e..2328deba2 100644
--- a/infrastructure-provisioning/terraform/gcp/endpoint/main/bucket.tf
+++ b/infrastructure-provisioning/terraform/gcp/endpoint/main/bucket.tf
@@ -27,6 +27,7 @@
resource "google_storage_bucket" "shared_bucket" {
name = local.shared_bucket_name
force_destroy = true
+ location = var.region
labels = {
name = local.shared_bucket_name
"${local.additional_tag[0]}" = local.additional_tag[1]
diff --git a/infrastructure-provisioning/terraform/gcp/endpoint/main/iam.tf
b/infrastructure-provisioning/terraform/gcp/endpoint/main/iam.tf
index eda7eb5be..d1924006c 100644
--- a/infrastructure-provisioning/terraform/gcp/endpoint/main/iam.tf
+++ b/infrastructure-provisioning/terraform/gcp/endpoint/main/iam.tf
@@ -38,6 +38,7 @@ resource "google_project_iam_custom_role" "endpoint_role" {
resource "google_project_iam_member" "iam" {
# try to set perms as file
+ project = var.gcp_project_id
count = length(var.endpoint_roles)
member = "serviceAccount:${google_service_account.endpoint_sa.email}"
role = element(var.endpoint_roles, count.index)
diff --git a/infrastructure-provisioning/terraform/gcp/modules/common/iam.tf
b/infrastructure-provisioning/terraform/gcp/modules/common/iam.tf
index d409a3422..de1ca59f3 100644
--- a/infrastructure-provisioning/terraform/gcp/modules/common/iam.tf
+++ b/infrastructure-provisioning/terraform/gcp/modules/common/iam.tf
@@ -45,6 +45,7 @@ resource "google_project_iam_custom_role" "ps-custom-role" {
resource "google_project_iam_member" "role_for_member" {
#Grant the custom role for the ps_sa
+ project = var.gcp_project_id
member = "serviceAccount:${google_service_account.ps_sa.email}"
role = "${google_project_iam_custom_role.ps-custom-role.id}"
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
