Skip to content

Commit c0168ff

Browse files
authored
Fix filling of active attribute in databricks_user data source (#5026)
## Changes <!-- Summary of your changes that are easy to understand --> Also fixed changelog entries Resolves #5025 ## Tests <!-- How is this tested? Please see the checklist below and also describe any other relevant tests --> - [x] `make test` run locally - [x] has entry in `NEXT_CHANGELOG.md` file
1 parent 3d94565 commit c0168ff

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

NEXT_CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66

77
### New Features and Improvements
88

9-
* Added `no_wait` option for `databricks_sql_endpoint` to skip waiting to start on warehouse creation
9+
* Added `no_wait` option for `databricks_sql_endpoint` to skip waiting to start on warehouse creation ([#5014](https://github.com/databricks/terraform-provider-databricks/pull/5014))
1010

1111
### Bug Fixes
1212

13-
* Remove incorrect customization for `databricks_catalog`
13+
* Remove incorrect customization for `databricks_catalog` ([#5021](https://github.com/databricks/terraform-provider-databricks/pull/5021))
14+
* Fix filling of `active` attribute in `databricks_user` data source ([#5026](https://github.com/databricks/terraform-provider-databricks/pull/5026))
1415

1516
### Documentation
1617

scim/data_user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
func getUser(usersAPI UsersAPI, id, name string) (user User, err error) {
1313
if id != "" {
14-
return usersAPI.Read(id, "userName,displayName,externalId,applicationId")
14+
return usersAPI.Read(id, "userName,displayName,externalId,applicationId,active")
1515
}
1616
userList, err := usersAPI.Filter(fmt.Sprintf(`userName eq "%s"`, name), true)
1717
if err != nil {

scim/data_user_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func TestDataSourceUserGerUser(t *testing.T) {
4949
qa.HTTPFixturesApply(t, []qa.HTTPFixture{
5050
{
5151
Method: "GET",
52-
Resource: "/api/2.0/preview/scim/v2/Users/a?attributes=userName,displayName,externalId,applicationId",
52+
Resource: "/api/2.0/preview/scim/v2/Users/a?attributes=userName,displayName,externalId,applicationId,active",
5353
Response: User{
5454
ID: "a",
5555
},

0 commit comments

Comments
 (0)