Skip to content

Commit 0842543

Browse files
authored
[Internal] Bump Go SDK to 0.59.0 (#4544)
## Changes <!-- Summary of your changes that are easy to understand --> This pull request includes the following updates: 1. Updated the Go SDK to version 0.59.0. 2. Generated code in line with the latest OpenAPI schema. 3. Implemented a fix to avoid any breaking changes in the Share resource. 4. Temporarily bypassing some GCP workspace tests until the environmental issues are resolved. ## 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 --------- Co-authored-by: Omer Lachish <[email protected]>
1 parent 7c7c7bc commit 0842543

File tree

36 files changed

+6286
-1159
lines changed

36 files changed

+6286
-1159
lines changed

.codegen/_openapi_sha

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
99f644e72261ef5ecf8d74db20f4b7a1e09723cc
1+
e5c870006a536121442cfd2441bdc8a5fb76ae1e

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
internal/providers/pluginfw/products/budget_policy/data_budget_policies.go linguist-generated=true
2+
internal/providers/pluginfw/products/budget_policy/data_budget_policy.go linguist-generated=true
3+
internal/providers/pluginfw/products/budget_policy/resource_budget_policy.go linguist-generated=true
14
internal/service/apps_tf/legacy_model.go linguist-generated=true
25
internal/service/apps_tf/model.go linguist-generated=true
36
internal/service/billing_tf/legacy_model.go linguist-generated=true

NEXT_CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@
1111
### Exporter
1212

1313
### Internal Changes
14+
15+
* Bump Go SDK version to 0.59.0 ([#4544](https://github.com/databricks/terraform-provider-databricks/pull/4544))

catalog/permissions/permissions.go

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,42 @@ func NewUnityCatalogPermissionsAPI(ctx context.Context, m any) UnityCatalogPermi
2828

2929
func (a UnityCatalogPermissionsAPI) GetPermissions(securable catalog.SecurableType, name string) (list *catalog.PermissionsList, err error) {
3030
if securable.String() == "share" {
31-
list, err = a.client.Shares.SharePermissions(a.context, sharing.SharePermissionsRequest{
31+
sharePermissions, err := a.client.Shares.SharePermissions(a.context, sharing.SharePermissionsRequest{
3232
Name: name,
3333
})
34-
return
34+
if err != nil {
35+
return nil, err
36+
}
37+
list = &catalog.PermissionsList{
38+
PrivilegeAssignments: make([]catalog.PrivilegeAssignment, len(sharePermissions.PrivilegeAssignments)),
39+
}
40+
for i, pa := range sharePermissions.PrivilegeAssignments {
41+
list.PrivilegeAssignments[i] = catalog.PrivilegeAssignment{
42+
Principal: pa.Principal,
43+
Privileges: toCatalogPrivileges(pa.Privileges),
44+
}
45+
}
46+
return list, nil
3547
}
3648
list, err = a.client.Grants.GetBySecurableTypeAndFullName(a.context, securable, name)
3749
return
3850
}
3951

4052
func (a UnityCatalogPermissionsAPI) UpdatePermissions(securable catalog.SecurableType, name string, diff []catalog.PermissionsChange) error {
4153
if securable.String() == "share" {
42-
return a.client.Shares.UpdatePermissions(a.context, sharing.UpdateSharePermissions{
43-
Changes: diff,
54+
var shareDiff []sharing.PermissionsChange
55+
for _, c := range diff {
56+
shareDiff = append(shareDiff, sharing.PermissionsChange{
57+
Add: toSharingPrivileges(c.Add),
58+
Remove: toSharingPrivileges(c.Remove),
59+
Principal: c.Principal,
60+
})
61+
}
62+
_, err := a.client.Shares.UpdatePermissions(a.context, sharing.UpdateSharePermissions{
63+
Changes: shareDiff,
4464
Name: name,
4565
})
66+
return err
4667
}
4768
_, err := a.client.Grants.Update(a.context, catalog.UpdatePermissions{
4869
Changes: diff,
@@ -153,3 +174,19 @@ func SliceWithoutString(in []string, without string) (out []string) {
153174
}
154175
return
155176
}
177+
178+
func toCatalogPrivileges(in []sharing.Privilege) []catalog.Privilege {
179+
var out = make([]catalog.Privilege, len(in))
180+
for i, p := range in {
181+
out[i] = catalog.Privilege(p)
182+
}
183+
return out
184+
}
185+
186+
func toSharingPrivileges(in []catalog.Privilege) []string {
187+
var out = make([]string, len(in))
188+
for i, p := range in {
189+
out[i] = p.String()
190+
}
191+
return out
192+
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/databricks/terraform-provider-databricks
33
go 1.24.0
44

55
require (
6-
github.com/databricks/databricks-sdk-go v0.58.1
6+
github.com/databricks/databricks-sdk-go v0.59.0
77
github.com/golang-jwt/jwt/v4 v4.5.1
88
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
99
github.com/hashicorp/hcl v1.0.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBS
2626
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
2727
github.com/cyphar/filepath-securejoin v0.2.5 h1:6iR5tXJ/e6tJZzzdMc1km3Sa7RRIVBKAK32O2s7AYfo=
2828
github.com/cyphar/filepath-securejoin v0.2.5/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
29-
github.com/databricks/databricks-sdk-go v0.58.1 h1:dUs9ZmFi7hYiL3NwLSAbxqQu66E3BzwM8EU/wcCTJ10=
30-
github.com/databricks/databricks-sdk-go v0.58.1/go.mod h1:JpLizplEs+up9/Z4Xf2x++o3sM9eTTWFGzIXAptKJzI=
29+
github.com/databricks/databricks-sdk-go v0.59.0 h1:m87rbnoeO7A6+QKo4QzwyPE5AzEeGvopEaavn3F5y/o=
30+
github.com/databricks/databricks-sdk-go v0.59.0/go.mod h1:JpLizplEs+up9/Z4Xf2x++o3sM9eTTWFGzIXAptKJzI=
3131
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3232
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
3333
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

internal/providers/pluginfw/auto_generation.go

Lines changed: 9 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/providers/pluginfw/products/budget_policy/data_budget_policies.go

Lines changed: 109 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/providers/pluginfw/products/budget_policy/data_budget_policy.go

Lines changed: 92 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)