Support IS_OWNER as a top-level permission #1387
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,47 +7,54 @@ import ( | |
| "strings" | ||
|
|
||
| "github.com/databricks/cli/bundle" | ||
| "github.com/databricks/cli/bundle/config/resources" | ||
| "github.com/databricks/cli/libs/diag" | ||
| ) | ||
|
|
||
| const CAN_MANAGE = "CAN_MANAGE" | ||
| const CAN_VIEW = "CAN_VIEW" | ||
| const CAN_RUN = "CAN_RUN" | ||
| const IS_OWNER = "IS_OWNER" | ||
|
|
||
| var allowedLevels = []string{CAN_MANAGE, CAN_VIEW, CAN_RUN, IS_OWNER} | ||
| var levelsMap = map[string](map[string]string){ | ||
| "jobs": { | ||
| IS_OWNER: "IS_OWNER", | ||
|
Contributor
Author
There was a problem hiding this comment. Only a few resources, like jobs, actually have an "owner": https://docs.databricks.com/en/security/auth-authz/access-control/index.html. For almost all the others we don't distinguish between the owner and the other can-manage users. Note that clusters is a special case here. They don't have an owner permission but treat the creator as a kind of owner that has special privileges. There's even a special API for changing that notion of "owner": https://docs.databricks.com/api/workspace/clusters/changeowner. Once we do clusters we should discuss if we want this notion of an owner to affect how clusters are created, or if we perhaps want to show a warning when someone who doesn't have IS_OWNER would be the first creator of a cluster. |
||
| CAN_MANAGE: "CAN_MANAGE", | ||
| CAN_VIEW: "CAN_VIEW", | ||
| CAN_RUN: "CAN_MANAGE_RUN", | ||
| }, | ||
| "pipelines": { | ||
| IS_OWNER: "IS_OWNER", | ||
| CAN_MANAGE: "CAN_MANAGE", | ||
| CAN_VIEW: "CAN_VIEW", | ||
| CAN_RUN: "CAN_RUN", | ||
| }, | ||
| "mlflow_experiments": { | ||
| IS_OWNER: "CAN_MANAGE", | ||
| CAN_MANAGE: "CAN_MANAGE", | ||
| CAN_VIEW: "CAN_READ", | ||
| }, | ||
| "mlflow_models": { | ||
| IS_OWNER: "CAN_MANAGE", | ||
| CAN_MANAGE: "CAN_MANAGE", | ||
| CAN_VIEW: "CAN_READ", | ||
| }, | ||
| "model_serving_endpoints": { | ||
| IS_OWNER: "CAN_MANAGE", | ||
| CAN_MANAGE: "CAN_MANAGE", | ||
| CAN_VIEW: "CAN_VIEW", | ||
| CAN_RUN: "CAN_QUERY", | ||
| }, | ||
| } | ||
|
|
||
| type applyResourcePermissions struct{} | ||
|
|
||
| func ApplyResourcePermissions() bundle.Mutator { | ||
| return &applyResourcePermissions{} | ||
| } | ||
|
|
||
| func (m *applyResourcePermissions) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics { | ||
| err := validate(b) | ||
| if err != nil { | ||
| return diag.FromErr(err) | ||
|
|
@@ -74,64 +81,91 @@ func validate(b *bundle.Bundle) error { | |
|
|
||
| func applyForJobs(ctx context.Context, b *bundle.Bundle) { | ||
| for key, job := range b.Config.Resources.Jobs { | ||
| job.Permissions = extendPermissions(job.Permissions, convert( | ||
| ctx, | ||
| b.Config.Permissions, | ||
| job.Permissions, | ||
| key, | ||
| levelsMap["jobs"], | ||
| )) | ||
| } | ||
| } | ||
|
|
||
| func applyForPipelines(ctx context.Context, b *bundle.Bundle) { | ||
| for key, pipeline := range b.Config.Resources.Pipelines { | ||
| pipeline.Permissions = extendPermissions(pipeline.Permissions, convert( | ||
| ctx, | ||
| b.Config.Permissions, | ||
| pipeline.Permissions, | ||
| key, | ||
| levelsMap["pipelines"], | ||
| )) | ||
| } | ||
| } | ||
|
|
||
| func applyForMlExperiments(ctx context.Context, b *bundle.Bundle) { | ||
| for key, experiment := range b.Config.Resources.Experiments { | ||
| experiment.Permissions = extendPermissions(experiment.Permissions, convert( | ||
| ctx, | ||
| b.Config.Permissions, | ||
| experiment.Permissions, | ||
| key, | ||
| levelsMap["mlflow_experiments"], | ||
| )) | ||
| } | ||
| } | ||
|
|
||
| func applyForMlModels(ctx context.Context, b *bundle.Bundle) { | ||
| for key, model := range b.Config.Resources.Models { | ||
| model.Permissions = extendPermissions(model.Permissions, convert( | ||
| ctx, | ||
| b.Config.Permissions, | ||
| model.Permissions, | ||
| key, | ||
| levelsMap["mlflow_models"], | ||
| )) | ||
| } | ||
| } | ||
|
|
||
| func applyForModelServiceEndpoints(ctx context.Context, b *bundle.Bundle) { | ||
| for key, model := range b.Config.Resources.ModelServingEndpoints { | ||
| model.Permissions = extendPermissions(model.Permissions, convert( | ||
| ctx, | ||
| b.Config.Permissions, | ||
| model.Permissions, | ||
| key, | ||
| levelsMap["model_serving_endpoints"], | ||
| )) | ||
| } | ||
| } | ||
|
|
||
| func extendPermissions(permissions []resources.Permission, newPermissions []resources.Permission) []resources.Permission { | ||
| if !includesOwner(permissions) { | ||
| // Just merge the permissions, don't need to do anything special | ||
| return append(permissions, newPermissions...) | ||
| } | ||
|
|
||
| // Only apply the owner from top-level permissions if the local resource | ||
| // didn't have an owner. | ||
|
lennartkats-db marked this conversation as resolved.
Outdated
|
||
| for _, p := range newPermissions { | ||
| if p.Level == IS_OWNER { | ||
| continue | ||
| } | ||
| permissions = append(permissions, p) | ||
| } | ||
|
|
||
| return permissions | ||
| } | ||
|
|
||
| func includesOwner(permissions []resources.Permission) bool { | ||
| for _, p := range permissions { | ||
| if p.Level == IS_OWNER { | ||
| return true | ||
| } | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| func (m *applyResourcePermissions) Name() string { | ||
| return "ApplyResourcePermissions" | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We used to require
but when considering collaborative deployment, we prefer
This change makes it so either restriction is allowed for
mode: production.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we also warn if only
run_asis set? It doesn't prevent multiple deployments.