Merge pull request #997 from AlexsLemonade/dev

Production Deploy
AlexsLemonade · Nov 22, 2024 · 79dc821 · 79dc821
2 parents e8ce28b + beb19d5
commit 79dc821
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/.github/workflows/deploy_prod_backend.yml b/.github/workflows/deploy_prod_backend.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v3
         with:
-          terraform_version: 0.13.0
+          terraform_version: 0.14.0
 
       - name: Deploy
         run: cd infrastructure && python3 deploy.py -e prod -u deployer -d ccdl -v $(git rev-parse HEAD)

diff --git a/.github/workflows/deploy_staging_backend.yml b/.github/workflows/deploy_staging_backend.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v3
         with:
-          terraform_version: 0.13.0
+          terraform_version: 0.14.0
 
       - name: Deploy
         run: cd infrastructure && python3 deploy.py -e staging -u deployer -d ccdlstaging -v $(git rev-parse HEAD)

diff --git a/infrastructure/deploy.py b/infrastructure/deploy.py
@@ -8,7 +8,6 @@
 import time
 
 from init_terraform import init_terraform
-from replace_provider import replace_provider
 
 PRIVATE_KEY_FILE_PATH = "scpca-portal-key.pem"
 PUBLIC_KEY_FILE_PATH = "scpca-portal-key.pub"
@@ -241,17 +240,12 @@ def restart_api_if_still_running(args, api_ip_address):
     if init_code != 0:
         exit(init_code)
 
-    replace_provider_code = replace_provider("hashicorp", "aws")
-
-    if replace_provider_code != 0:
-        exit(replace_provider_code)
-
     terraform_code, terraform_output = run_terraform(args)
     if terraform_code != 0:
         exit(terraform_code)
 
     ip_address_match = re.match(
-        r".*\napi_server_1_ip = (\d+\.\d+\.\d+\.\d+)\n.*", terraform_output, re.DOTALL
+        r".*\napi_server_1_ip = \"(\d+\.\d+\.\d+\.\d+)\"\n.*", terraform_output, re.DOTALL
     )
 
     if ip_address_match:

diff --git a/infrastructure/provider.tf b/infrastructure/provider.tf
@@ -6,7 +6,7 @@ terraform {
 #      version = "~> 5.0.0"
     }
   }
-  required_version = "0.13.0"
+  required_version = "0.14.0"
 }
 
 provider "aws" {