GH-39449: [C++] Use default Azure credentials implicitly and support anonymous credentials explicitly - #39450

Merged
felipecrv merged 6 commits into
apache:mainfrom
felipecrv:azure_auth
Jan 5, 2024
Merged

GH-39449: [C++] Use default Azure credentials implicitly and support anonymous credentials explicitly#39450
felipecrv merged 6 commits into
apache:mainfrom
felipecrv:azure_auth

Conversation

@felipecrv

@felipecrvfelipecrv commented Jan 4, 2024

Copy link
Copy Markdown
Contributor

Rationale for this change

  • Default credentials should be used by default.
  • There should be a way to connect to public containers without credentials (aka "anonymous credential").

What changes are included in this PR?

  • Sync ordering of declarations and definitions in the AzureOptions classs
  • Use default credentials even when ConfigureDefaultCredential() isn't explicitly called
  • Create clients when credential_kind_ is "anonymous" instead of returning an error

Are these changes tested?

By new and existing tests.

@github-actions

Copy link
Copy Markdown

⚠️ GitHub issue #39449has been automatically assigned in GitHub to PR creator.

@felipecrv
felipecrv marked this pull request as ready for review January 4, 2024 01:44
@felipecrv
felipecrv requested a review from kouJanuary 4, 2024 01:44
@felipecrv

Copy link
Copy Markdown
ContributorAuthor

@Tom-Newton

@felipecrvfelipecrv added this to the 15.0.0 milestone Jan 4, 2024
Comment threadcpp/src/arrow/filesystem/azurefs_test.cc Outdated
Comment threadcpp/src/arrow/filesystem/azurefs.h Outdated
Comment on lines 97 to 115

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we really need to change this. I would rather just keep kTokenCredential to cover all the credentials that are based on https://github.com/Azure/azure-sdk-for-cpp/blob/e5e675440b44ace7d7a9e7bc303f877c06b59ea5/sdk/core/azure-core/inc/azure/core/credentials/credentials.hpp#L68

@felipecrvfelipecrvJan 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need this to support Equals. Think of it as runtime type-information that describes which concrete implementation of TokenCredential is being used.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Besides that, we would need to make a distinction between kDefault and all the others kToken at least (to support the implicit default behavior). It's clearer if we then make a distinction on all of them.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I would have done it differently but I don't feel strongly.

@github-actionsgithub-actionsBot added awaiting committer review Awaiting committer review and removed awaiting review Awaiting review labels Jan 4, 2024
Comment threadcpp/src/arrow/filesystem/azurefs_test.cc Outdated
Comment threadcpp/src/arrow/filesystem/azurefs.h Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about always creating Azure::Identity::DefaultAzureCredential instead of using mutable?

