feat: add support for azure blob with connection string/sas token/account key #313
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package io | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "fmt" | ||
| "net/url" | ||
|
|
||
| "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob" | ||
| "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container" | ||
| "gocloud.dev/blob" | ||
| "gocloud.dev/blob/azureblob" | ||
| ) | ||
|
|
||
| // Constants for Azure configuration options | ||
| const ( | ||
| AdlsSasTokenPrefix = "adls.sas-token." | ||
| AdlsConnectionStringPrefix = "adls.connection-string." | ||
| AdlsSharedKeyAccountName = "adls.auth.shared-key.account.name" | ||
| AdlsSharedKeyAccountKey = "adls.auth.shared-key.account.key" | ||
| AdlsEndpoint = "adls.endpoint" | ||
| AdlsProtocol = "adls.protocol" | ||
|
|
||
| // Not in use yet | ||
| // AdlsReadBlockSize = "adls.read.block-size-bytes" | ||
| // AdlsWriteBlockSize = "adls.write.block-size-bytes" | ||
| ) | ||
|
|
||
| // Construct a Azure bucket from a URL | ||
| func createAzureBucket(ctx context.Context, parsed *url.URL, props map[string]string) (*blob.Bucket, error) { | ||
| adlsSasTokens := propertiesWithPrefix(props, AdlsSasTokenPrefix) | ||
| adlsConnectionStrings := propertiesWithPrefix(props, AdlsConnectionStringPrefix) | ||
|
|
||
| // Construct the client | ||
| accountName := props[AdlsSharedKeyAccountName] | ||
| endpoint := props[AdlsEndpoint] | ||
| protocol := props[AdlsProtocol] | ||
|
Comment on lines
+53
to
+54
Member
There was a problem hiding this comment. are there defaults we should use for these?
Contributor
Author
There was a problem hiding this comment. The default value will be blob.core.windows.net and https which are returned from the sdk. We could also set it to be the default value on the iceberg-go side. There was a problem hiding this comment. When
Contributor
Author
There was a problem hiding this comment. that is the case here. I'd like to make the user to set this value by themselves if necessary while our default for now could only support wasb actually. |
||
|
|
||
| var client *container.Client | ||
|
|
||
| if accountName == "" { | ||
| return nil, errors.New("account name is required for azure bucket") | ||
| } | ||
|
|
||
| if accountKey, ok := props[AdlsSharedKeyAccountKey]; ok { | ||
| svcURL, err := azureblob.NewServiceURL(&azureblob.ServiceURLOptions{ | ||
| AccountName: accountName, | ||
| Protocol: protocol, | ||
| StorageDomain: endpoint, | ||
| }) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| containerURL, err := url.JoinPath(string(svcURL), parsed.Host) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| sharedKeyCred, err := azblob.NewSharedKeyCredential(accountName, accountKey) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed azblob.NewSharedKeyCredential: %w", err) | ||
| } | ||
|
|
||
| client, err = container.NewClientWithSharedKeyCredential(containerURL, sharedKeyCred, nil) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed container.NewClientWithSharedKeyCredential: %w", err) | ||
| } | ||
| } else if sasToken, ok := adlsSasTokens[accountName]; ok { | ||
| svcURL, err := azureblob.NewServiceURL(&azureblob.ServiceURLOptions{ | ||
| AccountName: accountName, | ||
| SASToken: sasToken, | ||
| Protocol: protocol, | ||
| StorageDomain: endpoint, | ||
| }) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| containerURL, err := url.JoinPath(string(svcURL), parsed.Host) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| client, err = container.NewClientWithNoCredential(containerURL, nil) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed container.NewClientWithNoCredential: %w", err) | ||
| } | ||
| } else if connectionString, ok := adlsConnectionStrings[accountName]; ok { | ||
| var err error | ||
| client, err = container.NewClientFromConnectionString(connectionString, parsed.Host, nil) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed container.NewClientFromConnectionString: %w", err) | ||
| } | ||
| } | ||
|
|
||
| return azureblob.OpenBucket(ctx, client, nil) | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use
iceberg.Propertiesinstead ofmap[string]stringThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Adding reference to the current iceberg.Properties struct will cause import cycle, I think that is why we don't use it in gcs.go and s3.go. Should I just move it to the io package here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah, didn't realize that. that's fair. we shouldn't move it so that's fine then