Skip to content

Commit d7e401d

Browse files
nkvuongnkvuong
authored
Fix attributes typo in SCIM API (#2344)
* fix typo for scim * fix exporter test
1 parent 9bbb300 commit d7e401d

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

‎exporter/exporter_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ func TestImportingUsersGroupsSecretScopes(t *testing.T) {
420420
// TODO: add groups to the output
421421
{
422422
Method: "GET",
423-
Resource: "/api/2.0/preview/scim/v2/Users/123?attributes=userName,displayName,active,externalID,entitlements",
423+
Resource: "/api/2.0/preview/scim/v2/Users/123?attributes=userName,displayName,active,externalId,entitlements",
424424
Response: scim.User{ID: "123", DisplayName: "[email protected]", UserName: "[email protected]"},
425425
},
426426
{
@@ -1676,7 +1676,7 @@ func TestImportingDLTPipelines(t *testing.T) {
16761676
},
16771677
{
16781678
Method: "GET",
1679-
Resource: "/api/2.0/preview/scim/v2/Users/123?attributes=userName,displayName,active,externalID,entitlements",
1679+
Resource: "/api/2.0/preview/scim/v2/Users/123?attributes=userName,displayName,active,externalId,entitlements",
16801680
Response: scim.User{ID: "123", DisplayName: "[email protected]", UserName: "[email protected]"},
16811681
},
16821682
{

‎scim/resource_user.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func ResourceUser() *schema.Resource {
8181
return nil
8282
},
8383
Read: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
84-
user, err := NewUsersAPI(ctx, c).Read(d.Id(), "userName,displayName,active,externalID,entitlements")
84+
user, err := NewUsersAPI(ctx, c).Read(d.Id(), "userName,displayName,active,externalId,entitlements")
8585
if err != nil {
8686
return err
8787
}
@@ -98,7 +98,7 @@ func ResourceUser() *schema.Resource {
9898
if err != nil {
9999
return err
100100
}
101-
return NewUsersAPI(ctx, c).Update(d.Id(), "userName,displayName,active,externalID,entitlements", u)
101+
return NewUsersAPI(ctx, c).Update(d.Id(), "userName,displayName,active,externalId,entitlements", u)
102102
},
103103
Delete: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
104104
user := NewUsersAPI(ctx, c)
@@ -146,5 +146,5 @@ func createForceOverridesManuallyAddedUser(err error, d *schema.ResourceData, us
146146
}
147147
user := userList[0]
148148
d.SetId(user.ID)
149-
return usersAPI.Update(d.Id(), "userName,displayName,active,externalID,entitlements", u)
149+
return usersAPI.Update(d.Id(), "userName,displayName,active,externalId,entitlements", u)
150150
}

‎scim/resource_user_test.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func TestResourceUserRead(t *testing.T) {
1919
Fixtures: []qa.HTTPFixture{
2020
{
2121
Method: "GET",
22-
Resource: "/api/2.0/preview/scim/v2/Users/abc?attributes=userName,displayName,active,externalID,entitlements",
22+
Resource: "/api/2.0/preview/scim/v2/Users/abc?attributes=userName,displayName,active,externalId,entitlements",
2323
Response: User{
2424
ID: "abc",
2525
DisplayName: "Example user",
@@ -56,7 +56,7 @@ func TestResourceUserRead_NotFound(t *testing.T) {
5656
Fixtures: []qa.HTTPFixture{
5757
{
5858
Method: "GET",
59-
Resource: "/api/2.0/preview/scim/v2/Users/abc?attributes=userName,displayName,active,externalID,entitlements",
59+
Resource: "/api/2.0/preview/scim/v2/Users/abc?attributes=userName,displayName,active,externalId,entitlements",
6060
Status: 404,
6161
},
6262
},
@@ -73,7 +73,7 @@ func TestResourceUserRead_Error(t *testing.T) {
7373
Fixtures: []qa.HTTPFixture{
7474
{
7575
Method: "GET",
76-
Resource: "/api/2.0/preview/scim/v2/Users/abc?attributes=userName,displayName,active,externalID,entitlements",
76+
Resource: "/api/2.0/preview/scim/v2/Users/abc?attributes=userName,displayName,active,externalId,entitlements",
7777
Status: 400,
7878
Response: apierr.APIErrorBody{
7979
ScimDetail: "Something",
@@ -113,7 +113,7 @@ func TestResourceUserCreate(t *testing.T) {
113113
},
114114
{
115115
Method: "GET",
116-
Resource: "/api/2.0/preview/scim/v2/Users/abc?attributes=userName,displayName,active,externalID,entitlements",
116+
Resource: "/api/2.0/preview/scim/v2/Users/abc?attributes=userName,displayName,active,externalId,entitlements",
117117
Response: User{
118118
DisplayName: "Example user",
119119
Active: true,
@@ -177,7 +177,7 @@ func TestResourceUserCreateInactive(t *testing.T) {
177177
},
178178
{
179179
Method: "GET",
180-
Resource: "/api/2.0/preview/scim/v2/Users/abc?attributes=userName,displayName,active,externalID,entitlements",
180+
Resource: "/api/2.0/preview/scim/v2/Users/abc?attributes=userName,displayName,active,externalId,entitlements",
181181
Response: User{
182182
DisplayName: "Example user",
183183
Active: false,
@@ -271,7 +271,7 @@ func TestResourceUserUpdate(t *testing.T) {
271271
Fixtures: []qa.HTTPFixture{
272272
{
273273
Method: "GET",
274-
Resource: "/api/2.0/preview/scim/v2/Users/abc?attributes=userName,displayName,active,externalID,entitlements",
274+
Resource: "/api/2.0/preview/scim/v2/Users/abc?attributes=userName,displayName,active,externalId,entitlements",
275275
Response: User{
276276
DisplayName: "Example user",
277277
Active: true,
@@ -309,7 +309,7 @@ func TestResourceUserUpdate(t *testing.T) {
309309
},
310310
{
311311
Method: "GET",
312-
Resource: "/api/2.0/preview/scim/v2/Users/abc?attributes=userName,displayName,active,externalID,entitlements",
312+
Resource: "/api/2.0/preview/scim/v2/Users/abc?attributes=userName,displayName,active,externalId,entitlements",
313313
Response: newUser,
314314
},
315315
},
@@ -340,7 +340,7 @@ func TestResourceUserUpdate_Error(t *testing.T) {
340340
Fixtures: []qa.HTTPFixture{
341341
{
342342
Method: "GET",
343-
Resource: "/api/2.0/preview/scim/v2/Users/abc?attributes=userName,displayName,active,externalID,entitlements",
343+
Resource: "/api/2.0/preview/scim/v2/Users/abc?attributes=userName,displayName,active,externalId,entitlements",
344344
Status: 400,
345345
},
346346
},
@@ -362,7 +362,7 @@ func TestResourceUserUpdate_ErrorPut(t *testing.T) {
362362
Fixtures: []qa.HTTPFixture{
363363
{
364364
Method: "GET",
365-
Resource: "/api/2.0/preview/scim/v2/Users/abc?attributes=userName,displayName,active,externalID,entitlements",
365+
Resource: "/api/2.0/preview/scim/v2/Users/abc?attributes=userName,displayName,active,externalId,entitlements",
366366
Response: User{
367367
DisplayName: "Example user",
368368
Active: true,
@@ -658,7 +658,7 @@ func TestCreateForceOverwriteFindsAndSetsID(t *testing.T) {
658658
},
659659
{
660660
Method: "GET",
661-
Resource: "/api/2.0/preview/scim/v2/Users/abc?attributes=userName,displayName,active,externalID,entitlements",
661+
Resource: "/api/2.0/preview/scim/v2/Users/abc?attributes=userName,displayName,active,externalId,entitlements",
662662
Response: User{
663663
ID: "abc",
664664
},
@@ -700,7 +700,7 @@ func TestCreateForceOverwriteFindsAndSetsAccID(t *testing.T) {
700700
},
701701
{
702702
Method: "GET",
703-
Resource: "/api/2.0/preview/scim/v2/Users/abc?attributes=userName,displayName,active,externalID,entitlements",
703+
Resource: "/api/2.0/preview/scim/v2/Users/abc?attributes=userName,displayName,active,externalId,entitlements",
704704
Response: User{
705705
ID: "abc",
706706
},

0 commit comments

Comments
 (0)