Set necessary headers when authenticating via Azure CLI #136
Conversation
This file contains 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
mgyucht
changed the title
pietern
approved these changes
Aug 18, 2023
| LOG.debug("Not including service management token in headers", e); | ||
| mgmtTokenSource = null; | ||
| } | ||
| CliTokenSource finalMgmtTokenSource = mgmtTokenSource; |
There was a problem hiding this comment.
What is final about it? Seems like the alias is not necessary below.
There was a problem hiding this comment.
Java compiler doesn't allow capturing non-final variables in closures. https://www.baeldung.com/java-lambda-effectively-final-local-variables#capturing-lambdas
mgyucht
deleted the
add-x-databricks-azure-workspace-resource-id-header
branch
mgyucht
added a commit
that referenced
this pull request
Aug 18, 2023
* Added support for `dbutils.secrets` ([#132](#132)). * Added retry in `w.clusters().ensureClusterIsRunning(id)` when cluster is simultaneously started by two different processes ([#134](#134)). * Set necessary headers when authenticating via Azure CLI ([#136](#136)). New Services: * Added `workspaceClient.artifactAllowlists()` service. * Added `workspaceClient.securableTags()` service. * Added `workspaceClient.subentityTags()` service. * Added `com.databricks.sdk.service.catalog.ArtifactAllowlistInfo` class. * Added `com.databricks.sdk.service.catalog.ArtifactMatcher` class. * Added `com.databricks.sdk.service.catalog.ArtifactType` class. * Added `com.databricks.sdk.service.catalog.GetArtifactAllowlistRequest` class. * Added `com.databricks.sdk.service.catalog.ListSecurableTagsRequest` class. * Added `com.databricks.sdk.service.catalog.ListSecurableType` class. * Added `com.databricks.sdk.service.catalog.ListSubentityTagsRequest` class. * Added `com.databricks.sdk.service.catalog.MatchType` class. * Added `com.databricks.sdk.service.catalog.SetArtifactAllowlist` class. * Added `com.databricks.sdk.service.catalog.TagChanges` class. * Added `com.databricks.sdk.service.catalog.TagKeyValuePair` class. * Added `com.databricks.sdk.service.catalog.TagSecurable` class. * Added `com.databricks.sdk.service.catalog.TagSecurableAssignment` class. * Added `com.databricks.sdk.service.catalog.TagSecurableAssignmentsList` class. * Added `com.databricks.sdk.service.catalog.TagSubentity` class. * Added `com.databricks.sdk.service.catalog.TagSubentityAssignmentsList` class. * Added `com.databricks.sdk.service.catalog.TagsSubentityAssignment` class. * Added `com.databricks.sdk.service.catalog.UpdateSecurableType` class. * Added `com.databricks.sdk.service.catalog.UpdateTags` class. New APIs: * Added `deleteRuns()` method for `workspaceClient.experiments()` service. * Added `restoreRuns()` method for `workspaceClient.experiments()` service. * Added `com.databricks.sdk.service.ml.DeleteRuns` class. * Added `com.databricks.sdk.service.ml.DeleteRunsResponse` class. * Added `com.databricks.sdk.service.ml.RestoreRuns` class. * Added `com.databricks.sdk.service.ml.RestoreRunsResponse` class. * Added `getSecret()` method for `workspaceClient.secrets()` service. * Added `com.databricks.sdk.service.workspace.GetSecretRequest` class. * Added `com.databricks.sdk.service.workspace.GetSecretResponse` class. API Renames: * Renamed `effectiveAutoMaintenanceFlag` field to `effectivePredictiveOptimizationFlag` field for `com.databricks.sdk.service.catalog.CatalogInfo`. * Renamed `enableAutoMaintenance` field to `enablePredictiveOptimization` field for `com.databricks.sdk.service.catalog.CatalogInfo`. * Renamed `com.databricks.sdk.service.catalog.EffectiveAutoMaintenanceFlag` class to `com.databricks.sdk.service.catalog.EffectivePredictiveOptimizationFlag` class. * Renamed `com.databricks.sdk.service.catalog.EffectiveAutoMaintenanceFlagInheritedFromType` class to `com.databricks.sdk.service.catalog.EffectivePredictiveOptimizationFlagInheritedFromType`. * Renamed `com.databricks.sdk.service.catalog.EnableAutoMaintenance` class to `com.databricks.sdk.service.catalog.EnablePredictiveOptimization`. * Renamed `effectiveAutoMaintenanceFlag` field to `effectivePredictiveOptimizationFlag` field for `com.databricks.sdk.service.catalog.SchemaInfo`. * Renamed `enableAutoMaintenance` field to `enablePredictiveOptimization` field for `com.databricks.sdk.service.catalog.SchemaInfo`. * Renamed `effectiveAutoMaintenanceFlag` field to `effectivePredictiveOptimizationFlag` field for `com.databricks.sdk.service.catalog.TableInfo`. * Renamed `enableAutoMaintenance` field to `enablePredictiveOptimization` field for `com.databricks.sdk.service.catalog.TableInfo`. OpenAPI SHA: beff621d7b3e1d59244e2e34fc53a496f310e130, Date: 2023-08-17
Merged
github-merge-queue bot
pushed a commit
that referenced
this pull request
Aug 18, 2023
* Added support for `dbutils.secrets` ([#132](#132)). * Added retry in `w.clusters().ensureClusterIsRunning(id)` when cluster is simultaneously started by two different processes ([#134](#134)). * Set necessary headers when authenticating via Azure CLI ([#136](#136)). New Services: * Added `workspaceClient.artifactAllowlists()` service. * Added `workspaceClient.securableTags()` service. * Added `workspaceClient.subentityTags()` service. * Added `com.databricks.sdk.service.catalog.ArtifactAllowlistInfo` class. * Added `com.databricks.sdk.service.catalog.ArtifactMatcher` class. * Added `com.databricks.sdk.service.catalog.ArtifactType` class. * Added `com.databricks.sdk.service.catalog.GetArtifactAllowlistRequest` class. * Added `com.databricks.sdk.service.catalog.ListSecurableTagsRequest` class. * Added `com.databricks.sdk.service.catalog.ListSecurableType` class. * Added `com.databricks.sdk.service.catalog.ListSubentityTagsRequest` class. * Added `com.databricks.sdk.service.catalog.MatchType` class. * Added `com.databricks.sdk.service.catalog.SetArtifactAllowlist` class. * Added `com.databricks.sdk.service.catalog.TagChanges` class. * Added `com.databricks.sdk.service.catalog.TagKeyValuePair` class. * Added `com.databricks.sdk.service.catalog.TagSecurable` class. * Added `com.databricks.sdk.service.catalog.TagSecurableAssignment` class. * Added `com.databricks.sdk.service.catalog.TagSecurableAssignmentsList` class. * Added `com.databricks.sdk.service.catalog.TagSubentity` class. * Added `com.databricks.sdk.service.catalog.TagSubentityAssignmentsList` class. * Added `com.databricks.sdk.service.catalog.TagsSubentityAssignment` class. * Added `com.databricks.sdk.service.catalog.UpdateSecurableType` class. * Added `com.databricks.sdk.service.catalog.UpdateTags` class. New APIs: * Added `deleteRuns()` method for `workspaceClient.experiments()` service. * Added `restoreRuns()` method for `workspaceClient.experiments()` service. * Added `com.databricks.sdk.service.ml.DeleteRuns` class. * Added `com.databricks.sdk.service.ml.DeleteRunsResponse` class. * Added `com.databricks.sdk.service.ml.RestoreRuns` class. * Added `com.databricks.sdk.service.ml.RestoreRunsResponse` class. * Added `getSecret()` method for `workspaceClient.secrets()` service. * Added `com.databricks.sdk.service.workspace.GetSecretRequest` class. * Added `com.databricks.sdk.service.workspace.GetSecretResponse` class. API Renames: * Renamed `effectiveAutoMaintenanceFlag` field to `effectivePredictiveOptimizationFlag` field for `com.databricks.sdk.service.catalog.CatalogInfo`. * Renamed `enableAutoMaintenance` field to `enablePredictiveOptimization` field for `com.databricks.sdk.service.catalog.CatalogInfo`. * Renamed `com.databricks.sdk.service.catalog.EffectiveAutoMaintenanceFlag` class to `com.databricks.sdk.service.catalog.EffectivePredictiveOptimizationFlag` class. * Renamed `com.databricks.sdk.service.catalog.EffectiveAutoMaintenanceFlagInheritedFromType` class to `com.databricks.sdk.service.catalog.EffectivePredictiveOptimizationFlagInheritedFromType`. * Renamed `com.databricks.sdk.service.catalog.EnableAutoMaintenance` class to `com.databricks.sdk.service.catalog.EnablePredictiveOptimization`. * Renamed `effectiveAutoMaintenanceFlag` field to `effectivePredictiveOptimizationFlag` field for `com.databricks.sdk.service.catalog.SchemaInfo`. * Renamed `enableAutoMaintenance` field to `enablePredictiveOptimization` field for `com.databricks.sdk.service.catalog.SchemaInfo`. * Renamed `effectiveAutoMaintenanceFlag` field to `effectivePredictiveOptimizationFlag` field for `com.databricks.sdk.service.catalog.TableInfo`. * Renamed `enableAutoMaintenance` field to `enablePredictiveOptimization` field for `com.databricks.sdk.service.catalog.TableInfo`. OpenAPI SHA: beff621d7b3e1d59244e2e34fc53a496f310e130, Date: 2023-08-17
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Changes
The Java SDK request authentication logic is inconsistent between the Azure login types: for service principal auth, the SDK correctly adds the X-Databricks-Azure-Workspace-Resource-Id when configured, but this is missed for Azure CLI auth. Additionally, when logging in via Azure CLI using a service principal, the service management token must also be fetched from the CLI.
This PR fixes this by defining the logic to attach these header in a common function that is used by all Azure-specific authentication types.
See databricks/databricks-sdk-go#584 for the same change in the Go SDK.
See databricks/databricks-sdk-py#290 for the same changes in the Python SDK.
Tests