removing default application_environment (#106)

bcgov · Oct 1, 2024 · 3ab2f80 · 3ab2f80
1 parent 41b164b
commit 3ab2f80
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 32 deletions.
diff --git a/.github/workflows/build-full-environment.yml b/.github/workflows/build-full-environment.yml
@@ -29,5 +29,13 @@ jobs:
     secrets: inherit
     with:
       PROJECT_NAME: wfprev-war
-      TAG: ${{inputs.TAG}}
+      TAG: latest
       PROJECT_TYPE: client
+  terragrunt-deploy-dev:
+    uses: ./.github/workflows/terragrunt-deploy.yml
+    needs: [wfprev-ui]
+    with:
+      DEFAULT_APPLICATION_ENVIRONMENT: DEV
+      IMAGE_TAG: latest
+
+    secrets: inherit
diff --git a/.github/workflows/terragrunt-deploy.yml b/.github/workflows/terragrunt-deploy.yml
@@ -5,35 +5,35 @@ permissions:
   packages: write
 
 on:
-  workflow_dispatch:
+  workflow_call:
     inputs:
       DEFAULT_APPLICATION_ENVIRONMENT:
         required: true
-        type: choice
+        type: string
         options:
         - dev
         - test
         - prod
       IMAGE_TAG:
         required: true
         type: string
-      SCHEMA_NAME:
-        required: true
-        type: string
-        default: app_wf1_prev
-      CHANGELOG_NAME:
-        type: choice
-        options:
-          - none
-          - changelog_app_wf1_prev
-          - changelog_app_wf1_prev_proxy
-      TARGET_LIQUIBASE_TAG: 
-        required: false
-        type: string
-      IS_HOTFIX:
-        required: true
-        type: string
-        default: 'false'
+      # SCHEMA_NAME:
+      #   required: true
+      #   type: string
+      #   default: app_wf1_prev
+      # CHANGELOG_NAME:
+      #   type: string
+      #   options:
+      #     - none
+      #     - changelog_app_wf1_prev
+      #     - changelog_app_wf1_prev_proxy
+      # TARGET_LIQUIBASE_TAG: 
+      #   required: false
+      #   type: string
+      # IS_HOTFIX:
+      #   required: true
+      #   type: string
+      #   default: 'false'
 
 env:
   TF_VERSION: 1.8.5

diff --git a/terraform/ecs.tf b/terraform/ecs.tf
@@ -71,13 +71,9 @@ resource "aws_ecs_task_definition" "wfprev_server" {
         name  = "WEBADE_OAUTH2_CLIENT_ID"
         value = var.WEBADE_OAUTH2_REST_CLIENT_ID
       },
-        {
-          name  = "WEBADE-OAUTH2_TOKEN_URL",
-          value = var.WEBADE-OAUTH2_TOKEN_URL
-        },
       {
-        name = "DEFAULT_APPLICATION_ENVIRONMENT"
-        value = var.DEFAULT_APPLICATION_ENVIRONMENT
+        name  = "WEBADE-OAUTH2_TOKEN_URL",
+        value = var.WEBADE-OAUTH2_TOKEN_URL
       },
       {
         name = "WFPREV_DB_URL"

diff --git a/terraform/terragrunt.hcl b/terraform/terragrunt.hcl
@@ -34,7 +34,6 @@ WFPREV_API_IMAGE = "${get_env("WFPREV_API_IMAGE")}"
 WFPREV_API_CPU_UNITS = "${get_env("WFPREV_API_CPU_UNITS")}"
 WFPREV_API_MEMORY = "${get_env("WFPREV_API_MEMORY")}"
 WFPREV_API_PORT = "${get_env("WFPREV_API_PORT")}"
-DEFAULT_APPLICATION_ENVIRONMENT = "${get_env("DEFAULT_APPLICATION_ENVIRONMENT")}"
 
 TARGET_AWS_ACCOUNT_ID = "${get_env("TARGET_AWS_ACCOUNT_ID")}"
 

diff --git a/terraform/variables.tf b/terraform/variables.tf
@@ -88,11 +88,6 @@ variable "WEBADE-OAUTH2_TOKEN_URL" {
   default = ""
 }
 
-variable "DEFAULT_APPLICATION_ENVIRONMENT" {
-  type    = string
-  default = ""
-}
-
 variable "WFPREV_USERNAME" {
   type    = string
   default = ""