SA name in source code

Author: max-ostapenko

.github/workflows/deployment.yaml

@@ -8,8 +8,6 @@ on:
 
 env:
   PIPELINE_SA_KEY: ${{ secrets.GCP_SA_KEY }}
-  PIPELINE_GOOGLE_SERVICE_ACCOUNT_CLOUD_FUNCTIONS: ${{ secrets.GCP_SERVICE_ACCOUNT_CLOUD_FUNCTIONS }}
-  PIPELINE_GOOGLE_SERVICE_ACCOUNT_API_GATEWAY: ${{ secrets.GCP_SERVICE_ACCOUNT_API_GATEWAY }}
 
 jobs:
   test:
@@ -54,8 +52,7 @@ jobs:
       - name: Terraform Plan
         id: plan
         run: |
-          terraform plan -no-color -var="google_service_account_cloud_functions=${{ env.PIPELINE_GOOGLE_SERVICE_ACCOUNT_CLOUD_FUNCTIONS }}" \
-                                   -var="google_service_account_api_gateway=${{ env.PIPELINE_GOOGLE_SERVICE_ACCOUNT_API_GATEWAY }}"
+          terraform plan -no-color
         continue-on-error: true
 
       - name: Terraform Plan status
@@ -65,9 +62,7 @@ jobs:
       - name: Terraform Apply
         id: apply
         run: |
-          terraform apply -var="google_service_account_cloud_functions=${{ env.PIPELINE_GOOGLE_SERVICE_ACCOUNT_CLOUD_FUNCTIONS }}" \
-                          -var="google_service_account_api_gateway=${{ env.PIPELINE_GOOGLE_SERVICE_ACCOUNT_API_GATEWAY }}" \
-                          -auto-approve
+          terraform apply -auto-approve
 
   deploy_production:
     if: github.ref == 'refs/heads/main'
@@ -102,8 +97,7 @@ jobs:
       - name: Terraform Plan
         id: plan
         run: |
-          terraform plan -no-color -var="google_service_account_cloud_functions=${{ env.PIPELINE_GOOGLE_SERVICE_ACCOUNT_CLOUD_FUNCTIONS }}" \
-                                    -var="google_service_account_api_gateway=${{ env.PIPELINE_GOOGLE_SERVICE_ACCOUNT_API_GATEWAY }}"
+          terraform plan -no-color
         continue-on-error: true
 
       - name: Terraform Plan status
@@ -113,6 +107,4 @@ jobs:
       - name: Terraform Apply
         id: apply
         run: |
-          terraform apply -var="google_service_account_cloud_functions=${{ env.PIPELINE_GOOGLE_SERVICE_ACCOUNT_CLOUD_FUNCTIONS }}" \
-                          -var="google_service_account_api_gateway=${{ env.PIPELINE_GOOGLE_SERVICE_ACCOUNT_API_GATEWAY }}" \
-                          -auto-approve
+          terraform apply -auto-approve

terraform/dev/variables.tf

@@ -17,16 +17,16 @@ variable "project_database" {
   description = "The database name"
   default     = "tech-report-api-prod" // TODO: Update this to the DEV database name
 }
-
 variable "google_service_account_cloud_functions" {
   type        = string
   description = "Service account for Cloud Functions"
+  default     = "[email protected]"
 }
 variable "google_service_account_api_gateway" {
   type        = string
   description = "Service account for API Gateway"
+  default     = "[email protected]"
 }
-
 variable "min_instances" {
   description = "(Optional) The limit on the minimum number of function instances that may coexist at a given time."
   type        = number

terraform/modules/api-gateway/variables.tf

@@ -14,21 +14,3 @@ variable "service_account_email" {
   description = "Email of the service account associated with and to run the API Gateway"
   type        = string
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

terraform/modules/service-account/main.tf

@@ -17,14 +17,15 @@ variable "project_database" {
   description = "The database name"
   default     = "tech-report-api-prod"
 }
-
 variable "google_service_account_cloud_functions" {
   type        = string
   description = "Service account for Cloud Functions"
+  default     = "[email protected]"
 }
 variable "google_service_account_api_gateway" {
   type        = string
   description = "Service account for API Gateway"
+  default     = "[email protected]"
 }
 variable "min_instances" {
   description = "(Optional) The limit on the minimum number of function instances that may coexist at a given time."