Merge remote-tracking branch 'origin/main' into gil/filter-by-nested-…

…collection

.github/workflows/cargo-audit.yaml

@@ -0,0 +1,36 @@
+on: [push]
+
+name: cargo audit
+
+jobs:
+  cargo_audit:
+    name: cargo audit
+    runs-on: ubuntu-latest
+    env:
+      CARGO_NET_GIT_FETCH_WITH_CLI: "true"
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: dorny/paths-filter@v3
+        id: changes
+        with:
+          filters: |
+            cargo:
+              - "**/Cargo.toml"
+              - "**/Cargo.lock"
+
+      - if: steps.changes.outputs.cargo == 'true'
+        name: Install `just`
+        uses: extractions/setup-just@v2
+
+      - if: steps.changes.outputs.cargo == 'true'
+        name: install tools
+        run: rustup show
+
+      - if: steps.changes.outputs.cargo == 'true'
+        uses: Swatinem/rust-cache@v2
+        with:
+          shared-key: "build" # share the cache across jobs
+
+      - if: steps.changes.outputs.cargo == 'true'
+        run: just audit

.github/workflows/update-multitenant-dep.yaml

@@ -50,8 +50,16 @@ jobs:
           # Create a new feature branch for the changes.
           git checkout -b $BRANCH_NAME
 
-          # Update the hash to the latest version.
-          sed -i -e '/ndc-postgres.git/s/rev[ ]*=[ ]*"[[:alnum:]]*"/rev = "'"$LATEST_SHA"'"/g' $DEP_FILEPATH
+          # there will be multiple `ndc-postgres` deps, so we target a specific
+          # one, presumably the latest version. This will need updating as we
+          # add new `ndc-postgres` versions into `ndc-postgres-multitenant`
+          LATEST_NDC_POSTGRES_VERSION="v1_0"
+
+          # Update the hash for ndc-postgres
+          sed -i -e "/ndc-postgres_${LATEST_NDC_POSTGRES_VERSION}/s/rev[ ]*=[ ]*\"[[:alnum:]]*\"/rev = \"$LATEST_SHA\"/g" $DEP_FILEPATH
+
+          # Update the hash for ndc-postgres-configuration
+          sed -i -e "/ndc-postgres-configuration_${LATEST_NDC_POSTGRES_VERSION}/s/rev[ ]*=[ ]*\"[[:alnum:]]*\"/rev = \"$LATEST_SHA\"/g" $DEP_FILEPATH
 
           # ssh git access required for cargo update
           eval "$(ssh-agent -s)"