From 0fcf13e842dcc015f5dd9cc2fdae991a9984913b Mon Sep 17 00:00:00 2001
From: Liam <liam.icheng.lai@gmail.com>
Date: Wed, 23 Aug 2023 17:48:36 +1000
Subject: [PATCH] upgrade terraform (#315)

Co-authored-by: Liam Lai <liam.lai@datameshgroup.com.au>
---
 .travis.yml                                 | 16 ++++++++--------
 cicd/devnet/start.sh                        |  2 +-
 cicd/devnet/terraform/main.tf               |  4 +---
 cicd/devnet/terraform/module/region/main.tf |  6 ++----
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 984a2e55af..a3d805d999 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ go_import_path: github.com/XinFinOrg/XDPoSChain
 on:
   branches:
     - master
-    - dev-upgrade 
+    - dev-upgrade
   tags: true
 
 env:
@@ -102,7 +102,7 @@ jobs:
       - docker build -t xinfinorg/xdposchain:$TRAVIS_TAG -f cicd/Dockerfile .
     script:
       - docker push xinfinorg/xdposchain:$TRAVIS_TAG
-    
+
   - stage: (Devnet) Build, and push images
     if: branch = dev-upgrade AND type = push AND tag IS blank
     services:
@@ -131,7 +131,7 @@ jobs:
         - terraform init $tf_init_cli_options
         - terraform validate $tf_validation_cli_options
         - terraform plan $tf_plan_cli_options
-  
+
   - stage: (Devnet) Terraform apply
     if: branch = dev-upgrade AND type = push AND tag IS blank
     dist: xenial
@@ -150,19 +150,19 @@ jobs:
       # Terraform init and then apply changes to environment
       - terraform init $tf_init_cli_options
       - terraform apply $tf_apply_cli_options
-      - sleep 20
+      - sleep 5
       - |
         source .env
         for ((i=$us_east_2_start;i<$us_east_2_end;i++)); do
           echo "Force deploy xdc-$i"
-          sleep 5 && aws ecs update-service --region us-east-2 --cluster devnet-xdcnode-cluster --service ecs-service-xdc$i --force-new-deployment;
+          aws ecs update-service --region us-east-2 --cluster devnet-xdcnode-cluster --service ecs-service-xdc$i --force-new-deployment --no-cli-pager;
         done
         for ((i=$eu_west_1_start;i<$eu_west_1_end;i++)); do
           echo "Force deploy xdc-$i"
-          sleep 5 && aws ecs update-service --region eu-west-1 --cluster devnet-xdcnode-cluster --service ecs-service-xdc$i --force-new-deployment;
+          aws ecs update-service --region eu-west-1 --cluster devnet-xdcnode-cluster --service ecs-service-xdc$i --force-new-deployment --no-cli-pager;
         done
         for ((i=$ap_southeast_2_start;i<$ap_southeast_2_end;i++)); do
           echo "Force deploy xdc-$i"
-          sleep 5 && aws ecs update-service --region ap-southeast-2 --cluster devnet-xdcnode-cluster --service ecs-service-xdc$i --force-new-deployment;
+          aws ecs update-service --region ap-southeast-2 --cluster devnet-xdcnode-cluster --service ecs-service-xdc$i --force-new-deployment --no-cli-pager;
         done
-        
+
diff --git a/cicd/devnet/start.sh b/cicd/devnet/start.sh
index 9ec87dd74f..e57f31f80d 100755
--- a/cicd/devnet/start.sh
+++ b/cicd/devnet/start.sh
@@ -60,7 +60,7 @@ XDC --ethstats ${netstats} --gcmode=full \
 --datadir /work/xdcchain --networkid 551 \
 -port 30303 --rpc --rpccorsdomain "*" --rpcaddr 0.0.0.0 \
 --rpcport 8545 \
---rpcapi admin,db,eth,debug,miner,net,shh,txpool,personal,web3,XDPoS \
+--rpcapi admin,db,eth,debug,net,shh,txpool,personal,web3,XDPoS \
 --rpcvhosts "*" --unlock "${wallet}" --password /work/.pwd --mine \
 --gasprice "1" --targetgaslimit "420000000" --verbosity ${log_level} \
 --periodicprofile --debugdatadir /work/xdcchain \
diff --git a/cicd/devnet/terraform/main.tf b/cicd/devnet/terraform/main.tf
index b5fc04f531..473901163c 100644
--- a/cicd/devnet/terraform/main.tf
+++ b/cicd/devnet/terraform/main.tf
@@ -2,11 +2,9 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.16"
+      version = "~> 5.13.1"
     }
   }
-
-  required_version = ">= 1.2.0"
 }
 
 # Default
diff --git a/cicd/devnet/terraform/module/region/main.tf b/cicd/devnet/terraform/module/region/main.tf
index 08c78c34ec..3079b17f23 100644
--- a/cicd/devnet/terraform/module/region/main.tf
+++ b/cicd/devnet/terraform/module/region/main.tf
@@ -2,18 +2,16 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.16"
+      version = "~> 5.13.1"
     }
   }
-
-  required_version = ">= 1.2.0"
 }
 
 resource "aws_vpc" "devnet_vpc" {
   cidr_block = "10.0.0.0/16"
   instance_tenancy = "default"
   enable_dns_hostnames = true
-  
+
   tags = {
     Name = "TfDevnetVpc"
   }