Refactor k6 env vars parsing from logs

Signed-off-by: Bilyana Gospodinova <[email protected]>

Author: bilyana-gospodinova

.github/workflows/acceptance.yaml

@@ -162,72 +162,26 @@ jobs:
         if: ${{ matrix.stream-type != 'BLOCK' }}
         id: log-variables
         run: |
+          set -ex
           LOG_FILE="${{ github.workspace }}/output_log.txt"
-          ERC_CONTRACT_ADDRESS=$(grep "Skipping cleanup of contract \[ERC\]" "$LOG_FILE" | \
-              sed -E 's/.*at address ([0-9a-fA-F]{40})/\1/' | \
-              tail -n 1 | \
-              tr -d '[:space:]')
-
-          echo "ERC_CONTRACT_ADDRESS=$ERC_CONTRACT_ADDRESS"
-          echo "ERC_CONTRACT_ADDRESS=$ERC_CONTRACT_ADDRESS" >> $GITHUB_OUTPUT
-
-          DEFAULT_CONTRACT_ADDRESS=$(grep "Skipping cleanup of contract \[PARENT\]" "$LOG_FILE" | \
-              sed -E 's/.*at address ([0-9a-fA-F]{40})/\1/' | \
-              tail -n 1 | \
-              tr -d '[:space:]')
-
-          echo "DEFAULT_CONTRACT_ADDRESS=$DEFAULT_CONTRACT_ADDRESS"
-          echo "DEFAULT_CONTRACT_ADDRESS=$DEFAULT_CONTRACT_ADDRESS" >> $GITHUB_OUTPUT
-
-          ESTIMATE_PRECOMPILE_CONTRACT=$(grep "Skipping cleanup of contract \[ESTIMATE_PRECOMPILE\]" "$LOG_FILE" | \
-              sed -E 's/.*at address ([0-9a-fA-F]{40})/\1/' | \
-              tail -n 1 | \
-              tr -d '[:space:]')
-
-          echo "ESTIMATE_PRECOMPILE_CONTRACT=$ESTIMATE_PRECOMPILE_CONTRACT"
-          echo "ESTIMATE_PRECOMPILE_CONTRACT=$ESTIMATE_PRECOMPILE_CONTRACT" >> $GITHUB_OUTPUT
-
-          PRECOMPILE_CONTRACT=$(grep "Skipping cleanup of contract \[PRECOMPILE\]" "$LOG_FILE" | \
-              sed -E 's/.*at address ([0-9a-fA-F]{40})/\1/' | \
-              tail -n 1 | \
-              tr -d '[:space:]')
 
