|
6 | 6 | "regexp" |
7 | 7 | "strings" |
8 | 8 |
|
| 9 | + "github.com/databricks/terraform-provider-databricks/common" |
9 | 10 | "github.com/hashicorp/terraform-plugin-sdk/v2/diag" |
10 | 11 | "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" |
11 | 12 | ) |
@@ -42,21 +43,25 @@ func DataSourceCurrentUser() *schema.Resource { |
42 | 43 | }, |
43 | 44 | }, |
44 | 45 | ReadContext: func(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { |
45 | | - usersAPI := NewUsersAPI(ctx, m) |
46 | | - me, err := usersAPI.Me() |
| 46 | + c := m.(*common.DatabricksClient) |
| 47 | + w, err := c.WorkspaceClient() |
| 48 | + if err != nil { |
| 49 | + return diag.FromErr(err) |
| 50 | + } |
| 51 | + me, err := w.CurrentUser.Me(ctx) |
47 | 52 | if err != nil { |
48 | 53 | return diag.FromErr(err) |
49 | 54 | } |
50 | 55 | d.Set("user_name", me.UserName) |
51 | 56 | d.Set("home", fmt.Sprintf("/Users/%s", me.UserName)) |
52 | 57 | d.Set("repos", fmt.Sprintf("/Repos/%s", me.UserName)) |
53 | | - d.Set("external_id", me.ExternalID) |
| 58 | + d.Set("external_id", me.ExternalId) |
54 | 59 | splits := strings.Split(me.UserName, "@") |
55 | 60 | norm := nonAlphanumeric.ReplaceAllLiteralString(splits[0], "_") |
56 | 61 | norm = strings.ToLower(norm) |
57 | 62 | d.Set("alphanumeric", norm) |
58 | | - d.Set("workspace_url", usersAPI.client.Config.Host) |
59 | | - d.SetId(me.ID) |
| 63 | + d.Set("workspace_url", w.Config.Host) |
| 64 | + d.SetId(me.Id) |
60 | 65 | return nil |
61 | 66 | }, |
62 | 67 | } |
|
0 commit comments