Fix

Author: devksingh4

.github/workflows/build.yml

@@ -33,8 +33,17 @@ jobs:
             - name: Run unit tests
               run: bats tests/unit/
 
+            - name: Fetch latest BWDC version
+              id: bwdc_version
+              env:
+                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              run: |
+                  VERSION=$(gh release view --repo bitwarden/directory-connector \
+                    --json tagName --jq '.tagName | ltrimstr("v")')
+                  echo "version=${VERSION}" >> $GITHUB_OUTPUT
+
             - name: Build image for integration tests
-              run: docker build -t bwdc-test .
+              run: docker build --build-arg BWDC_VERSION=${{ steps.bwdc_version.outputs.version }} -t bwdc-test .
 
             - name: Run integration tests
               env:
@@ -62,11 +71,15 @@ jobs:
 
             - name: Set version
               id: version
+              env:
+                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
               run: |
                   if [ -n "${{ inputs.BWDC_VERSION }}" ]; then
                     echo "version=${{ inputs.BWDC_VERSION }}" >> $GITHUB_OUTPUT
                   elif [ "${{ github.event_name }}" = "pull_request" ]; then
-                    echo "version=pr-${{ github.event.pull_request.number }}" >> $GITHUB_OUTPUT
+                    VERSION=$(gh release view --repo bitwarden/directory-connector \
+                      --json tagName --jq '.tagName | ltrimstr("v")')
+                    echo "version=${VERSION}" >> $GITHUB_OUTPUT
                   else
                     echo "version=${GITHUB_REF_NAME#v}" >> $GITHUB_OUTPUT
                   fi

tests/integration/container.bats

@@ -147,6 +147,62 @@ setup_file() {
     [[ "$output" =~ "config ldap.password supersecret" ]]
 }
 
+@test "BW_DIRECTORY_KEY with azure type (numeric) calls bwdc config azure.key" {
+    local cid
+    cid=$(docker run -d \
+        -v "$FIXTURES/mock_bwdc.sh:/usr/local/bin/bwdc" \
+        -v "$FIXTURES/data.json:$CONFIG_PATH" \
+        -e BW_DIRECTORY_TYPE=1 \
+        -e BW_DIRECTORY_KEY=my-azure-secret \
+        -e SYNC_INTERVAL_MIN=60 \
+        "$IMAGE")
+
+    sleep 8
+
+    run docker exec "$cid" cat /tmp/bwdc_calls
+    docker rm -f "$cid" >/dev/null 2>&1
+    [ "$status" -eq 0 ]
+    [[ "$output" =~ "config azure.key my-azure-secret" ]]
+}
+
+@test "BW_DIRECTORY_KEY with azure type (string) calls bwdc config azure.key" {
+    local cid
+    cid=$(docker run -d \
+        -v "$FIXTURES/mock_bwdc.sh:/usr/local/bin/bwdc" \
+        -v "$FIXTURES/data.json:$CONFIG_PATH" \
+        -e BW_DIRECTORY_TYPE=azure \
+        -e BW_DIRECTORY_KEY=my-azure-secret \
+        -e SYNC_INTERVAL_MIN=60 \
+        "$IMAGE")
+
+    sleep 8
+
+    run docker exec "$cid" cat /tmp/bwdc_calls
+    docker rm -f "$cid" >/dev/null 2>&1
+    [ "$status" -eq 0 ]
+    [[ "$output" =~ "config azure.key my-azure-secret" ]]
+}
+
+@test "azure sync: bwdc config directory is set to type 1" {
+    local cid
+    cid=$(docker run -d \
+        -v "$FIXTURES/mock_bwdc.sh:/usr/local/bin/bwdc" \
+        -v "$FIXTURES/data.json:$CONFIG_PATH" \
+        -e BW_DIRECTORY_TYPE=1 \
+        -e BW_DIRECTORY_KEY=my-azure-secret \
+        -e SYNC_INTERVAL_MIN=60 \
+        "$IMAGE")
+
+    sleep 8
+
+    run docker exec "$cid" cat /tmp/bwdc_calls
+    docker rm -f "$cid" >/dev/null 2>&1
+    [ "$status" -eq 0 ]
+    [[ "$output" =~ "config directory 1" ]]
+    [[ "$output" =~ "config azure.key my-azure-secret" ]]
+    [[ "$output" =~ "sync" ]]
+}
+
 @test "bwdc sync is called during the sync loop" {
     local cid
     cid=$(docker run -d \