From a7fd8b8a17c014a2eb56f3be34a5f78aed3c63fe Mon Sep 17 00:00:00 2001
From: Marcus Girolneto <marcus.girolneto@gmail.com>
Date: Tue, 3 Oct 2023 11:31:26 -0300
Subject: [PATCH] Fixing

---
 .github/workflows/deploy-testnet.yml | 34 +++++++++++++++-------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/deploy-testnet.yml b/.github/workflows/deploy-testnet.yml
index d078498..af0c2d3 100644
--- a/.github/workflows/deploy-testnet.yml
+++ b/.github/workflows/deploy-testnet.yml
@@ -24,7 +24,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_TESTNET }}
           AWS_REGION: ${{ secrets.AWS_REGION_TESTNET }}
         shell: bash
-        run: |          
+        run: |
           echo "EC2_INSTANCE_1_ID=$(aws ec2 describe-instances  --filters "Name=tag:Name,Values=DOR Metagraph - 1" | jq -r ".Reservations[0].Instances[0].InstanceId")" >> $GITHUB_ENV
           echo "EC2_INSTANCE_2_ID=$(aws ec2 describe-instances  --filters "Name=tag:Name,Values=DOR Metagraph - 2" | jq -r ".Reservations[0].Instances[0].InstanceId")" >> $GITHUB_ENV
           echo "EC2_INSTANCE_3_ID=$(aws ec2 describe-instances  --filters "Name=tag:Name,Values=DOR Metagraph - 3" | jq -r ".Reservations[0].Instances[0].InstanceId")" >> $GITHUB_ENV
@@ -36,21 +36,21 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_TESTNET }}
           AWS_REGION: ${{ secrets.AWS_REGION_TESTNET }}
         shell: bash
-        run: |          
-            aws ssm send-command \
-            --instance-id $EC2_INSTANCE_1_ID \
-            --document-name "AWS-RunShellScript" \
-            --parameters '{"commands":["if ! command -v aws &> /dev/null; then sudo apt-get update -y && sudo apt-get install -y awscli; fi"]}'
-
-            aws ssm send-command \
-            --instance-id $EC2_INSTANCE_2_ID \
-            --document-name "AWS-RunShellScript" \
-            --parameters '{"commands":["if ! command -v aws &> /dev/null; then sudo apt-get update -y && sudo apt-get install -y awscli; fi"]}'
+        run: |
+          aws ssm send-command \
+          --instance-id $EC2_INSTANCE_1_ID \
+          --document-name "AWS-RunShellScript" \
+          --parameters '{"commands":["if ! command -v aws &> /dev/null; then sudo apt-get update -y && sudo apt-get install -y awscli; fi"]}'
           
-            aws ssm send-command \
-            --instance-id $EC2_INSTANCE_3_ID \
-            --document-name "AWS-RunShellScript" \
-            --parameters '{"commands":["if ! command -v aws &> /dev/null; then sudo apt-get update -y && sudo apt-get install -y awscli; fi"]}'
+          aws ssm send-command \
+          --instance-id $EC2_INSTANCE_2_ID \
+          --document-name "AWS-RunShellScript" \
+          --parameters '{"commands":["if ! command -v aws &> /dev/null; then sudo apt-get update -y && sudo apt-get install -y awscli; fi"]}'
+          
+          aws ssm send-command \
+          --instance-id $EC2_INSTANCE_3_ID \
+          --document-name "AWS-RunShellScript" \
+          --parameters '{"commands":["if ! command -v aws &> /dev/null; then sudo apt-get update -y && sudo apt-get install -y awscli; fi"]}'
       - name: Validate S3 bucket
         shell: bash
         env:
@@ -122,7 +122,9 @@ jobs:
           AWS_REGION: ${{ secrets.AWS_REGION_TESTNET }}
           AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION_TESTNET }}
         run: |
+          METAGRAPH_L0_COMMAND="export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID && export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY && export AWS_DEFAULT_REGION=$AWS_DEFAULT_REGION && aws s3 cp s3://dor-metagraph-jars/metagraph-l0.jar /home/ubuntu/code/"
+          
           aws ssm send-command \
           --instance-id  $EC2_INSTANCE_1_ID \
           --document-name "AWS-RunShellScript" \
-          --parameters '{"commands":["aws s3 cp s3://dor-metagraph-jars/metagraph-l0.jar /home/ubuntu/code/"]}'
\ No newline at end of file
+          --parameters commands=["$METAGRAPH_L0_COMMAND"] \
\ No newline at end of file