Skip to content

Use VectorSearchEndpointPermissionLevel for VS endpoint permissions #6022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
janniklasrose wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use VectorSearchEndpointPermissionLevel for VS endpoint permissions #6022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions bundle/config/mutator/resourcemutator/apply_bundle_permissions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,12 @@ func TestApplyBundlePermissions(t *testing.T) {
require.Contains(t, b.Config.Resources.Apps["app_1"].Permissions, resources.AppPermission{Level: "CAN_USE", GroupName: "TestGroup"})

require.Len(t, b.Config.Resources.VectorSearchEndpoints["vs_1"].Permissions, 2)
require.Contains(t, b.Config.Resources.VectorSearchEndpoints["vs_1"].Permissions, resources.Permission{Level: "CAN_MANAGE", UserName: "TestUser"})
require.Contains(t, b.Config.Resources.VectorSearchEndpoints["vs_1"].Permissions, resources.Permission{Level: "CAN_USE", GroupName: "TestGroup"})
require.Contains(t, b.Config.Resources.VectorSearchEndpoints["vs_1"].Permissions, resources.VectorSearchEndpointPermission{Level: "CAN_MANAGE", UserName: "TestUser"})
require.Contains(t, b.Config.Resources.VectorSearchEndpoints["vs_1"].Permissions, resources.VectorSearchEndpointPermission{Level: "CAN_USE", GroupName: "TestGroup"})

require.Len(t, b.Config.Resources.VectorSearchEndpoints["vs_2"].Permissions, 2)
require.Contains(t, b.Config.Resources.VectorSearchEndpoints["vs_2"].Permissions, resources.Permission{Level: "CAN_MANAGE", UserName: "TestUser"})
require.Contains(t, b.Config.Resources.VectorSearchEndpoints["vs_2"].Permissions, resources.Permission{Level: "CAN_USE", GroupName: "TestGroup"})
require.Contains(t, b.Config.Resources.VectorSearchEndpoints["vs_2"].Permissions, resources.VectorSearchEndpointPermission{Level: "CAN_MANAGE", UserName: "TestUser"})
require.Contains(t, b.Config.Resources.VectorSearchEndpoints["vs_2"].Permissions, resources.VectorSearchEndpointPermission{Level: "CAN_USE", GroupName: "TestGroup"})
}

func TestWarningOnOverlapPermission(t *testing.T) {
Expand Down
2 changes: 2 additions & 0 deletions bundle/config/resources/permission_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/databricks/databricks-sdk-go/service/pipelines"
"github.com/databricks/databricks-sdk-go/service/serving"
"github.com/databricks/databricks-sdk-go/service/sql"
"github.com/databricks/databricks-sdk-go/service/vectorsearch"
)

// Each resource defines its own permission type so that the JSON schema names them distinctly.
Expand All @@ -32,4 +33,5 @@ type (
ModelServingEndpointPermission PermissionT[serving.ServingEndpointPermissionLevel]
PipelinePermission PermissionT[pipelines.PipelinePermissionLevel]
SqlWarehousePermission PermissionT[sql.WarehousePermissionLevel]
VectorSearchEndpointPermission PermissionT[vectorsearch.VectorSearchEndpointPermissionLevel]
)
2 changes: 1 addition & 1 deletion bundle/config/resources/vector_search_endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ type VectorSearchEndpoint struct {
BaseResource
vectorsearch.CreateEndpoint

Permissions []Permission `json:"permissions,omitempty"`
Permissions []VectorSearchEndpointPermission `json:"permissions,omitempty"`
}

func (e *VectorSearchEndpoint) UnmarshalJSON(b []byte) error {
Expand Down
13 changes: 13 additions & 0 deletions bundle/internal/schema/annotations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1894,6 +1894,19 @@ resources:
- level: CAN_RUN
service_principal_name: 123456-abcdef
```
"$fields":
"group_name":
"description": |-
PLACEHOLDER
"level":
"description": |-
PLACEHOLDER
"service_principal_name":
"description": |-
PLACEHOLDER
"user_name":
"description": |-
PLACEHOLDER
"vector_search_indexes":
"description": |-
PLACEHOLDER
Expand Down
2 changes: 1 addition & 1 deletion bundle/internal/validation/generated/enum_fields.go
View file
Open in desktop

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

62 changes: 61 additions & 1 deletion bundle/schema/jsonschema.json
View file
Open in desktop

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

Loading