fix

ten-protocol · Aug 26, 2024 · 37565ab · 37565ab
1 parent dadf14e
commit 37565ab
Showing 1 changed file with 18 additions and 20 deletions.
diff --git a/.github/workflows/manual-deploy-obscuro-gateway.yml b/.github/workflows/manual-deploy-obscuro-gateway.yml
@@ -69,27 +69,25 @@ jobs:
           echo "VNET_NAME=$VNET_NAME" >> $GITHUB_ENV
           echo "SUBNET_NAME=$SUBNET_NAME" >> $GITHUB_ENV
           
-          # Set instance-specific variables by constructing the full key before accessing vars
-          DOCKER_BUILD_TAG_KEY="${INSTANCE_PREFIX}DOCKER_BUILD_TAG_GATEWAY"
-          AZURE_DEPLOY_GROUP_KEY="${INSTANCE_PREFIX}AZURE_DEPLOY_GROUP_GATEWAY"
-          L2_RPC_URL_KEY="${INSTANCE_PREFIX}L2_RPC_URL_VALIDATOR"
-          GATEWAY_RATE_LIMIT_USER_COMPUTE_TIME_KEY="${INSTANCE_PREFIX}GATEWAY_RATE_LIMIT_USER_COMPUTE_TIME"
-          GATEWAY_RATE_LIMIT_WINDOW_KEY="${INSTANCE_PREFIX}GATEWAY_RATE_LIMIT_WINDOW"
-          GATEWAY_MAX_CONCURRENT_REQUESTS_KEY="${INSTANCE_PREFIX}GATEWAY_MAX_CONCURRENT_REQUESTS_PER_USER"
-
-          DOCKER_BUILD_TAG_GATEWAY="${{ vars[DOCKER_BUILD_TAG_KEY] }}"
-          AZURE_DEPLOY_GROUP_GATEWAY="${{ vars[AZURE_DEPLOY_GROUP_KEY] }}"
-          L2_RPC_URL_VALIDATOR="${{ vars[L2_RPC_URL_KEY] }}"
-          GATEWAY_RATE_LIMIT_USER_COMPUTE_TIME="${{ vars[GATEWAY_RATE_LIMIT_USER_COMPUTE_TIME_KEY] }}"
-          GATEWAY_RATE_LIMIT_WINDOW="${{ vars[GATEWAY_RATE_LIMIT_WINDOW_KEY] }}"
-          GATEWAY_MAX_CONCURRENT_REQUESTS_PER_USER="${{ vars[GATEWAY_MAX_CONCURRENT_REQUESTS_KEY] }}"
+          # Set instance-specific variables
+          declare -a VAR_NAMES=(
+            "DOCKER_BUILD_TAG_GATEWAY"
+            "AZURE_DEPLOY_GROUP_GATEWAY"
+            "L2_RPC_URL_VALIDATOR"
+            "GATEWAY_RATE_LIMIT_USER_COMPUTE_TIME"
+            "GATEWAY_RATE_LIMIT_WINDOW"
+            "GATEWAY_MAX_CONCURRENT_REQUESTS_PER_USER"
+          )
           
-          echo "DOCKER_BUILD_TAG_GATEWAY=$DOCKER_BUILD_TAG_GATEWAY" >> $GITHUB_ENV
-          echo "AZURE_DEPLOY_GROUP_GATEWAY=$AZURE_DEPLOY_GROUP_GATEWAY" >> $GITHUB_ENV
-          echo "L2_RPC_URL_VALIDATOR=$L2_RPC_URL_VALIDATOR" >> $GITHUB_ENV
-          echo "GATEWAY_RATE_LIMIT_USER_COMPUTE_TIME=$GATEWAY_RATE_LIMIT_USER_COMPUTE_TIME" >> $GITHUB_ENV
-          echo "GATEWAY_RATE_LIMIT_WINDOW=$GATEWAY_RATE_LIMIT_WINDOW" >> $GITHUB_ENV
-          echo "GATEWAY_MAX_CONCURRENT_REQUESTS_PER_USER=$GATEWAY_MAX_CONCURRENT_REQUESTS_PER_USER" >> $GITHUB_ENV
+          for VAR_NAME in "${VAR_NAMES[@]}"; do
+            FULL_VAR_NAME="${INSTANCE_PREFIX}${VAR_NAME}"
+            VAR_VALUE=$(jq -r --arg key "$FULL_VAR_NAME" '.[$key] // empty' <<< '${{ toJson(vars) }}')
+            if [[ -n "$VAR_VALUE" ]]; then
+              echo "${VAR_NAME}=${VAR_VALUE}" >> $GITHUB_ENV
+            else
+              echo "Warning: ${FULL_VAR_NAME} not found in vars" >&2
+            fi
+          done
 
       - name: 'Print environment variables'
         # This is a useful record of what the environment variables were at the time the job ran, for debugging and reference