diff --git a/cpp/src/arrow/filesystem/azurefs.cc b/cpp/src/arrow/filesystem/azurefs.cc
index e98d56c73..5099cd25d 100644
--- a/cpp/src/arrow/filesystem/azurefs.cc+++ b/cpp/src/arrow/filesystem/azurefs.cc@@ -110,7 +110,6 @@ std::string AzureOptions::AccountDfsUrl(const std::string& account_name) const {
Status AzureOptions::ConfigureDefaultCredential() {
credential_kind_ = CredentialKind::kDefault;
- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();
return Status::OK();
}
@@ -160,10 +159,9 @@ Result<std::unique_ptr<Blobs::BlobServiceClient>> AzureOptions::MakeBlobServiceC
case CredentialKind::kAnonymous:
return std::make_unique<Blobs::BlobServiceClient>(AccountBlobUrl(account_name));
case CredentialKind::kDefault:
- if (!token_credential_) {- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();- }- [[fallthrough]];+ return std::make_unique<Blobs::BlobServiceClient>(+ AccountBlobUrl(account_name),+ std::make_shared<Azure::Identity::DefaultAzureCredential>());
case CredentialKind::kClientSecret:
case CredentialKind::kManagedIdentity:
case CredentialKind::kWorkloadIdentity:
@@ -186,10 +184,9 @@ AzureOptions::MakeDataLakeServiceClient() const {
return std::make_unique<DataLake::DataLakeServiceClient>(
AccountDfsUrl(account_name));
case CredentialKind::kDefault:
- if (!token_credential_) {- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();- }- [[fallthrough]];+ return std::make_unique<DataLake::DataLakeServiceClient>(+ AccountDfsUrl(account_name),+ std::make_shared<Azure::Identity::DefaultAzureCredential>());
case CredentialKind::kClientSecret:
case CredentialKind::kManagedIdentity:
case CredentialKind::kWorkloadIdentity:
diff --git a/cpp/src/arrow/filesystem/azurefs.h b/cpp/src/arrow/filesystem/azurefs.h
index 55f89ba47..ba612f799 100644
--- a/cpp/src/arrow/filesystem/azurefs.h+++ b/cpp/src/arrow/filesystem/azurefs.h@@ -117,7 +117,7 @@ struct ARROW_EXPORT AzureOptions {
std::shared_ptr<Azure::Storage::StorageSharedKeyCredential>
storage_shared_key_credential_;
- mutable std::shared_ptr<Azure::Core::Credentials::TokenCredential> token_credential_;+ std::shared_ptr<Azure::Core::Credentials::TokenCredential> token_credential_;
public:
AzureOptions();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Creating DefaultAzureCredential is a lot of non-trivial work: env vars, multiple allocations and probes. We can't assume it to be a cheap operation. mutable is a common solution to lazily-initialized class members and this one has a very well-defined behavior: it's set once, then it doesn't change at all anymore.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And it's important that we do mutate it in ConfigureDefaultCredential because the user might want to explicitly initialize the credential immediately after doing something with the env variables used by the Azure SDK or right before unsetting the variables.

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes awaiting change review Awaiting change review and removed awaiting committer review Awaiting committer review awaiting changes Awaiting changes labels Jan 4, 2024
@felipecrv
felipecrv requested a review from kouJanuary 5, 2024 01:36
@felipecrv

Copy link
Copy Markdown
ContributorAuthor

Rebased and force-pushed after the merge of my bigger PR related to directory semantics.

@Tom-NewtonTom-Newton left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@felipecrv
felipecrv merged commit 33c64ed into apache:mainJan 5, 2024
@felipecrvfelipecrv removed the awaiting change review Awaiting change review label Jan 5, 2024
@felipecrv
felipecrv deleted the azure_auth branch January 5, 2024 23:34
@conbench-apache-arrow

Copy link
Copy Markdown

After merging your PR, Conbench analyzed the 6 benchmarking runs that have been run so far on merge-commit 33c64ed.

There were no benchmark performance regressions. 🎉

The full Conbench report has more details. It also includes information about 4 possible false positives for unstable benchmarks that are known to sometimes produce them.

dgreiss pushed a commit to dgreiss/arrow that referenced this pull request Feb 19, 2024
…pport anonymous credentials explicitly (apache#39450)
### Rationale for this change
- Default credentials should be used by default.
- There should be a way to connect to public containers without credentials (aka "anonymous credential").
### What changes are included in this PR?
- Sync ordering of declarations and definitions in the `AzureOptions` classs
- Use default credentials even when `ConfigureDefaultCredential()` isn't explicitly called
- Create clients when `credential_kind_` is "anonymous" instead of returning an error
### Are these changes tested?
By new and existing tests.
* Closes: apache#39449
Lead-authored-by: Felipe Oliveira Carvalho <felipekde@gmail.com>
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
Signed-off-by: Felipe Oliveira Carvalho <felipekde@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[C++][FS] Use default Azure credentials implicitly and support anonymous credentials explictly

3 participants

@felipecrv@kou@Tom-Newton
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

GH-39449: [C++] Use default Azure credentials implicitly and support anonymous credentials explicitly - #39450

Merged
felipecrv merged 6 commits into
apache:mainfrom
felipecrv:azure_auth
Jan 5, 2024
Merged

GH-39449: [C++] Use default Azure credentials implicitly and support anonymous credentials explicitly#39450
felipecrv merged 6 commits into
apache:mainfrom
felipecrv:azure_auth

Conversation

@felipecrv

@felipecrvfelipecrv commented Jan 4, 2024

Copy link
Copy Markdown
Contributor

Rationale for this change

  • Default credentials should be used by default.
  • There should be a way to connect to public containers without credentials (aka "anonymous credential").

What changes are included in this PR?

  • Sync ordering of declarations and definitions in the AzureOptions classs
  • Use default credentials even when ConfigureDefaultCredential() isn't explicitly called
  • Create clients when credential_kind_ is "anonymous" instead of returning an error

Are these changes tested?

By new and existing tests.

@github-actions

Copy link
Copy Markdown

⚠️ GitHub issue #39449has been automatically assigned in GitHub to PR creator.

@felipecrv
felipecrv marked this pull request as ready for review January 4, 2024 01:44
@felipecrv
felipecrv requested a review from kouJanuary 4, 2024 01:44
@felipecrv

Copy link
Copy Markdown
ContributorAuthor

@Tom-Newton

@felipecrvfelipecrv added this to the 15.0.0 milestone Jan 4, 2024
Comment threadcpp/src/arrow/filesystem/azurefs_test.cc Outdated
Comment threadcpp/src/arrow/filesystem/azurefs.h Outdated
Comment on lines 97 to 115

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we really need to change this. I would rather just keep kTokenCredential to cover all the credentials that are based on https://github.com/Azure/azure-sdk-for-cpp/blob/e5e675440b44ace7d7a9e7bc303f877c06b59ea5/sdk/core/azure-core/inc/azure/core/credentials/credentials.hpp#L68

@felipecrvfelipecrvJan 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need this to support Equals. Think of it as runtime type-information that describes which concrete implementation of TokenCredential is being used.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Besides that, we would need to make a distinction between kDefault and all the others kToken at least (to support the implicit default behavior). It's clearer if we then make a distinction on all of them.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I would have done it differently but I don't feel strongly.

@github-actionsgithub-actionsBot added awaiting committer review Awaiting committer review and removed awaiting review Awaiting review labels Jan 4, 2024
Comment threadcpp/src/arrow/filesystem/azurefs_test.cc Outdated
Comment threadcpp/src/arrow/filesystem/azurefs.h Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about always creating Azure::Identity::DefaultAzureCredential instead of using mutable?

diff --git a/cpp/src/arrow/filesystem/azurefs.cc b/cpp/src/arrow/filesystem/azurefs.cc
index e98d56c73..5099cd25d 100644
--- a/cpp/src/arrow/filesystem/azurefs.cc+++ b/cpp/src/arrow/filesystem/azurefs.cc@@ -110,7 +110,6 @@ std::string AzureOptions::AccountDfsUrl(const std::string& account_name) const {
Status AzureOptions::ConfigureDefaultCredential() {
credential_kind_ = CredentialKind::kDefault;
- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();
return Status::OK();
}
@@ -160,10 +159,9 @@ Result<std::unique_ptr<Blobs::BlobServiceClient>> AzureOptions::MakeBlobServiceC
case CredentialKind::kAnonymous:
return std::make_unique<Blobs::BlobServiceClient>(AccountBlobUrl(account_name));
case CredentialKind::kDefault:
- if (!token_credential_) {- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();- }- [[fallthrough]];+ return std::make_unique<Blobs::BlobServiceClient>(+ AccountBlobUrl(account_name),+ std::make_shared<Azure::Identity::DefaultAzureCredential>());
case CredentialKind::kClientSecret:
case CredentialKind::kManagedIdentity:
case CredentialKind::kWorkloadIdentity:
@@ -186,10 +184,9 @@ AzureOptions::MakeDataLakeServiceClient() const {
return std::make_unique<DataLake::DataLakeServiceClient>(
AccountDfsUrl(account_name));
case CredentialKind::kDefault:
- if (!token_credential_) {- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();- }- [[fallthrough]];+ return std::make_unique<DataLake::DataLakeServiceClient>(+ AccountDfsUrl(account_name),+ std::make_shared<Azure::Identity::DefaultAzureCredential>());
case CredentialKind::kClientSecret:
case CredentialKind::kManagedIdentity:
case CredentialKind::kWorkloadIdentity:
diff --git a/cpp/src/arrow/filesystem/azurefs.h b/cpp/src/arrow/filesystem/azurefs.h
index 55f89ba47..ba612f799 100644
--- a/cpp/src/arrow/filesystem/azurefs.h+++ b/cpp/src/arrow/filesystem/azurefs.h@@ -117,7 +117,7 @@ struct ARROW_EXPORT AzureOptions {
std::shared_ptr<Azure::Storage::StorageSharedKeyCredential>
storage_shared_key_credential_;
- mutable std::shared_ptr<Azure::Core::Credentials::TokenCredential> token_credential_;+ std::shared_ptr<Azure::Core::Credentials::TokenCredential> token_credential_;
public:
AzureOptions();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Creating DefaultAzureCredential is a lot of non-trivial work: env vars, multiple allocations and probes. We can't assume it to be a cheap operation. mutable is a common solution to lazily-initialized class members and this one has a very well-defined behavior: it's set once, then it doesn't change at all anymore.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And it's important that we do mutate it in ConfigureDefaultCredential because the user might want to explicitly initialize the credential immediately after doing something with the env variables used by the Azure SDK or right before unsetting the variables.

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes awaiting change review Awaiting change review and removed awaiting committer review Awaiting committer review awaiting changes Awaiting changes labels Jan 4, 2024
@felipecrv
felipecrv requested a review from kouJanuary 5, 2024 01:36
@felipecrv

Copy link
Copy Markdown
ContributorAuthor

Rebased and force-pushed after the merge of my bigger PR related to directory semantics.

@Tom-NewtonTom-Newton left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@felipecrv
felipecrv merged commit 33c64ed into apache:mainJan 5, 2024
@felipecrvfelipecrv removed the awaiting change review Awaiting change review label Jan 5, 2024
@felipecrv
felipecrv deleted the azure_auth branch January 5, 2024 23:34
@conbench-apache-arrow

Copy link
Copy Markdown

After merging your PR, Conbench analyzed the 6 benchmarking runs that have been run so far on merge-commit 33c64ed.

There were no benchmark performance regressions. 🎉

The full Conbench report has more details. It also includes information about 4 possible false positives for unstable benchmarks that are known to sometimes produce them.

dgreiss pushed a commit to dgreiss/arrow that referenced this pull request Feb 19, 2024
…pport anonymous credentials explicitly (apache#39450)
### Rationale for this change
- Default credentials should be used by default.
- There should be a way to connect to public containers without credentials (aka "anonymous credential").
### What changes are included in this PR?
- Sync ordering of declarations and definitions in the `AzureOptions` classs
- Use default credentials even when `ConfigureDefaultCredential()` isn't explicitly called
- Create clients when `credential_kind_` is "anonymous" instead of returning an error
### Are these changes tested?
By new and existing tests.
* Closes: apache#39449
Lead-authored-by: Felipe Oliveira Carvalho <felipekde@gmail.com>
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
Signed-off-by: Felipe Oliveira Carvalho <felipekde@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[C++][FS] Use default Azure credentials implicitly and support anonymous credentials explictly

3 participants

@felipecrv@kou@Tom-Newton
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

GH-39449: [C++] Use default Azure credentials implicitly and support anonymous credentials explicitly - #39450

Merged
felipecrv merged 6 commits into
apache:mainfrom
felipecrv:azure_auth
Jan 5, 2024
Merged

GH-39449: [C++] Use default Azure credentials implicitly and support anonymous credentials explicitly#39450
felipecrv merged 6 commits into
apache:mainfrom
felipecrv:azure_auth

Conversation

@felipecrv

@felipecrvfelipecrv commented Jan 4, 2024

Copy link
Copy Markdown
Contributor

Rationale for this change

  • Default credentials should be used by default.
  • There should be a way to connect to public containers without credentials (aka "anonymous credential").

What changes are included in this PR?

  • Sync ordering of declarations and definitions in the AzureOptions classs
  • Use default credentials even when ConfigureDefaultCredential() isn't explicitly called
  • Create clients when credential_kind_ is "anonymous" instead of returning an error

Are these changes tested?

By new and existing tests.

@github-actions

Copy link
Copy Markdown

⚠️ GitHub issue #39449has been automatically assigned in GitHub to PR creator.

@felipecrv
felipecrv marked this pull request as ready for review January 4, 2024 01:44
@felipecrv
felipecrv requested a review from kouJanuary 4, 2024 01:44
@felipecrv

Copy link
Copy Markdown
ContributorAuthor

@Tom-Newton

@felipecrvfelipecrv added this to the 15.0.0 milestone Jan 4, 2024
Comment threadcpp/src/arrow/filesystem/azurefs_test.cc Outdated
Comment threadcpp/src/arrow/filesystem/azurefs.h Outdated
Comment on lines 97 to 115

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we really need to change this. I would rather just keep kTokenCredential to cover all the credentials that are based on https://github.com/Azure/azure-sdk-for-cpp/blob/e5e675440b44ace7d7a9e7bc303f877c06b59ea5/sdk/core/azure-core/inc/azure/core/credentials/credentials.hpp#L68

@felipecrvfelipecrvJan 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need this to support Equals. Think of it as runtime type-information that describes which concrete implementation of TokenCredential is being used.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Besides that, we would need to make a distinction between kDefault and all the others kToken at least (to support the implicit default behavior). It's clearer if we then make a distinction on all of them.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I would have done it differently but I don't feel strongly.

@github-actionsgithub-actionsBot added awaiting committer review Awaiting committer review and removed awaiting review Awaiting review labels Jan 4, 2024
Comment threadcpp/src/arrow/filesystem/azurefs_test.cc Outdated
Comment threadcpp/src/arrow/filesystem/azurefs.h Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about always creating Azure::Identity::DefaultAzureCredential instead of using mutable?

diff --git a/cpp/src/arrow/filesystem/azurefs.cc b/cpp/src/arrow/filesystem/azurefs.cc
index e98d56c73..5099cd25d 100644
--- a/cpp/src/arrow/filesystem/azurefs.cc+++ b/cpp/src/arrow/filesystem/azurefs.cc@@ -110,7 +110,6 @@ std::string AzureOptions::AccountDfsUrl(const std::string& account_name) const {
Status AzureOptions::ConfigureDefaultCredential() {
credential_kind_ = CredentialKind::kDefault;
- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();
return Status::OK();
}
@@ -160,10 +159,9 @@ Result<std::unique_ptr<Blobs::BlobServiceClient>> AzureOptions::MakeBlobServiceC
case CredentialKind::kAnonymous:
return std::make_unique<Blobs::BlobServiceClient>(AccountBlobUrl(account_name));
case CredentialKind::kDefault:
- if (!token_credential_) {- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();- }- [[fallthrough]];+ return std::make_unique<Blobs::BlobServiceClient>(+ AccountBlobUrl(account_name),+ std::make_shared<Azure::Identity::DefaultAzureCredential>());
case CredentialKind::kClientSecret:
case CredentialKind::kManagedIdentity:
case CredentialKind::kWorkloadIdentity:
@@ -186,10 +184,9 @@ AzureOptions::MakeDataLakeServiceClient() const {
return std::make_unique<DataLake::DataLakeServiceClient>(
AccountDfsUrl(account_name));
case CredentialKind::kDefault:
- if (!token_credential_) {- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();- }- [[fallthrough]];+ return std::make_unique<DataLake::DataLakeServiceClient>(+ AccountDfsUrl(account_name),+ std::make_shared<Azure::Identity::DefaultAzureCredential>());
case CredentialKind::kClientSecret:
case CredentialKind::kManagedIdentity:
case CredentialKind::kWorkloadIdentity:
diff --git a/cpp/src/arrow/filesystem/azurefs.h b/cpp/src/arrow/filesystem/azurefs.h
index 55f89ba47..ba612f799 100644
--- a/cpp/src/arrow/filesystem/azurefs.h+++ b/cpp/src/arrow/filesystem/azurefs.h@@ -117,7 +117,7 @@ struct ARROW_EXPORT AzureOptions {
std::shared_ptr<Azure::Storage::StorageSharedKeyCredential>
storage_shared_key_credential_;
- mutable std::shared_ptr<Azure::Core::Credentials::TokenCredential> token_credential_;+ std::shared_ptr<Azure::Core::Credentials::TokenCredential> token_credential_;
public:
AzureOptions();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Creating DefaultAzureCredential is a lot of non-trivial work: env vars, multiple allocations and probes. We can't assume it to be a cheap operation. mutable is a common solution to lazily-initialized class members and this one has a very well-defined behavior: it's set once, then it doesn't change at all anymore.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And it's important that we do mutate it in ConfigureDefaultCredential because the user might want to explicitly initialize the credential immediately after doing something with the env variables used by the Azure SDK or right before unsetting the variables.

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes awaiting change review Awaiting change review and removed awaiting committer review Awaiting committer review awaiting changes Awaiting changes labels Jan 4, 2024
@felipecrv
felipecrv requested a review from kouJanuary 5, 2024 01:36
@felipecrv

Copy link
Copy Markdown
ContributorAuthor

Rebased and force-pushed after the merge of my bigger PR related to directory semantics.

@Tom-NewtonTom-Newton left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@felipecrv
felipecrv merged commit 33c64ed into apache:mainJan 5, 2024
@felipecrvfelipecrv removed the awaiting change review Awaiting change review label Jan 5, 2024
@felipecrv
felipecrv deleted the azure_auth branch January 5, 2024 23:34
@conbench-apache-arrow

Copy link
Copy Markdown

After merging your PR, Conbench analyzed the 6 benchmarking runs that have been run so far on merge-commit 33c64ed.

There were no benchmark performance regressions. 🎉

The full Conbench report has more details. It also includes information about 4 possible false positives for unstable benchmarks that are known to sometimes produce them.

dgreiss pushed a commit to dgreiss/arrow that referenced this pull request Feb 19, 2024
…pport anonymous credentials explicitly (apache#39450)
### Rationale for this change
- Default credentials should be used by default.
- There should be a way to connect to public containers without credentials (aka "anonymous credential").
### What changes are included in this PR?
- Sync ordering of declarations and definitions in the `AzureOptions` classs
- Use default credentials even when `ConfigureDefaultCredential()` isn't explicitly called
- Create clients when `credential_kind_` is "anonymous" instead of returning an error
### Are these changes tested?
By new and existing tests.
* Closes: apache#39449
Lead-authored-by: Felipe Oliveira Carvalho <felipekde@gmail.com>
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
Signed-off-by: Felipe Oliveira Carvalho <felipekde@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[C++][FS] Use default Azure credentials implicitly and support anonymous credentials explictly

3 participants

@felipecrv@kou@Tom-Newton
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

GH-39449: [C++] Use default Azure credentials implicitly and support anonymous credentials explicitly - #39450

Merged
felipecrv merged 6 commits into
apache:mainfrom
felipecrv:azure_auth
Jan 5, 2024
Merged

GH-39449: [C++] Use default Azure credentials implicitly and support anonymous credentials explicitly#39450
felipecrv merged 6 commits into
apache:mainfrom
felipecrv:azure_auth

Conversation

@felipecrv

@felipecrvfelipecrv commented Jan 4, 2024

Copy link
Copy Markdown
Contributor

Rationale for this change

  • Default credentials should be used by default.
  • There should be a way to connect to public containers without credentials (aka "anonymous credential").

What changes are included in this PR?

  • Sync ordering of declarations and definitions in the AzureOptions classs
  • Use default credentials even when ConfigureDefaultCredential() isn't explicitly called
  • Create clients when credential_kind_ is "anonymous" instead of returning an error

Are these changes tested?

By new and existing tests.

@github-actions

Copy link
Copy Markdown

⚠️ GitHub issue #39449has been automatically assigned in GitHub to PR creator.

@felipecrv
felipecrv marked this pull request as ready for review January 4, 2024 01:44
@felipecrv
felipecrv requested a review from kouJanuary 4, 2024 01:44
@felipecrv

Copy link
Copy Markdown
ContributorAuthor

@Tom-Newton

@felipecrvfelipecrv added this to the 15.0.0 milestone Jan 4, 2024
Comment threadcpp/src/arrow/filesystem/azurefs_test.cc Outdated
Comment threadcpp/src/arrow/filesystem/azurefs.h Outdated
Comment on lines 97 to 115

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we really need to change this. I would rather just keep kTokenCredential to cover all the credentials that are based on https://github.com/Azure/azure-sdk-for-cpp/blob/e5e675440b44ace7d7a9e7bc303f877c06b59ea5/sdk/core/azure-core/inc/azure/core/credentials/credentials.hpp#L68

@felipecrvfelipecrvJan 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need this to support Equals. Think of it as runtime type-information that describes which concrete implementation of TokenCredential is being used.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Besides that, we would need to make a distinction between kDefault and all the others kToken at least (to support the implicit default behavior). It's clearer if we then make a distinction on all of them.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I would have done it differently but I don't feel strongly.

@github-actionsgithub-actionsBot added awaiting committer review Awaiting committer review and removed awaiting review Awaiting review labels Jan 4, 2024
Comment threadcpp/src/arrow/filesystem/azurefs_test.cc Outdated
Comment threadcpp/src/arrow/filesystem/azurefs.h Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about always creating Azure::Identity::DefaultAzureCredential instead of using mutable?

diff --git a/cpp/src/arrow/filesystem/azurefs.cc b/cpp/src/arrow/filesystem/azurefs.cc
index e98d56c73..5099cd25d 100644
--- a/cpp/src/arrow/filesystem/azurefs.cc+++ b/cpp/src/arrow/filesystem/azurefs.cc@@ -110,7 +110,6 @@ std::string AzureOptions::AccountDfsUrl(const std::string& account_name) const {
Status AzureOptions::ConfigureDefaultCredential() {
credential_kind_ = CredentialKind::kDefault;
- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();
return Status::OK();
}
@@ -160,10 +159,9 @@ Result<std::unique_ptr<Blobs::BlobServiceClient>> AzureOptions::MakeBlobServiceC
case CredentialKind::kAnonymous:
return std::make_unique<Blobs::BlobServiceClient>(AccountBlobUrl(account_name));
case CredentialKind::kDefault:
- if (!token_credential_) {- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();- }- [[fallthrough]];+ return std::make_unique<Blobs::BlobServiceClient>(+ AccountBlobUrl(account_name),+ std::make_shared<Azure::Identity::DefaultAzureCredential>());
case CredentialKind::kClientSecret:
case CredentialKind::kManagedIdentity:
case CredentialKind::kWorkloadIdentity:
@@ -186,10 +184,9 @@ AzureOptions::MakeDataLakeServiceClient() const {
return std::make_unique<DataLake::DataLakeServiceClient>(
AccountDfsUrl(account_name));
case CredentialKind::kDefault:
- if (!token_credential_) {- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();- }- [[fallthrough]];+ return std::make_unique<DataLake::DataLakeServiceClient>(+ AccountDfsUrl(account_name),+ std::make_shared<Azure::Identity::DefaultAzureCredential>());
case CredentialKind::kClientSecret:
case CredentialKind::kManagedIdentity:
case CredentialKind::kWorkloadIdentity:
diff --git a/cpp/src/arrow/filesystem/azurefs.h b/cpp/src/arrow/filesystem/azurefs.h
index 55f89ba47..ba612f799 100644
--- a/cpp/src/arrow/filesystem/azurefs.h+++ b/cpp/src/arrow/filesystem/azurefs.h@@ -117,7 +117,7 @@ struct ARROW_EXPORT AzureOptions {
std::shared_ptr<Azure::Storage::StorageSharedKeyCredential>
storage_shared_key_credential_;
- mutable std::shared_ptr<Azure::Core::Credentials::TokenCredential> token_credential_;+ std::shared_ptr<Azure::Core::Credentials::TokenCredential> token_credential_;
public:
AzureOptions();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Creating DefaultAzureCredential is a lot of non-trivial work: env vars, multiple allocations and probes. We can't assume it to be a cheap operation. mutable is a common solution to lazily-initialized class members and this one has a very well-defined behavior: it's set once, then it doesn't change at all anymore.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And it's important that we do mutate it in ConfigureDefaultCredential because the user might want to explicitly initialize the credential immediately after doing something with the env variables used by the Azure SDK or right before unsetting the variables.

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes awaiting change review Awaiting change review and removed awaiting committer review Awaiting committer review awaiting changes Awaiting changes labels Jan 4, 2024
@felipecrv
felipecrv requested a review from kouJanuary 5, 2024 01:36
@felipecrv

Copy link
Copy Markdown
ContributorAuthor

Rebased and force-pushed after the merge of my bigger PR related to directory semantics.

@Tom-NewtonTom-Newton left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@felipecrv
felipecrv merged commit 33c64ed into apache:mainJan 5, 2024
@felipecrvfelipecrv removed the awaiting change review Awaiting change review label Jan 5, 2024
@felipecrv
felipecrv deleted the azure_auth branch January 5, 2024 23:34
@conbench-apache-arrow

Copy link
Copy Markdown

After merging your PR, Conbench analyzed the 6 benchmarking runs that have been run so far on merge-commit 33c64ed.

There were no benchmark performance regressions. 🎉

The full Conbench report has more details. It also includes information about 4 possible false positives for unstable benchmarks that are known to sometimes produce them.

dgreiss pushed a commit to dgreiss/arrow that referenced this pull request Feb 19, 2024
…pport anonymous credentials explicitly (apache#39450)
### Rationale for this change
- Default credentials should be used by default.
- There should be a way to connect to public containers without credentials (aka "anonymous credential").
### What changes are included in this PR?
- Sync ordering of declarations and definitions in the `AzureOptions` classs
- Use default credentials even when `ConfigureDefaultCredential()` isn't explicitly called
- Create clients when `credential_kind_` is "anonymous" instead of returning an error
### Are these changes tested?
By new and existing tests.
* Closes: apache#39449
Lead-authored-by: Felipe Oliveira Carvalho <felipekde@gmail.com>
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
Signed-off-by: Felipe Oliveira Carvalho <felipekde@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[C++][FS] Use default Azure credentials implicitly and support anonymous credentials explictly

3 participants

@felipecrv@kou@Tom-Newton
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

GH-39449: [C++] Use default Azure credentials implicitly and support anonymous credentials explicitly - #39450

Merged
felipecrv merged 6 commits into
apache:mainfrom
felipecrv:azure_auth
Jan 5, 2024
Merged

GH-39449: [C++] Use default Azure credentials implicitly and support anonymous credentials explicitly#39450
felipecrv merged 6 commits into
apache:mainfrom
felipecrv:azure_auth

Conversation

@felipecrv

@felipecrvfelipecrv commented Jan 4, 2024

Copy link
Copy Markdown
Contributor

Rationale for this change

  • Default credentials should be used by default.
  • There should be a way to connect to public containers without credentials (aka "anonymous credential").

What changes are included in this PR?

  • Sync ordering of declarations and definitions in the AzureOptions classs
  • Use default credentials even when ConfigureDefaultCredential() isn't explicitly called
  • Create clients when credential_kind_ is "anonymous" instead of returning an error

Are these changes tested?

By new and existing tests.

@github-actions

Copy link
Copy Markdown

⚠️ GitHub issue #39449has been automatically assigned in GitHub to PR creator.

@felipecrv
felipecrv marked this pull request as ready for review January 4, 2024 01:44
@felipecrv
felipecrv requested a review from kouJanuary 4, 2024 01:44
@felipecrv

Copy link
Copy Markdown
ContributorAuthor

@Tom-Newton

@felipecrvfelipecrv added this to the 15.0.0 milestone Jan 4, 2024
Comment threadcpp/src/arrow/filesystem/azurefs_test.cc Outdated
Comment threadcpp/src/arrow/filesystem/azurefs.h Outdated
Comment on lines 97 to 115

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we really need to change this. I would rather just keep kTokenCredential to cover all the credentials that are based on https://github.com/Azure/azure-sdk-for-cpp/blob/e5e675440b44ace7d7a9e7bc303f877c06b59ea5/sdk/core/azure-core/inc/azure/core/credentials/credentials.hpp#L68

@felipecrvfelipecrvJan 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need this to support Equals. Think of it as runtime type-information that describes which concrete implementation of TokenCredential is being used.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Besides that, we would need to make a distinction between kDefault and all the others kToken at least (to support the implicit default behavior). It's clearer if we then make a distinction on all of them.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I would have done it differently but I don't feel strongly.

@github-actionsgithub-actionsBot added awaiting committer review Awaiting committer review and removed awaiting review Awaiting review labels Jan 4, 2024
Comment threadcpp/src/arrow/filesystem/azurefs_test.cc Outdated
Comment threadcpp/src/arrow/filesystem/azurefs.h Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about always creating Azure::Identity::DefaultAzureCredential instead of using mutable?

diff --git a/cpp/src/arrow/filesystem/azurefs.cc b/cpp/src/arrow/filesystem/azurefs.cc
index e98d56c73..5099cd25d 100644
--- a/cpp/src/arrow/filesystem/azurefs.cc+++ b/cpp/src/arrow/filesystem/azurefs.cc@@ -110,7 +110,6 @@ std::string AzureOptions::AccountDfsUrl(const std::string& account_name) const {
Status AzureOptions::ConfigureDefaultCredential() {
credential_kind_ = CredentialKind::kDefault;
- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();
return Status::OK();
}
@@ -160,10 +159,9 @@ Result<std::unique_ptr<Blobs::BlobServiceClient>> AzureOptions::MakeBlobServiceC
case CredentialKind::kAnonymous:
return std::make_unique<Blobs::BlobServiceClient>(AccountBlobUrl(account_name));
case CredentialKind::kDefault:
- if (!token_credential_) {- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();- }- [[fallthrough]];+ return std::make_unique<Blobs::BlobServiceClient>(+ AccountBlobUrl(account_name),+ std::make_shared<Azure::Identity::DefaultAzureCredential>());
case CredentialKind::kClientSecret:
case CredentialKind::kManagedIdentity:
case CredentialKind::kWorkloadIdentity:
@@ -186,10 +184,9 @@ AzureOptions::MakeDataLakeServiceClient() const {
return std::make_unique<DataLake::DataLakeServiceClient>(
AccountDfsUrl(account_name));
case CredentialKind::kDefault:
- if (!token_credential_) {- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();- }- [[fallthrough]];+ return std::make_unique<DataLake::DataLakeServiceClient>(+ AccountDfsUrl(account_name),+ std::make_shared<Azure::Identity::DefaultAzureCredential>());
case CredentialKind::kClientSecret:
case CredentialKind::kManagedIdentity:
case CredentialKind::kWorkloadIdentity:
diff --git a/cpp/src/arrow/filesystem/azurefs.h b/cpp/src/arrow/filesystem/azurefs.h
index 55f89ba47..ba612f799 100644
--- a/cpp/src/arrow/filesystem/azurefs.h+++ b/cpp/src/arrow/filesystem/azurefs.h@@ -117,7 +117,7 @@ struct ARROW_EXPORT AzureOptions {
std::shared_ptr<Azure::Storage::StorageSharedKeyCredential>
storage_shared_key_credential_;
- mutable std::shared_ptr<Azure::Core::Credentials::TokenCredential> token_credential_;+ std::shared_ptr<Azure::Core::Credentials::TokenCredential> token_credential_;
public:
AzureOptions();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Creating DefaultAzureCredential is a lot of non-trivial work: env vars, multiple allocations and probes. We can't assume it to be a cheap operation. mutable is a common solution to lazily-initialized class members and this one has a very well-defined behavior: it's set once, then it doesn't change at all anymore.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And it's important that we do mutate it in ConfigureDefaultCredential because the user might want to explicitly initialize the credential immediately after doing something with the env variables used by the Azure SDK or right before unsetting the variables.

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes awaiting change review Awaiting change review and removed awaiting committer review Awaiting committer review awaiting changes Awaiting changes labels Jan 4, 2024
@felipecrv
felipecrv requested a review from kouJanuary 5, 2024 01:36
@felipecrv

Copy link
Copy Markdown
ContributorAuthor

Rebased and force-pushed after the merge of my bigger PR related to directory semantics.

@Tom-NewtonTom-Newton left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@felipecrv
felipecrv merged commit 33c64ed into apache:mainJan 5, 2024
@felipecrvfelipecrv removed the awaiting change review Awaiting change review label Jan 5, 2024
@felipecrv
felipecrv deleted the azure_auth branch January 5, 2024 23:34
@conbench-apache-arrow

Copy link
Copy Markdown

After merging your PR, Conbench analyzed the 6 benchmarking runs that have been run so far on merge-commit 33c64ed.

There were no benchmark performance regressions. 🎉

The full Conbench report has more details. It also includes information about 4 possible false positives for unstable benchmarks that are known to sometimes produce them.

dgreiss pushed a commit to dgreiss/arrow that referenced this pull request Feb 19, 2024
…pport anonymous credentials explicitly (apache#39450)
### Rationale for this change
- Default credentials should be used by default.
- There should be a way to connect to public containers without credentials (aka "anonymous credential").
### What changes are included in this PR?
- Sync ordering of declarations and definitions in the `AzureOptions` classs
- Use default credentials even when `ConfigureDefaultCredential()` isn't explicitly called
- Create clients when `credential_kind_` is "anonymous" instead of returning an error
### Are these changes tested?
By new and existing tests.
* Closes: apache#39449
Lead-authored-by: Felipe Oliveira Carvalho <felipekde@gmail.com>
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
Signed-off-by: Felipe Oliveira Carvalho <felipekde@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[C++][FS] Use default Azure credentials implicitly and support anonymous credentials explictly

3 participants

@felipecrv@kou@Tom-Newton
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

GH-39449: [C++] Use default Azure credentials implicitly and support anonymous credentials explicitly - #39450

Merged
felipecrv merged 6 commits into
apache:mainfrom
felipecrv:azure_auth
Jan 5, 2024
Merged

GH-39449: [C++] Use default Azure credentials implicitly and support anonymous credentials explicitly#39450
felipecrv merged 6 commits into
apache:mainfrom
felipecrv:azure_auth

Conversation

@felipecrv

@felipecrvfelipecrv commented Jan 4, 2024

Copy link
Copy Markdown
Contributor

Rationale for this change

  • Default credentials should be used by default.
  • There should be a way to connect to public containers without credentials (aka "anonymous credential").

What changes are included in this PR?

  • Sync ordering of declarations and definitions in the AzureOptions classs
  • Use default credentials even when ConfigureDefaultCredential() isn't explicitly called
  • Create clients when credential_kind_ is "anonymous" instead of returning an error

Are these changes tested?

By new and existing tests.

@github-actions

Copy link
Copy Markdown

⚠️ GitHub issue #39449has been automatically assigned in GitHub to PR creator.

@felipecrv
felipecrv marked this pull request as ready for review January 4, 2024 01:44
@felipecrv
felipecrv requested a review from kouJanuary 4, 2024 01:44
@felipecrv

Copy link
Copy Markdown
ContributorAuthor

@Tom-Newton

@felipecrvfelipecrv added this to the 15.0.0 milestone Jan 4, 2024
Comment threadcpp/src/arrow/filesystem/azurefs_test.cc Outdated
Comment threadcpp/src/arrow/filesystem/azurefs.h Outdated
Comment on lines 97 to 115

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we really need to change this. I would rather just keep kTokenCredential to cover all the credentials that are based on https://github.com/Azure/azure-sdk-for-cpp/blob/e5e675440b44ace7d7a9e7bc303f877c06b59ea5/sdk/core/azure-core/inc/azure/core/credentials/credentials.hpp#L68

@felipecrvfelipecrvJan 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need this to support Equals. Think of it as runtime type-information that describes which concrete implementation of TokenCredential is being used.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Besides that, we would need to make a distinction between kDefault and all the others kToken at least (to support the implicit default behavior). It's clearer if we then make a distinction on all of them.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I would have done it differently but I don't feel strongly.

@github-actionsgithub-actionsBot added awaiting committer review Awaiting committer review and removed awaiting review Awaiting review labels Jan 4, 2024
Comment threadcpp/src/arrow/filesystem/azurefs_test.cc Outdated
Comment threadcpp/src/arrow/filesystem/azurefs.h Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about always creating Azure::Identity::DefaultAzureCredential instead of using mutable?

diff --git a/cpp/src/arrow/filesystem/azurefs.cc b/cpp/src/arrow/filesystem/azurefs.cc
index e98d56c73..5099cd25d 100644
--- a/cpp/src/arrow/filesystem/azurefs.cc+++ b/cpp/src/arrow/filesystem/azurefs.cc@@ -110,7 +110,6 @@ std::string AzureOptions::AccountDfsUrl(const std::string& account_name) const {
Status AzureOptions::ConfigureDefaultCredential() {
credential_kind_ = CredentialKind::kDefault;
- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();
return Status::OK();
}
@@ -160,10 +159,9 @@ Result<std::unique_ptr<Blobs::BlobServiceClient>> AzureOptions::MakeBlobServiceC
case CredentialKind::kAnonymous:
return std::make_unique<Blobs::BlobServiceClient>(AccountBlobUrl(account_name));
case CredentialKind::kDefault:
- if (!token_credential_) {- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();- }- [[fallthrough]];+ return std::make_unique<Blobs::BlobServiceClient>(+ AccountBlobUrl(account_name),+ std::make_shared<Azure::Identity::DefaultAzureCredential>());
case CredentialKind::kClientSecret:
case CredentialKind::kManagedIdentity:
case CredentialKind::kWorkloadIdentity:
@@ -186,10 +184,9 @@ AzureOptions::MakeDataLakeServiceClient() const {
return std::make_unique<DataLake::DataLakeServiceClient>(
AccountDfsUrl(account_name));
case CredentialKind::kDefault:
- if (!token_credential_) {- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();- }- [[fallthrough]];+ return std::make_unique<DataLake::DataLakeServiceClient>(+ AccountDfsUrl(account_name),+ std::make_shared<Azure::Identity::DefaultAzureCredential>());
case CredentialKind::kClientSecret:
case CredentialKind::kManagedIdentity:
case CredentialKind::kWorkloadIdentity:
diff --git a/cpp/src/arrow/filesystem/azurefs.h b/cpp/src/arrow/filesystem/azurefs.h
index 55f89ba47..ba612f799 100644
--- a/cpp/src/arrow/filesystem/azurefs.h+++ b/cpp/src/arrow/filesystem/azurefs.h@@ -117,7 +117,7 @@ struct ARROW_EXPORT AzureOptions {
std::shared_ptr<Azure::Storage::StorageSharedKeyCredential>
storage_shared_key_credential_;
- mutable std::shared_ptr<Azure::Core::Credentials::TokenCredential> token_credential_;+ std::shared_ptr<Azure::Core::Credentials::TokenCredential> token_credential_;
public:
AzureOptions();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Creating DefaultAzureCredential is a lot of non-trivial work: env vars, multiple allocations and probes. We can't assume it to be a cheap operation. mutable is a common solution to lazily-initialized class members and this one has a very well-defined behavior: it's set once, then it doesn't change at all anymore.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And it's important that we do mutate it in ConfigureDefaultCredential because the user might want to explicitly initialize the credential immediately after doing something with the env variables used by the Azure SDK or right before unsetting the variables.

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes awaiting change review Awaiting change review and removed awaiting committer review Awaiting committer review awaiting changes Awaiting changes labels Jan 4, 2024
@felipecrv
felipecrv requested a review from kouJanuary 5, 2024 01:36
@felipecrv

Copy link
Copy Markdown
ContributorAuthor

Rebased and force-pushed after the merge of my bigger PR related to directory semantics.

@Tom-NewtonTom-Newton left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@felipecrv
felipecrv merged commit 33c64ed into apache:mainJan 5, 2024
@felipecrvfelipecrv removed the awaiting change review Awaiting change review label Jan 5, 2024
@felipecrv
felipecrv deleted the azure_auth branch January 5, 2024 23:34
@conbench-apache-arrow

Copy link
Copy Markdown

After merging your PR, Conbench analyzed the 6 benchmarking runs that have been run so far on merge-commit 33c64ed.

There were no benchmark performance regressions. 🎉

The full Conbench report has more details. It also includes information about 4 possible false positives for unstable benchmarks that are known to sometimes produce them.

dgreiss pushed a commit to dgreiss/arrow that referenced this pull request Feb 19, 2024
…pport anonymous credentials explicitly (apache#39450)
### Rationale for this change
- Default credentials should be used by default.
- There should be a way to connect to public containers without credentials (aka "anonymous credential").
### What changes are included in this PR?
- Sync ordering of declarations and definitions in the `AzureOptions` classs
- Use default credentials even when `ConfigureDefaultCredential()` isn't explicitly called
- Create clients when `credential_kind_` is "anonymous" instead of returning an error
### Are these changes tested?
By new and existing tests.
* Closes: apache#39449
Lead-authored-by: Felipe Oliveira Carvalho <felipekde@gmail.com>
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
Signed-off-by: Felipe Oliveira Carvalho <felipekde@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[C++][FS] Use default Azure credentials implicitly and support anonymous credentials explictly

3 participants

@felipecrv@kou@Tom-Newton
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

GH-39449: [C++] Use default Azure credentials implicitly and support anonymous credentials explicitly - #39450

Merged
felipecrv merged 6 commits into
apache:mainfrom
felipecrv:azure_auth
Jan 5, 2024
Merged

GH-39449: [C++] Use default Azure credentials implicitly and support anonymous credentials explicitly#39450
felipecrv merged 6 commits into
apache:mainfrom
felipecrv:azure_auth

Conversation

@felipecrv

@felipecrvfelipecrv commented Jan 4, 2024

Copy link
Copy Markdown
Contributor

Rationale for this change

  • Default credentials should be used by default.
  • There should be a way to connect to public containers without credentials (aka "anonymous credential").

What changes are included in this PR?

  • Sync ordering of declarations and definitions in the AzureOptions classs
  • Use default credentials even when ConfigureDefaultCredential() isn't explicitly called
  • Create clients when credential_kind_ is "anonymous" instead of returning an error

Are these changes tested?

By new and existing tests.

@github-actions

Copy link
Copy Markdown

⚠️ GitHub issue #39449has been automatically assigned in GitHub to PR creator.

@felipecrv
felipecrv marked this pull request as ready for review January 4, 2024 01:44
@felipecrv
felipecrv requested a review from kouJanuary 4, 2024 01:44
@felipecrv

Copy link
Copy Markdown
ContributorAuthor

@Tom-Newton

@felipecrvfelipecrv added this to the 15.0.0 milestone Jan 4, 2024
Comment threadcpp/src/arrow/filesystem/azurefs_test.cc Outdated
Comment threadcpp/src/arrow/filesystem/azurefs.h Outdated
Comment on lines 97 to 115

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we really need to change this. I would rather just keep kTokenCredential to cover all the credentials that are based on https://github.com/Azure/azure-sdk-for-cpp/blob/e5e675440b44ace7d7a9e7bc303f877c06b59ea5/sdk/core/azure-core/inc/azure/core/credentials/credentials.hpp#L68

@felipecrvfelipecrvJan 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need this to support Equals. Think of it as runtime type-information that describes which concrete implementation of TokenCredential is being used.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Besides that, we would need to make a distinction between kDefault and all the others kToken at least (to support the implicit default behavior). It's clearer if we then make a distinction on all of them.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I would have done it differently but I don't feel strongly.

@github-actionsgithub-actionsBot added awaiting committer review Awaiting committer review and removed awaiting review Awaiting review labels Jan 4, 2024
Comment threadcpp/src/arrow/filesystem/azurefs_test.cc Outdated
Comment threadcpp/src/arrow/filesystem/azurefs.h Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about always creating Azure::Identity::DefaultAzureCredential instead of using mutable?

diff --git a/cpp/src/arrow/filesystem/azurefs.cc b/cpp/src/arrow/filesystem/azurefs.cc
index e98d56c73..5099cd25d 100644
--- a/cpp/src/arrow/filesystem/azurefs.cc+++ b/cpp/src/arrow/filesystem/azurefs.cc@@ -110,7 +110,6 @@ std::string AzureOptions::AccountDfsUrl(const std::string& account_name) const {
Status AzureOptions::ConfigureDefaultCredential() {
credential_kind_ = CredentialKind::kDefault;
- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();
return Status::OK();
}
@@ -160,10 +159,9 @@ Result<std::unique_ptr<Blobs::BlobServiceClient>> AzureOptions::MakeBlobServiceC
case CredentialKind::kAnonymous:
return std::make_unique<Blobs::BlobServiceClient>(AccountBlobUrl(account_name));
case CredentialKind::kDefault:
- if (!token_credential_) {- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();- }- [[fallthrough]];+ return std::make_unique<Blobs::BlobServiceClient>(+ AccountBlobUrl(account_name),+ std::make_shared<Azure::Identity::DefaultAzureCredential>());
case CredentialKind::kClientSecret:
case CredentialKind::kManagedIdentity:
case CredentialKind::kWorkloadIdentity:
@@ -186,10 +184,9 @@ AzureOptions::MakeDataLakeServiceClient() const {
return std::make_unique<DataLake::DataLakeServiceClient>(
AccountDfsUrl(account_name));
case CredentialKind::kDefault:
- if (!token_credential_) {- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();- }- [[fallthrough]];+ return std::make_unique<DataLake::DataLakeServiceClient>(+ AccountDfsUrl(account_name),+ std::make_shared<Azure::Identity::DefaultAzureCredential>());
case CredentialKind::kClientSecret:
case CredentialKind::kManagedIdentity:
case CredentialKind::kWorkloadIdentity:
diff --git a/cpp/src/arrow/filesystem/azurefs.h b/cpp/src/arrow/filesystem/azurefs.h
index 55f89ba47..ba612f799 100644
--- a/cpp/src/arrow/filesystem/azurefs.h+++ b/cpp/src/arrow/filesystem/azurefs.h@@ -117,7 +117,7 @@ struct ARROW_EXPORT AzureOptions {
std::shared_ptr<Azure::Storage::StorageSharedKeyCredential>
storage_shared_key_credential_;
- mutable std::shared_ptr<Azure::Core::Credentials::TokenCredential> token_credential_;+ std::shared_ptr<Azure::Core::Credentials::TokenCredential> token_credential_;
public:
AzureOptions();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Creating DefaultAzureCredential is a lot of non-trivial work: env vars, multiple allocations and probes. We can't assume it to be a cheap operation. mutable is a common solution to lazily-initialized class members and this one has a very well-defined behavior: it's set once, then it doesn't change at all anymore.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And it's important that we do mutate it in ConfigureDefaultCredential because the user might want to explicitly initialize the credential immediately after doing something with the env variables used by the Azure SDK or right before unsetting the variables.

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes awaiting change review Awaiting change review and removed awaiting committer review Awaiting committer review awaiting changes Awaiting changes labels Jan 4, 2024
@felipecrv
felipecrv requested a review from kouJanuary 5, 2024 01:36
@felipecrv

Copy link
Copy Markdown
ContributorAuthor

Rebased and force-pushed after the merge of my bigger PR related to directory semantics.

@Tom-NewtonTom-Newton left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@felipecrv
felipecrv merged commit 33c64ed into apache:mainJan 5, 2024
@felipecrvfelipecrv removed the awaiting change review Awaiting change review label Jan 5, 2024
@felipecrv
felipecrv deleted the azure_auth branch January 5, 2024 23:34
@conbench-apache-arrow

Copy link
Copy Markdown

After merging your PR, Conbench analyzed the 6 benchmarking runs that have been run so far on merge-commit 33c64ed.

There were no benchmark performance regressions. 🎉

The full Conbench report has more details. It also includes information about 4 possible false positives for unstable benchmarks that are known to sometimes produce them.

dgreiss pushed a commit to dgreiss/arrow that referenced this pull request Feb 19, 2024
…pport anonymous credentials explicitly (apache#39450)
### Rationale for this change
- Default credentials should be used by default.
- There should be a way to connect to public containers without credentials (aka "anonymous credential").
### What changes are included in this PR?
- Sync ordering of declarations and definitions in the `AzureOptions` classs
- Use default credentials even when `ConfigureDefaultCredential()` isn't explicitly called
- Create clients when `credential_kind_` is "anonymous" instead of returning an error
### Are these changes tested?
By new and existing tests.
* Closes: apache#39449
Lead-authored-by: Felipe Oliveira Carvalho <felipekde@gmail.com>
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
Signed-off-by: Felipe Oliveira Carvalho <felipekde@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[C++][FS] Use default Azure credentials implicitly and support anonymous credentials explictly

3 participants

@felipecrv@kou@Tom-Newton
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

GH-39449: [C++] Use default Azure credentials implicitly and support anonymous credentials explicitly - #39450

Merged
felipecrv merged 6 commits into
apache:mainfrom
felipecrv:azure_auth
Jan 5, 2024
Merged

GH-39449: [C++] Use default Azure credentials implicitly and support anonymous credentials explicitly#39450
felipecrv merged 6 commits into
apache:mainfrom
felipecrv:azure_auth

Conversation

@felipecrv

@felipecrvfelipecrv commented Jan 4, 2024

Copy link
Copy Markdown
Contributor

Rationale for this change

  • Default credentials should be used by default.
  • There should be a way to connect to public containers without credentials (aka "anonymous credential").

What changes are included in this PR?

  • Sync ordering of declarations and definitions in the AzureOptions classs
  • Use default credentials even when ConfigureDefaultCredential() isn't explicitly called
  • Create clients when credential_kind_ is "anonymous" instead of returning an error

Are these changes tested?

By new and existing tests.

@github-actions

Copy link
Copy Markdown

⚠️ GitHub issue #39449has been automatically assigned in GitHub to PR creator.

@felipecrv
felipecrv marked this pull request as ready for review January 4, 2024 01:44
@felipecrv
felipecrv requested a review from kouJanuary 4, 2024 01:44
@felipecrv

Copy link
Copy Markdown
ContributorAuthor

@Tom-Newton

@felipecrvfelipecrv added this to the 15.0.0 milestone Jan 4, 2024
Comment threadcpp/src/arrow/filesystem/azurefs_test.cc Outdated
Comment threadcpp/src/arrow/filesystem/azurefs.h Outdated
Comment on lines 97 to 115

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we really need to change this. I would rather just keep kTokenCredential to cover all the credentials that are based on https://github.com/Azure/azure-sdk-for-cpp/blob/e5e675440b44ace7d7a9e7bc303f877c06b59ea5/sdk/core/azure-core/inc/azure/core/credentials/credentials.hpp#L68

@felipecrvfelipecrvJan 4, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need this to support Equals. Think of it as runtime type-information that describes which concrete implementation of TokenCredential is being used.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Besides that, we would need to make a distinction between kDefault and all the others kToken at least (to support the implicit default behavior). It's clearer if we then make a distinction on all of them.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I would have done it differently but I don't feel strongly.

@github-actionsgithub-actionsBot added awaiting committer review Awaiting committer review and removed awaiting review Awaiting review labels Jan 4, 2024
Comment threadcpp/src/arrow/filesystem/azurefs_test.cc Outdated
Comment threadcpp/src/arrow/filesystem/azurefs.h Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about always creating Azure::Identity::DefaultAzureCredential instead of using mutable?

diff --git a/cpp/src/arrow/filesystem/azurefs.cc b/cpp/src/arrow/filesystem/azurefs.cc
index e98d56c73..5099cd25d 100644
--- a/cpp/src/arrow/filesystem/azurefs.cc+++ b/cpp/src/arrow/filesystem/azurefs.cc@@ -110,7 +110,6 @@ std::string AzureOptions::AccountDfsUrl(const std::string& account_name) const {
Status AzureOptions::ConfigureDefaultCredential() {
credential_kind_ = CredentialKind::kDefault;
- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();
return Status::OK();
}
@@ -160,10 +159,9 @@ Result<std::unique_ptr<Blobs::BlobServiceClient>> AzureOptions::MakeBlobServiceC
case CredentialKind::kAnonymous:
return std::make_unique<Blobs::BlobServiceClient>(AccountBlobUrl(account_name));
case CredentialKind::kDefault:
- if (!token_credential_) {- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();- }- [[fallthrough]];+ return std::make_unique<Blobs::BlobServiceClient>(+ AccountBlobUrl(account_name),+ std::make_shared<Azure::Identity::DefaultAzureCredential>());
case CredentialKind::kClientSecret:
case CredentialKind::kManagedIdentity:
case CredentialKind::kWorkloadIdentity:
@@ -186,10 +184,9 @@ AzureOptions::MakeDataLakeServiceClient() const {
return std::make_unique<DataLake::DataLakeServiceClient>(
AccountDfsUrl(account_name));
case CredentialKind::kDefault:
- if (!token_credential_) {- token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();- }- [[fallthrough]];+ return std::make_unique<DataLake::DataLakeServiceClient>(+ AccountDfsUrl(account_name),+ std::make_shared<Azure::Identity::DefaultAzureCredential>());
case CredentialKind::kClientSecret:
case CredentialKind::kManagedIdentity:
case CredentialKind::kWorkloadIdentity:
diff --git a/cpp/src/arrow/filesystem/azurefs.h b/cpp/src/arrow/filesystem/azurefs.h
index 55f89ba47..ba612f799 100644
--- a/cpp/src/arrow/filesystem/azurefs.h+++ b/cpp/src/arrow/filesystem/azurefs.h@@ -117,7 +117,7 @@ struct ARROW_EXPORT AzureOptions {
std::shared_ptr<Azure::Storage::StorageSharedKeyCredential>
storage_shared_key_credential_;
- mutable std::shared_ptr<Azure::Core::Credentials::TokenCredential> token_credential_;+ std::shared_ptr<Azure::Core::Credentials::TokenCredential> token_credential_;
public:
AzureOptions();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Creating DefaultAzureCredential is a lot of non-trivial work: env vars, multiple allocations and probes. We can't assume it to be a cheap operation. mutable is a common solution to lazily-initialized class members and this one has a very well-defined behavior: it's set once, then it doesn't change at all anymore.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And it's important that we do mutate it in ConfigureDefaultCredential because the user might want to explicitly initialize the credential immediately after doing something with the env variables used by the Azure SDK or right before unsetting the variables.

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes awaiting change review Awaiting change review and removed awaiting committer review Awaiting committer review awaiting changes Awaiting changes labels Jan 4, 2024
@felipecrv
felipecrv requested a review from kouJanuary 5, 2024 01:36
@felipecrv

Copy link
Copy Markdown
ContributorAuthor

Rebased and force-pushed after the merge of my bigger PR related to directory semantics.

@Tom-NewtonTom-Newton left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@felipecrv
felipecrv merged commit 33c64ed into apache:mainJan 5, 2024
@felipecrvfelipecrv removed the awaiting change review Awaiting change review label Jan 5, 2024
@felipecrv
felipecrv deleted the azure_auth branch January 5, 2024 23:34
@conbench-apache-arrow

Copy link
Copy Markdown

After merging your PR, Conbench analyzed the 6 benchmarking runs that have been run so far on merge-commit 33c64ed.

There were no benchmark performance regressions. 🎉

The full Conbench report has more details. It also includes information about 4 possible false positives for unstable benchmarks that are known to sometimes produce them.

dgreiss pushed a commit to dgreiss/arrow that referenced this pull request Feb 19, 2024
…pport anonymous credentials explicitly (apache#39450)
### Rationale for this change
- Default credentials should be used by default.
- There should be a way to connect to public containers without credentials (aka "anonymous credential").
### What changes are included in this PR?
- Sync ordering of declarations and definitions in the `AzureOptions` classs
- Use default credentials even when `ConfigureDefaultCredential()` isn't explicitly called
- Create clients when `credential_kind_` is "anonymous" instead of returning an error
### Are these changes tested?
By new and existing tests.
* Closes: apache#39449
Lead-authored-by: Felipe Oliveira Carvalho <felipekde@gmail.com>
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
Signed-off-by: Felipe Oliveira Carvalho <felipekde@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[C++][FS] Use default Azure credentials implicitly and support anonymous credentials explictly

3 participants

@felipecrv@kou@Tom-Newton