fix iam

Author: max-ostapenko

terraform/dev/main.tf

@@ -19,8 +19,8 @@ provider "google" {
 }
 
 provider "google-beta" {
-  project         = var.project
-  region          = var.region
+  project = var.project
+  region  = var.region
 }
 
 # Get current Google Cloud access token
@@ -36,12 +36,12 @@ provider "docker" {
 }
 
 module "gateway" {
-  source                      = "./../modules/api-gateway"
-  project                     = var.project
-  environment                 = var.environment
-  region                      = var.region
-  service_account_email       = var.google_service_account_api_gateway
-  spec_yaml                   = <<EOF
+  source                = "./../modules/api-gateway"
+  project               = var.project
+  environment           = var.environment
+  region                = var.region
+  service_account_email = var.google_service_account_api_gateway
+  spec_yaml             = <<EOF
 swagger: "2.0"
 info:
   title: reports_api_config_dev
@@ -148,15 +148,15 @@ module "endpoints" {
 
 moved {
   from = google_api_gateway_api.api
-  to = module.gateway.google_api_gateway_api.api
+  to   = module.gateway.google_api_gateway_api.api
 }
 
 moved {
   from = google_api_gateway_api_config.api_config
-  to = module.gateway.google_api_gateway_api_config.api_config
+  to   = module.gateway.google_api_gateway_api_config.api_config
 }
 
 moved {
   from = google_api_gateway_gateway.gateway
-  to = module.gateway.google_api_gateway_gateway.gateway
+  to   = module.gateway.google_api_gateway_gateway.gateway
 }

terraform/modules/api-gateway/variables.tf

@@ -1,7 +1,7 @@
 variable "environment" {
   description = "The 'Environment' that is being created/deployed. Applied as a suffix to many resources."
   type        = string
-  default = "dev"
+  default     = "dev"
 }
 variable "project" {
   description = "The ID of the project in which the resource belongs. If it is not provided, the provider project is used."

terraform/modules/run-service/main.tf

@@ -54,14 +54,6 @@ resource "google_cloud_run_v2_service" "service" {
   }
 }
 
-resource "google_cloudfunctions2_function_iam_member" "variable_service_account_function_invoker" {
-  project        = google_cloud_run_v2_service.service.project
-  location       = google_cloud_run_v2_service.service.location
-  cloud_function = google_cloud_run_v2_service.service.name
-  role           = "roles/cloudfunctions.invoker"
-  member         = "serviceAccount:${var.service_account_email}"
-}
-
 resource "google_cloud_run_v2_service_iam_member" "variable_service_account_run_invoker" {
   project  = var.project
   location = var.region
@@ -70,14 +62,6 @@ resource "google_cloud_run_v2_service_iam_member" "variable_service_account_run_
   member   = "serviceAccount:${var.service_account_email}"
 }
 
-resource "google_cloudfunctions2_function_iam_member" "api_gw_variable_service_account_function_invoker" {
-  project        = google_cloud_run_v2_service.service.project
-  location       = google_cloud_run_v2_service.service.location
-  cloud_function = google_cloud_run_v2_service.service.name
-  role           = "roles/cloudfunctions.invoker"
-  member         = "serviceAccount:${var.service_account_api_gateway}"
-}
-
 resource "google_cloud_run_v2_service_iam_member" "api_gw_variable_service_account_run_invoker" {
   project  = var.project
   location = var.region

terraform/prod/main.tf

@@ -18,8 +18,8 @@ provider "google" {
 }
 
 provider "google-beta" {
-  project         = var.project
-  region          = var.region
+  project = var.project
+  region  = var.region
 }
 
 
@@ -38,12 +38,12 @@ provider "docker" {
 
 
 module "gateway" {
-  source                      = "./../modules/api-gateway"
-  project                     = var.project
-  environment                 = var.environment
-  region                      = var.region
-  service_account_email       = var.google_service_account_api_gateway
-  spec_yaml                   = <<EOF
+  source                = "./../modules/api-gateway"
+  project               = var.project
+  environment           = var.environment
+  region                = var.region
+  service_account_email = var.google_service_account_api_gateway
+  spec_yaml             = <<EOF
 swagger: "2.0"
 info:
   title: reports_api_config_prod
@@ -144,15 +144,15 @@ module "endpoints" {
 
 moved {
   from = google_api_gateway_api.api
-  to = module.gateway.google_api_gateway_api.api
+  to   = module.gateway.google_api_gateway_api.api
 }
 
 moved {
   from = google_api_gateway_api_config.api_config
-  to = module.gateway.google_api_gateway_api_config.api_config
+  to   = module.gateway.google_api_gateway_api_config.api_config
 }
 
 moved {
   from = google_api_gateway_gateway.gateway
-  to = module.gateway.google_api_gateway_gateway.gateway
+  to   = module.gateway.google_api_gateway_gateway.gateway
 }