Merge remote-tracking branch 'origin/master' into bruceg/upgrade-rust…

…-1.79
vectordotdev · Jun 13, 2024 · ab37f16 · ab37f16
2 parents 31acbda + 0de41f9
commit ab37f16
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/create_preview_sites.yml b/.github/workflows/create_preview_sites.yml
@@ -67,7 +67,7 @@ jobs:
         ENDPOINT: ${{ secrets.ENDPOINT }}
       run: |
         sleep 20
-        HMAC_KEY=$(echo -n $REQUEST_MESSAGE | openssl dgst -sha256 -hmac "$REQUEST_TOKEN" -binary | od -An -tx1 | tr -d ' \n'; echo)
+        HMAC_KEY=$(echo -n $REQUEST_MESSAGE | openssl dgst -sha256 -hmac "$REQUEST_TOKEN" | cut -d" " -f2)
         SIGNATURE="sha256=$HMAC_KEY"
         RESPONSE_CODE=$(curl -s -o /dev/null -w "%{http_code}" -X POST \
              -H "Content-Type: application/json" \

diff --git a/.github/workflows/k8s_e2e.yml b/.github/workflows/k8s_e2e.yml
@@ -140,7 +140,7 @@ jobs:
           script: |
             // Parameters.
             const minikube_version = [
-              "v1.24.0",
+              "v1.33.1",
             ]
 
             // Aim to test against oldest supported k8s cloud-provider versions

diff --git a/.github/workflows/preview_site_trigger.yml b/.github/workflows/preview_site_trigger.yml
@@ -8,7 +8,7 @@ jobs:
   approval_check:
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    if: ${{ ! contains(github.head_ref, 'dependabot*') && ! contains(github.head_ref, 'gh-readonly-queue*') }}
+    if: ${{ contains(github.head_ref, 'website') }}
     steps:
       - name: Echo approval
         run: |

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -197,8 +197,8 @@ aws-config = { version = "1.0.1", default-features = false, features = ["behavio
 aws-credential-types = { version = "1.2.0", default-features = false, features = ["hardcoded-credentials"], optional = true }
 aws-smithy-http = { version = "0.60", default-features = false, features = ["event-stream"], optional = true }
 aws-smithy-types = { version = "1.2.0", default-features = false, optional = true }
-aws-smithy-runtime-api = { version = "1.6.3", default-features = false, optional = true }
-aws-smithy-runtime = { version = "1.5.7", default-features = false, features = ["client", "connector-hyper-0-14-x", "rt-tokio"], optional = true }
+aws-smithy-runtime-api = { version = "1.7.0", default-features = false, optional = true }
+aws-smithy-runtime = { version = "1.6.0", default-features = false, features = ["client", "connector-hyper-0-14-x", "rt-tokio"], optional = true }
 aws-smithy-async = { version = "1.2.1", default-features = false, features = ["rt-tokio"], optional = true }
 
 # Azure
@@ -369,7 +369,7 @@ openssl-src = { version = "300", default-features = false, features = ["force-en
 [dev-dependencies]
 approx = "0.5.1"
 assert_cmd = { version = "2.0.14", default-features = false }
-aws-smithy-runtime = { version = "1.5.7", default-features = false, features = ["tls-rustls"] }
+aws-smithy-runtime = { version = "1.6.0", default-features = false, features = ["tls-rustls"] }
 azure_core = { version = "0.17", default-features = false, features = ["enable_reqwest", "azurite_workaround"] }
 azure_identity = { version = "0.17", default-features = false, features = ["enable_reqwest"] }
 azure_storage_blobs = { version = "0.17", default-features = false, features = ["azurite_workaround"] }