Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump to duckdb's main and apply patches #43

Merged
merged 4 commits into from
May 17, 2024
Merged

Bump to duckdb's main and apply patches #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd6dc50
Bump close to upcoming duckdb v0.10.3
carlopi May 13, 2024
73edcdf
Apply shared_ptr.patch
carlopi May 13, 2024
3082282
update tests
stephaniewang526 Apr 19, 2024
1361f6e
Skip minio tests, problem is pre-existing / independent
carlopi May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/MainDistributionPipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@ concurrency:
jobs:
duckdb-stable-build:
name: Build extension binaries
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v0.10.1
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
with:
extension_name: aws
duckdb_version: 'v0.10.1'
duckdb_version: main
exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools' # Doesn't work anyway: env local file or env access possible

duckdb-stable-deploy:
name: Deploy extension binaries
needs: duckdb-stable-build
uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v0.10.1
uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
secrets: inherit
with:
extension_name: aws
duckdb_version: 'v0.10.1'
duckdb_version: main
exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools' # Doesn't work anyway: env local file or env access possible
deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
deploy_versioned: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
deploy_versioned: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
3 changes: 2 additions & 1 deletion .github/workflows/MinioTests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ defaults:

jobs:
minio-tests:
if: false
name: Minio Tests
runs-on: ubuntu-20.04
strategy:
Expand Down Expand Up @@ -84,4 +85,4 @@ jobs:
AWS_SECRET_ACCESS_KEY: duckdb_env_testing_key
AWS_DEFAULT_REGION: duckdb_env_testing_region
run: |
./build/release/test/unittest "*/test/sql/env/*"
./build/release/test/unittest "*/test/sql/env/*"
2 changes: 1 addition & 1 deletion duckdb
Open in desktop
Submodule duckdb updated 1839 files
16 changes: 8 additions & 8 deletions src/aws_secret.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,24 +40,24 @@ class DuckDBCustomAWSCredentialsProviderChain : public Aws::Auth::AWSCredentials

for (const auto &item : chain_list) {
if (item == "sts") {
AddProvider(make_shared<Aws::Auth::STSAssumeRoleWebIdentityCredentialsProvider>());
AddProvider(std::make_shared<Aws::Auth::STSAssumeRoleWebIdentityCredentialsProvider>());
} else if (item == "sso") {
if (profile.empty()) {
AddProvider(make_shared<Aws::Auth::SSOCredentialsProvider>());
AddProvider(std::make_shared<Aws::Auth::SSOCredentialsProvider>());
} else {
AddProvider(make_shared<Aws::Auth::SSOCredentialsProvider>(profile));
AddProvider(std::make_shared<Aws::Auth::SSOCredentialsProvider>(profile));
}
} else if (item == "env") {
AddProvider(make_shared<Aws::Auth::EnvironmentAWSCredentialsProvider>());
AddProvider(std::make_shared<Aws::Auth::EnvironmentAWSCredentialsProvider>());
} else if (item == "instance") {
AddProvider(make_shared<Aws::Auth::InstanceProfileCredentialsProvider>());
AddProvider(std::make_shared<Aws::Auth::InstanceProfileCredentialsProvider>());
} else if (item == "process") {
AddProvider(make_shared<Aws::Auth::ProcessCredentialsProvider>());
AddProvider(std::make_shared<Aws::Auth::ProcessCredentialsProvider>());
} else if (item == "config") {
if (profile.empty()) {
AddProvider(make_shared<Aws::Auth::ProfileConfigFileAWSCredentialsProvider>());
AddProvider(std::make_shared<Aws::Auth::ProfileConfigFileAWSCredentialsProvider>());
} else {
AddProvider(make_shared<Aws::Auth::ProfileConfigFileAWSCredentialsProvider>(profile.c_str()));
AddProvider(std::make_shared<Aws::Auth::ProfileConfigFileAWSCredentialsProvider>(profile.c_str()));
}
} else {
throw InvalidInputException("Unknown provider found while parsing AWS credential chain string: '%s'",
Expand Down
2 changes: 1 addition & 1 deletion test/sql/aws_minio_secret.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ CREATE SECRET my_aws_secret (
);

query I
SELECT which_secret('s3://test-bucket/aws_minio_secret/secret1/test.csv', 's3')
SELECT name FROM which_secret('s3://test-bucket/aws_minio_secret/secret1/test.csv', 's3')
----
my_aws_secret

Expand Down
2 changes: 1 addition & 1 deletion test/sql/aws_secret_gcs.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CREATE SECRET s1 (
);

query I
SELECT which_secret('gcs://haha/hoehoe.parkoe', 'gcs')
SELECT name FROM which_secret('gcs://haha/hoehoe.parkoe', 'gcs')
----
s1

Expand Down
2 changes: 1 addition & 1 deletion test/sql/aws_secret_r2.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ CREATE SECRET s1 (
);

query I
SELECT which_secret('r2://haha/hoehoe.parkoe', 'r2')
SELECT name FROM which_secret('r2://haha/hoehoe.parkoe', 'r2')
----
s1

Expand Down
Loading