Merge branch 'master' into cv/robust-imds

Author: omus

.github/workflows/CI.yaml

@@ -41,9 +41,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Debug OIDC Claims
-        if: ${{ env.RUN_INTEGRATION_TESTS == 'true' && runner.os == 'Linux' }}
-        uses: github/actions-oidc-debugger@v1
-        with:
+        if: ${{ env.RUN_INTEGRATION_TESTS == 'true' }}
+        # TODO: Switch to `steve-todorov/oidc-debugger-action@v1` once it's working
+        run: |
+          TOKEN_JSON="$(curl -fsSL -H "Authorization: bearer ${ACTIONS_ID_TOKEN_REQUEST_TOKEN:?}" "${ACTIONS_ID_TOKEN_REQUEST_URL:?}&audience=${audience:?}")"
+          ID_TOKEN="$(echo "${TOKEN_JSON:?}" | jq -r .value)"
+          echo "${ID_TOKEN:?}" | awk -F. '{print $2}' | base64 -d 2>/dev/null | jq -r
+        env:
           audience: sts.amazonaws.com
       - name: Assume AWS role
         if: ${{ env.RUN_INTEGRATION_TESTS == 'true' }}

test/integration/AWS.jl

@@ -462,6 +462,14 @@ end
     @testset "Glacier" begin
         @test AWSServices.glacier isa RestJSONService
 
+        function wait_for_vault_deletion(vault_name)
+            timedwait(60; pollint=5) do
+                result = Glacier.list_vaults("-")
+                available_vault_names = [v["VaultName"] for v in result["VaultList"]]
+                return !(vault_name in available_vault_names)
+            end
+        end
+
         @testset "high-level" begin
             timestamp = _now_formatted()
             vault_names = ["aws-jl-test-01---$timestamp", "aws-jl-test-02---$timestamp"]
@@ -500,11 +508,8 @@ end
                 end
             end
 
-            result = Glacier.list_vaults("-")
-            res_vault_names = [v["VaultName"] for v in result["VaultList"]]
-
-            for vault in vault_names
-                @test !(vault in res_vault_names)
+            for vault_name in vault_names
+                @test wait_for_vault_deletion(vault_name) === :ok
             end
         end
 
@@ -548,11 +553,8 @@ end
                 end
             end
 
-            result = AWSServices.glacier("GET", "/-/vaults")
-            res_vault_names = [v["VaultName"] for v in result["VaultList"]]
-
-            for vault in vault_names
-                @test !(vault in res_vault_names)
+            for vault_name in vault_names
+                @test wait_for_vault_deletion(vault_name) === :ok
             end
         end
     end