Fix/merge conflict testnet prod resolution (#4918)

* fix: maticjs version * fix: migrate state to new backend (#4901) * fix: migrate state to new backend * fix: staging state migration + fixes --------- Co-authored-by: Rahul Sethuram <[email protected]> * fix: prod state migrations (#4903) * Fix/migrate state prod core (#4904) * fix: prod state migrations * fix: missing config * Fix/ci fix - remove flow control (#4910) * fix: remove ci stop check * fix: remove continue-on-error * Fix/tf version bump (#4914) * fix: bump tf version and fix warning * fix: terraform version bump --------- Co-authored-by: Rahul Sethuram <[email protected]>
connext · Sep 19, 2023 · ae822fe · ae822fe
1 parent c8a0368
commit ae822fe
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
@@ -950,7 +950,7 @@ jobs:
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v1
         with:
-          terraform_version: 1.1.7
+          terraform_version: 1.5.7
 
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -990,7 +990,7 @@ jobs:
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v1
         with:
-          terraform_version: 1.1.7
+          terraform_version: 1.5.7
 
       - name: Setup Sops
         uses: mdgreenwald/[email protected]
@@ -1054,7 +1054,7 @@ jobs:
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v1
         with:
-          terraform_version: 1.1.7
+          terraform_version: 1.5.7
 
       - name: Setup Sops
         uses: mdgreenwald/[email protected]
@@ -1128,7 +1128,7 @@ jobs:
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v1
         with:
-          terraform_version: 1.1.7
+          terraform_version: 1.5.7
 
       - name: Setup Sops
         uses: mdgreenwald/[email protected]
@@ -1196,7 +1196,7 @@ jobs:
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v1
         with:
-          terraform_version: 1.1.7
+          terraform_version: 1.5.7
 
       - name: Setup Sops
         uses: mdgreenwald/[email protected]
@@ -1264,7 +1264,7 @@ jobs:
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v1
         with:
-          terraform_version: 1.1.7
+          terraform_version: 1.5.7
 
       - name: Setup Sops
         uses: mdgreenwald/[email protected]
@@ -1327,7 +1327,7 @@ jobs:
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v1
         with:
-          terraform_version: 1.1.7
+          terraform_version: 1.5.7
 
       - name: Setup Sops
         uses: mdgreenwald/[email protected]

diff --git a/ops/infra/.terraform-version b/ops/infra/.terraform-version
@@ -1 +1 @@
-1.1.7
+1.5.7
diff --git a/ops/mainnet/prod/backend/.terraform-version b/ops/mainnet/prod/backend/.terraform-version
@@ -1 +1 @@
-1.1.7
+1.5.7
diff --git a/ops/mainnet/prod/core/.terraform-version b/ops/mainnet/prod/core/.terraform-version
@@ -1 +1 @@
-1.1.7
+1.5.7
diff --git a/ops/modules/networking/main.tf b/ops/modules/networking/main.tf
@@ -1,7 +1,7 @@
 data "aws_availability_zones" "available" {}
 
 resource "aws_vpc" "main" {
-  cidr_block = var.cidr_block
+  cidr_block           = var.cidr_block
   enable_dns_hostnames = true
   tags = {
     Environment = var.environment
@@ -47,7 +47,7 @@ resource "aws_route" "internet_access" {
 #Create a NAT gateway with an EIP for each private subnet to get internet connectivity
 resource "aws_eip" "gw" {
   count      = var.az_count
-  vpc        = true
+  domain     = "vpc"
   depends_on = [aws_internet_gateway.main]
 }
 

diff --git a/ops/testnet/prod/backend/.terraform-version b/ops/testnet/prod/backend/.terraform-version
@@ -1 +1 @@
-1.1.7
+1.5.7
diff --git a/ops/testnet/prod/core/.terraform-version b/ops/testnet/prod/core/.terraform-version
@@ -1 +1 @@
-1.1.7
+1.5.7
diff --git a/ops/testnet/staging/backend/.terraform-version b/ops/testnet/staging/backend/.terraform-version
@@ -1 +1 @@
-1.1.7
+1.5.7
diff --git a/ops/testnet/staging/core/.terraform-version b/ops/testnet/staging/core/.terraform-version
@@ -1 +1 @@
-1.1.7
+1.5.7