-          echo "PRECOMPILE_CONTRACT=$PRECOMPILE_CONTRACT"
-          echo "PRECOMPILE_CONTRACT=$PRECOMPILE_CONTRACT" >> $GITHUB_OUTPUT
-
-          RAW_NON_FUNGIBLE_TOKEN_ADDRESS=$(grep "Skipping cleanup of token \[non_fungible\]" "$LOG_FILE" | \
-              sed -E 's/.*at address ([0-9a-fA-F]{40})/\1/' | \
-              tail -n 1 | \
-              tr -d '[:space:]')
-          NON_FUNGIBLE_TOKEN_ADDRESS=$(printf "%064s" "$RAW_NON_FUNGIBLE_TOKEN_ADDRESS" | tr ' ' '0')
-
-          echo "NON_FUNGIBLE_TOKEN_ADDRESS=$NON_FUNGIBLE_TOKEN_ADDRESS"
-          echo "NON_FUNGIBLE_TOKEN_ADDRESS=$NON_FUNGIBLE_TOKEN_ADDRESS" >> $GITHUB_OUTPUT
-
-          RAW_TOKEN_ADDRESS=$(grep "Skipping cleanup of token \[fungible\]" "$LOG_FILE" | \
-              sed -E 's/.*at address ([0-9a-fA-F]{40})/\1/' | \
+          declare -A k6Map
+          k6Map["PARENT"]="DEFAULT_CONTRACT_ADDRESS"
+          k6Map["ERC"]="ERC_CONTRACT_ADDRESS"
+          k6Map["ESTIMATE_PRECOMPILE"]="ESTIMATE_PRECOMPILE_CONTRACT"
+          k6Map["PRECOMPILE"]="PRECOMPILE_CONTRACT"
+          k6Map["BOB"]="PAYER_ACCOUNT"
+          k6Map["ALICE"]="ACCOUNT_ADDRESS"
+          k6Map["fungible"]="TOKEN_ADDRESS"
+          k6Map["non_fungible"]="NON_FUNGIBLE_TOKEN_ADDRESS"
+
+          for key in "${!k6Map[@]}"; do
+            value=$(grep " ${key}=" "$LOG_FILE" | \
+              awk -F'=' '{print $NF}' | \
               tail -n 1 | \
               tr -d '[:space:]')
-          TOKEN_ADDRESS=$(printf "%064s" "$RAW_TOKEN_ADDRESS" | tr ' ' '0')
-
-          echo "TOKEN_ADDRESS=$TOKEN_ADDRESS"
-          echo "TOKEN_ADDRESS=$TOKEN_ADDRESS" >> $GITHUB_OUTPUT
-
-          PAYER_ACCOUNT=$(grep "Skipping cleanup of account \[BOB\]" "$LOG_FILE" | \
-              sed -E 's/.*at address ([0-9a-fA-F]{40})/\1/' | \
-              tail -n 1 | \
-              tr -d '[:space:]')
-
-          echo "PAYER_ACCOUNT=$PAYER_ACCOUNT"
-          echo "PAYER_ACCOUNT=$PAYER_ACCOUNT" >> $GITHUB_OUTPUT
-
-          ACCOUNT_ADDRESS=$(grep "Skipping cleanup of account \[ALICE\]" "$LOG_FILE" | \
-              sed -E 's/.*at address ([0-9a-fA-F]{40})/\1/' | \
-              tail -n 1 | \
-              tr -d '[:space:]')
-
-          echo "ACCOUNT_ADDRESS=$ACCOUNT_ADDRESS"
-          echo "ACCOUNT_ADDRESS=$ACCOUNT_ADDRESS" >> $GITHUB_OUTPUT
+            echo "${key}=${value}" >> $GITHUB_OUTPUT
+          done
 
       - name: Install k6
         if: ${{ matrix.stream-type != 'BLOCK' }}
@@ -261,7 +215,7 @@ jobs:
           RUN_WITH_VARIABLES: "true"
           SERIAL_NUMBER: "0000000000000000000000000000000000000000000000000000000000000001"
           TOKEN_ADDRESS: ${{ steps.log-variables.outputs.TOKEN_ADDRESS }}
-          WEB3_TEST_INCLUDE: "^(contractCall(RampUp|Approved|Balance|Decimals|FungibleTokenInfo|Identifier|IsToken|Multiply|Name|NonFungibleTokenInfo|OwnerOf|Sender|Symbol|TokenCustomFees|TokenDefaultFreezeStatus|TokenDefaultKycStatus|TokenExpiryInfo|TokenInfo|TokenKey|TokenType|TokenURI|TotalSupply).js)$"
+          WEB3_TEST_INCLUDE: "^(./tools/k6/src/web3/test/contractCall(RampUp|Approved|Balance|Decimals|FungibleTokenInfo|Identifier|IsToken|Multiply|Name|NonFungibleTokenInfo|OwnerOf|Sender|Symbol|TokenCustomFees|TokenDefaultFreezeStatus|TokenDefaultKycStatus|TokenExpiryInfo|TokenInfo|TokenKey|TokenType|TokenURI|TotalSupply).js)$"
         with:
           path: ./tools/k6/src/web3/apis.js
           debug: false

test/src/test/java/org/hiero/mirror/test/e2e/acceptance/client/AccountClient.java

@@ -64,11 +64,12 @@ public AccountClient(
     @Override
     public void clean() {
         if (acceptanceTestProperties.isSkipEntitiesCleanup()) {
-            // In CI we don't want to cleanup as the entities are needed in the k6 test in the next step.
-            log.warn("Acceptance tests running in CI -> skip cleanup.");
             for (var accountName : accountMap.keySet()) {
                 log.info("Skipping cleanup of account [" + accountName + "] at address "
                         + accountMap.get(accountName).getAccountId().toEvmAddress());
+                // Log the values so that it can be parsed in CI and passed to the k6 tests as input.
+                System.out.println(accountName + "="
+                        + accountMap.get(accountName).getAccountId().toEvmAddress());
             }
             return;
         }

test/src/test/java/org/hiero/mirror/test/e2e/acceptance/client/ContractClient.java

@@ -39,11 +39,12 @@ public ContractClient(
     @Override
     public void clean() {
         if (acceptanceTestProperties.isSkipEntitiesCleanup()) {
-            // In CI we don't want to cleanup as the entities are needed in the k6 test in the next step.
-            log.warn("Acceptance tests running in CI -> skip cleanup.");
             for (var contractName : contractIds.keySet()) {
                 log.info("Skipping cleanup of contract [" + contractName + "] at address "
                         + contractIds.get(contractName).toEvmAddress());
+                // Log the values so that it can be parsed in CI and passed to the k6 tests as input.
+                System.out.println(
+                        contractName + "=" + contractIds.get(contractName).toEvmAddress());
             }
             return;
         }

test/src/test/java/org/hiero/mirror/test/e2e/acceptance/client/TokenClient.java

@@ -74,11 +74,15 @@ public TokenClient(
     @Override
     public void clean() {
         if (acceptanceTestProperties.isSkipEntitiesCleanup()) {
-            // In CI we don't want to cleanup as the entities are needed in the k6 test in the next step.
-            log.warn("Acceptance tests running in CI -> skip cleanup.");
             for (var tokenName : tokenMap.keySet()) {
                 log.info("Skipping cleanup of token [" + tokenName.getSymbol() + "] at address "
                         + tokenMap.get(tokenName).tokenId().toEvmAddress());
+                // Log the values so that it can be parsed in CI and passed to the k6 tests as input.
+                System.out.println(tokenName.getSymbol() + "="
+                        + String.format(
+                                "%s%s",
+                                "0".repeat(24),
+                                tokenMap.get(tokenName).tokenId().toEvmAddress()));
             }
             return;
         }