Merge pull request #16 from samansmink/add-credential-chain

Add support for azure credential chain
duckdb · Oct 13, 2023 · 77f343c · 77f343c
2 parents 1d6aedb + fb68a82
commit 77f343c
Show file tree

Hide file tree

Showing 9 changed files with 287 additions and 94 deletions.
diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml
@@ -105,7 +105,7 @@ jobs:
     - name: Setup vcpkg
       uses: lukka/run-vcpkg@v11
       with:
-        vcpkgGitCommitId: 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1
+        vcpkgGitCommitId: 9edb1b8e590cc086563301d735cae4b6e732d2d2
 
     # Build extension
     - name: Build extension

diff --git a/.github/workflows/MacOS.yml b/.github/workflows/MacOS.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Setup vcpkg
         uses: lukka/run-vcpkg@v11
         with:
-          vcpkgGitCommitId: 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1
+          vcpkgGitCommitId: 9edb1b8e590cc086563301d735cae4b6e732d2d2
 
       - name: Build extension
         shell: bash

diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml
@@ -18,6 +18,7 @@ jobs:
     with:
       duckdb_version: v0.9.1
       extension_name: azure
+      vcpkg_commit: 9edb1b8e590cc086563301d735cae4b6e732d2d2 # TODO: remove pinned vcpkg commit when updating duckdb version
 
   duckdb-stable-deploy:
     name: Deploy extension binaries

diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Setup vcpkg
         uses: lukka/run-vcpkg@v11
         with:
-          vcpkgGitCommitId: 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1
+          vcpkgGitCommitId: 9edb1b8e590cc086563301d735cae4b6e732d2d2
 
       - uses: actions/setup-python@v2
         with:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,12 +20,17 @@ find_package(azure-identity-cpp CONFIG REQUIRED)
 find_package(azure-storage-blobs-cpp CONFIG REQUIRED)
 
 # Static lib
-target_link_libraries(${EXTENSION_NAME} Azure::azure-identity Azure::azure-storage-blobs)
-target_include_directories(${EXTENSION_NAME} PRIVATE Azure::azure-identity Azure::azure-storage-blobs)
+target_link_libraries(${EXTENSION_NAME} Azure::azure-identity
+                      Azure::azure-storage-blobs)
+target_include_directories(${EXTENSION_NAME} PRIVATE Azure::azure-identity
+                                                     Azure::azure-storage-blobs)
 
 # Loadable binary
-target_link_libraries(${TARGET_NAME}_loadable_extension Azure::azure-identity Azure::azure-storage-blobs)
-target_include_directories(${TARGET_NAME}_loadable_extension PRIVATE Azure::azure-identity Azure::azure-storage-blobs)
+target_link_libraries(${TARGET_NAME}_loadable_extension Azure::azure-identity
+                      Azure::azure-storage-blobs)
+target_include_directories(
+  ${TARGET_NAME}_loadable_extension PRIVATE Azure::azure-identity
+                                            Azure::azure-storage-blobs)
 
 install(
   TARGETS ${EXTENSION_NAME}