Merge remote-tracking branch 'origin/develop' into HZA-419-Modify-HUB…

…Zone-map-API-to-accept-lat-long-parameters
USSBA · Apr 29, 2024 · dc19cfc · dc19cfc
2 parents f80ef24 + 72cbed5
commit dc19cfc
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 27 deletions.
diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml
@@ -28,16 +28,16 @@ jobs:
     environment: 'demo'
     steps:
       - name: 'Checkout'
-        uses: 'actions/checkout@v3'
+        uses: 'actions/checkout@v4'
 
       - name: 'Connecting to AWS using OIDC'
-        uses: 'aws-actions/configure-aws-credentials@v2'
+        uses: 'aws-actions/configure-aws-credentials@v4'
         with:
           role-to-assume: ${{ secrets.OIDC_ROLE_ARN }}
           aws-region: ${{ env.AWS_REGION }}
 
       - name: 'Connecting to ECR'
-        uses: 'aws-actions/amazon-ecr-login@v1'
+        uses: 'aws-actions/amazon-ecr-login@v2'
         id: 'ecr-login'
         with:
           registries: ${{ env.AWS_ECR_REGISTRY_ID }}
@@ -47,10 +47,10 @@ jobs:
         with:
           image: '${{ steps.ecr-login.outputs.registry }}/hubzone-api'
 
-      - name: 'Install Terraform 1.5.2'
-        uses: 'hashicorp/setup-terraform@v2'
+      - name: 'Install Terraform 1.6.1'
+        uses: 'hashicorp/setup-terraform@v3'
         with:
-          terraform_version: '1.5.2'
+          terraform_version: '1.6.1'
 
       - name: 'Deploying Service'
         uses: './.github/actions/terraform'

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: 'ubuntu-latest'
     steps:
       - name: 'Checkout'
-        uses: 'actions/checkout@v3'
+        uses: 'actions/checkout@v4'
 
       # https://github.com/ruby/setup-ruby
       - name: 'Configure Ruby'
@@ -58,7 +58,7 @@ jobs:
           --health-retries 5
     steps:
       - name: 'Checkout'
-        uses: 'actions/checkout@v3'
+        uses: 'actions/checkout@v4'
 
       # https://github.com/ruby/setup-ruby
       - name: 'Configure Ruby'
@@ -78,7 +78,7 @@ jobs:
     runs-on: 'ubuntu-latest'
     steps:
       - name: 'Checkout'
-        uses: 'actions/checkout@v3'
+        uses: 'actions/checkout@v4'
 
       - name: 'RSpec Docker Compose'
         run: |
@@ -91,12 +91,12 @@ jobs:
     runs-on: 'ubuntu-latest'
     steps:
       - name: 'Checkout'
-        uses: 'actions/checkout@v3'
+        uses: 'actions/checkout@v4'
 
-      - name: 'Install Terraform 1.5.2'
-        uses: 'hashicorp/setup-terraform@v2'
+      - name: 'Install Terraform 1.6.1'
+        uses: 'hashicorp/setup-terraform@v3'
         with:
-          terraform_version: '1.5.2'
+          terraform_version: '1.6.1'
 
       - name: 'Terraform Format'
         run: |
@@ -121,7 +121,7 @@ jobs:
     runs-on: 'ubuntu-latest'
     steps:
       - name: 'Checkout'
-        uses: 'actions/checkout@v3'
+        uses: 'actions/checkout@v4'
 
       - name: 'Build'
         run: |

diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml
@@ -26,16 +26,16 @@ jobs:
     environment: 'prod'
     steps:
       - name: 'Checkout'
-        uses: 'actions/checkout@v3'
+        uses: 'actions/checkout@v4'
 
       - name: 'Connecting to AWS using OIDC'
-        uses: 'aws-actions/configure-aws-credentials@v2'
+        uses: 'aws-actions/configure-aws-credentials@v4'
         with:
           role-to-assume: ${{ secrets.OIDC_ROLE_ARN }}
           aws-region: ${{ env.AWS_REGION }}
 
       - name: 'Connecting to ECR'
-        uses: 'aws-actions/amazon-ecr-login@v1'
+        uses: 'aws-actions/amazon-ecr-login@v2'
         id: 'ecr-login'
         with:
           registries: ${{ env.AWS_ECR_REGISTRY_ID }}
@@ -45,10 +45,10 @@ jobs:
         with:
           image: '${{ steps.ecr-login.outputs.registry }}/hubzone-api'
 
-      - name: 'Install Terraform 1.5.2'
-        uses: 'hashicorp/setup-terraform@v2'
+      - name: 'Install Terraform 1.6.1'
+        uses: 'hashicorp/setup-terraform@v3'
         with:
-          terraform_version: '1.5.2'
+          terraform_version: '1.6.1'
 
       - name: 'Deploying Service'
         uses: './.github/actions/terraform'

diff --git a/.github/workflows/stg.yml b/.github/workflows/stg.yml
@@ -26,16 +26,16 @@ jobs:
     environment: 'stg'
     steps:
       - name: 'Checkout'
-        uses: 'actions/checkout@v3'
+        uses: 'actions/checkout@v4'
 
       - name: 'Connecting to AWS using OIDC'
-        uses: 'aws-actions/configure-aws-credentials@v2'
+        uses: 'aws-actions/configure-aws-credentials@v4'
         with:
           role-to-assume: ${{ secrets.OIDC_ROLE_ARN }}
           aws-region: ${{ env.AWS_REGION }}
 
       - name: 'Connecting to ECR'
-        uses: 'aws-actions/amazon-ecr-login@v1'
+        uses: 'aws-actions/amazon-ecr-login@v2'
         id: 'ecr-login'
         with:
           registries: ${{ env.AWS_ECR_REGISTRY_ID }}
@@ -45,10 +45,10 @@ jobs:
         with:
           image: '${{ steps.ecr-login.outputs.registry }}/hubzone-api'
 
-      - name: 'Install Terraform 1.5.2'
-        uses: 'hashicorp/setup-terraform@v2'
+      - name: 'Install Terraform 1.6.1'
+        uses: 'hashicorp/setup-terraform@v3'
         with:
-          terraform_version: '1.5.2'
+          terraform_version: '1.6.1'
 
       - name: 'Deploying Service'
         uses: './.github/actions/terraform'

diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,5 @@ REVISION
 
 # Terraform
 **/.terraform*
+
+!**/.terraform.lock.hcl
diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl
diff --git a/terraform/versions.tf b/terraform/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.5"
+  required_version = "1.6.1"
   required_providers {
     aws = {
       version = "~> 5.0"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,3 +30,5 @@ REVISION

		# Terraform
		*/.terraform

		!**/.terraform.lock.hcl