Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NEXT_CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Notable Changes

### Dependency updates
* Upgrade TF provider to 1.86.0 ([#3374](https://github.com/databricks/cli/pull/3374))
* Update Go SDK to 0.79.0 ([#3376](https://github.com/databricks/cli/pull/3376))

### CLI
Expand Down
9 changes: 0 additions & 9 deletions acceptance/bundle/deploy/secret-scope/test.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ Pattern = "POST /api/2.0/secrets/scopes/delete"
[[Server]]
Pattern = "POST /api/2.0/secrets/put"

[[Server]]
Pattern = "POST /api/2.0/secrets/acls/put"

[[Server]]
Pattern = "GET /api/2.0/secrets/get"
Response.Body = '''
Expand Down Expand Up @@ -69,9 +66,3 @@ Response.Body = '''
]
}
'''

[[Server]]
Pattern = "GET /api/2.0/secrets/acls/get"

[[Server]]
Pattern = "POST /api/2.0/secrets/acls/delete"
49 changes: 49 additions & 0 deletions acceptance/internal/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -450,4 +450,53 @@ func addDefaultHandlers(server *testserver.Server) {
server.Handle("GET", "/api/2.0/preview/sql/data_sources", func(req testserver.Request) any {
return req.Workspace.SqlDataSourcesList(req)
})

server.Handle("GET", "/api/2.0/secrets/acls/get", func(req testserver.Request) any {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New TF provider has a special retry logic for ACLs to match the request/response of put and get, hence this change
databricks/terraform-provider-databricks#4885

scope := req.URL.Query().Get("scope")
principal := req.URL.Query().Get("principal")
scopeAcls := req.Workspace.Acls[scope]
for _, acl := range scopeAcls {
if acl.Principal == principal {
return acl
}
}
return testserver.Response{StatusCode: 404}
})

server.Handle("GET", "/api/2.0/secrets/acls/list", func(req testserver.Request) any {
return testserver.MapGet(req.Workspace, req.Workspace.Acls, req.Vars["scope"])
})

server.Handle("POST", "/api/2.0/secrets/acls/put", func(req testserver.Request) any {
var request workspace.PutAcl
if err := json.Unmarshal(req.Body, &request); err != nil {
return testserver.Response{
Body: fmt.Sprintf("internal error: %s", err),
StatusCode: 500,
}
}
req.Workspace.Acls[request.Scope] = append(req.Workspace.Acls[request.Scope], workspace.AclItem{
Principal: request.Principal,
Permission: request.Permission,
})
return ""
})

server.Handle("POST", "/api/2.0/secrets/acls/delete", func(req testserver.Request) any {
var request workspace.DeleteAcl
if err := json.Unmarshal(req.Body, &request); err != nil {
return testserver.Response{
Body: fmt.Sprintf("internal error: %s", err),
StatusCode: 500,
}
}
scopeAcls := req.Workspace.Acls[request.Scope]
for i, acl := range scopeAcls {
if acl.Principal == request.Principal {
req.Workspace.Acls[request.Scope] = append(scopeAcls[:i], scopeAcls[i+1:]...)
return ""
}
}
return testserver.Response{StatusCode: 404}
})
}
2 changes: 1 addition & 1 deletion acceptance/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
databricks = {
source = "databricks/databricks"
version = "1.85.0"
version = "1.86.0"
}
}

Expand Down
6 changes: 3 additions & 3 deletions acceptance/terraform/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
Initializing the backend...

Initializing provider plugins...
- Finding databricks/databricks versions matching "1.85.0"...
- Installing databricks/databricks v1.85.0...
- Installed databricks/databricks v1.85.0 (unauthenticated)
- Finding databricks/databricks versions matching "1.86.0"...
- Installing databricks/databricks v1.86.0...
- Installed databricks/databricks v1.86.0 (unauthenticated)

Terraform has created a lock file .terraform.lock.hcl to record the provider
selections it made above. Include this file in your version control repository
Expand Down
2 changes: 1 addition & 1 deletion bundle/internal/tf/codegen/schema/version.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package schema

const ProviderVersion = "1.85.0"
const ProviderVersion = "1.86.0"
136 changes: 136 additions & 0 deletions bundle/internal/tf/schema/data_source_clean_room_asset.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading