Fix reading of external_id for databricks_service_principal
#4712
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
During work on exporter I found that `external_id` wasn't filled for service principals and this lead to a problem with generation of correct code. The `databricks_user` had the correct code, so I unified the things
alexott
added a commit
that referenced
this pull request
May 15, 2025
…vice principals We should generate `application_id` only for Azure-managed service principals, while Databricks-managed SPs should have only name. Should be merged after #4712
5 tasks
tanmay-db
approved these changes
May 16, 2025
| @@ -101,12 +109,8 @@ func ResourceUser() common.Resource { | |||
| if err != nil { | |||
| return err | |||
| } | |||
| setCommonUserFields(d, user, user.UserName) | |||
There was a problem hiding this comment.
We can remove passing user.UserName since we are passing user so inside setCommonUserFields, we can use user.UserName directly.
There was a problem hiding this comment.
it's required because we need to pass different attributes (UserName for user and ApplicationId for service principal)
|
If integration tests don't run automatically, an authorized user can run them manually by following the instructions below: Trigger: Inputs:
Checks will be approved automatically on success. |
github-merge-queue bot
pushed a commit
that referenced
this pull request
May 18, 2025
…vice principals (#4716) ## Changes <!-- Summary of your changes that are easy to understand --> We should generate `application_id` only for Azure-managed service principals, while Databricks-managed SPs should have only name. Should be merged after #4712 ## Tests <!-- How is this tested? Please see the checklist below and also describe any other relevant tests --> - [x] `make test` run locally - [ ] relevant change in `docs/` folder - [ ] covered with integration tests in `internal/acceptance` - [ ] using Go SDK - [ ] using TF Plugin Framework
deco-sdk-tagging bot
added a commit
that referenced
this pull request
May 19, 2025
## Release v1.80.0 ### New Features and Improvements * Add `resource_model_serving_provisioned_throughput` for creation of [model serving provisioned throughput](https://docs.databricks.com/aws/en/machine-learning/foundation-model-apis/deploy-prov-throughput-foundation-model-apis) endpoints [#4701](#4701) * Replace DBFS with Unity Catalog resources in [index page](https://registry.terraform.io/providers/databricks/databricks/latest/docs) storage section [#4718](#4718) ### Bug Fixes * Support updating all attributes for `databricks_model_serving` ([#4575](#4575)). * Fix reading of `external_id` for `databricks_service_principal` [#4712](#4712) ### Documentation * Added documentation for GITHUB OIDC authentication type [#4717] (#4717) ### Exporter * Generate correct code for Databricks and Azure-managed service principals [#4715](#4715)
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
During work on exporter I found that
external_idwasn't filled for service principals and this lead to a problem with generation of correct code. Thedatabricks_userhad the correct code, so I unified the thingsTests
make testrun locallydocs/folderinternal/acceptance