fix: fix possible IPv6 issue in canary test.

juju · Oct 21, 2024 · 25ca0d4 · 25ca0d4
1 parent 6e93012
commit 25ca0d4
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml
@@ -74,14 +74,16 @@ jobs:
         # language=bash
         run: |
           CONTROLLER=$(juju whoami --format yaml | yq .controller)
-
-          echo "JUJU_AGENT_VERSION=$(juju show-controller | yq .$CONTROLLER.details.agent-version |tr -d '"')" >> $GITHUB_ENV
-          echo "JUJU_CONTROLLER_ADDRESSES=$(juju show-controller | yq .$CONTROLLER.details.api-endpoints | yq -r '. | join(",")')" >> $GITHUB_ENV
-          echo "JUJU_USERNAME=$(juju show-controller | yq .$CONTROLLER.account.user)"  >> $GITHUB_ENV
-          echo "JUJU_PASSWORD=$(cat ~/.local/share/juju/accounts.yaml | yq .controllers.$CONTROLLER.password)"  >> $GITHUB_ENV
-          echo "JUJU_CA_CERT<<EOF" >> $GITHUB_ENV
-          juju show-controller | yq .$CONTROLLER.details.ca-cert >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV
+          
+          cat << TAC > $GITHUB_ENV
+          JUJU_AGENT_VERSION=$(juju show-controller | yq .$CONTROLLER.details.\"agent-version\" | tr -d '"')
+          JUJU_CONTROLLER_ADDRESSES=$(juju show-controller | yq .$CONTROLLER.details.\"api-endpoints\" | yq -r '. | join(",")')
+          JUJU_USERNAME=$(juju show-controller | yq .$CONTROLLER.account.user) 
+          JUJU_PASSWORD=$(cat ~/.local/share/juju/accounts.yaml | yq .controllers.$CONTROLLER.password) 
+          TAC
+          echo "JUJU_CA_CERT=\`cat <<EOF" >> $GITHUB_ENV
+          juju show-controller | yq .$CONTROLLER.details.\"ca-cert\" >> $GITHUB_ENV
+          echo "EOF\`" >> $GITHUB_ENV
       - env:
           TF_ACC: "1"
           TEST_CLOUD: ${{ matrix.cloud }}