diff --git a/.nextchanges/bundles/7291.md b/.nextchanges/bundles/7291.md new file mode 100644 index 00000000000..d04dce6aa2f --- /dev/null +++ b/.nextchanges/bundles/7291.md @@ -0,0 +1 @@ +* `bundle validate` no longer warns when resource permissions and top-level or target permissions name the same principal. ([#7291](https://github.com/databricks/cli/pull/7291)) diff --git a/acceptance/bundle/validate/permissions_overlap/output.txt b/acceptance/bundle/validate/permissions_overlap/output.txt index 43b95ddd440..d3cfbf879ff 100644 --- a/acceptance/bundle/validate/permissions_overlap/output.txt +++ b/acceptance/bundle/validate/permissions_overlap/output.txt @@ -1,5 +1,5 @@ -Warning: 'jobs' already has permissions set for 'overlap@example.com' user name +>>> [CLI] bundle validate -o json Recommendation: permissions section should explicitly include the current deployment identity '[USERNAME]' or one of its groups If it is not included, CAN_MANAGE permissions are only applied if the present identity is used to deploy. @@ -42,3 +42,24 @@ See https://docs.databricks.com/dev-tools/bundles/permissions.html to learn more } ] } + +>>> [CLI] bundle validate --strict +Recommendation: permissions section should explicitly include the current deployment identity '[USERNAME]' or one of its groups +If it is not included, CAN_MANAGE permissions are only applied if the present identity is used to deploy. + +Consider using a adding a top-level permissions section such as the following: + + permissions: + - user_name: [USERNAME] + level: CAN_MANAGE + +See https://docs.databricks.com/dev-tools/bundles/permissions.html to learn more about permission configuration. + in databricks.yml:5:3 + +Name: test-bundle +Target: default +Workspace: + User: [USERNAME] + Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default + +Found 1 recommendation diff --git a/acceptance/bundle/validate/permissions_overlap/script b/acceptance/bundle/validate/permissions_overlap/script index da6c2e46463..1272fc508dd 100644 --- a/acceptance/bundle/validate/permissions_overlap/script +++ b/acceptance/bundle/validate/permissions_overlap/script @@ -1 +1,3 @@ -$CLI bundle validate -o json | jq '.resources.jobs | map_values(.permissions)' +trace $CLI bundle validate -o json | jq '.resources.jobs | map_values(.permissions)' + +trace $CLI bundle validate --strict diff --git a/acceptance/bundle/validate/permissions_target/databricks.yml b/acceptance/bundle/validate/permissions_target/databricks.yml new file mode 100644 index 00000000000..77823f055c9 --- /dev/null +++ b/acceptance/bundle/validate/permissions_target/databricks.yml @@ -0,0 +1,44 @@ +bundle: + name: permissions-target + +variables: + group: + default: developers + acl: + type: complex + default: &target_permissions + - {group_name: "${var.group}", level: CAN_VIEW} + - {user_name: reader@example.test, level: CAN_VIEW} + - {service_principal_name: reader-sp, level: CAN_VIEW} + - {group_name: inherited, level: CAN_VIEW,} + +resources: + jobs: + root_job: &job + tasks: + - task_key: main + notebook_task: + notebook_path: /Workspace/notebook + source: WORKSPACE + permissions: + - {group_name: "${var.group}", level: CAN_MANAGE_RUN} + - {user_name: reader@example.test, level: CAN_MANAGE_RUN} + - {service_principal_name: reader-sp, level: CAN_MANAGE_RUN} + pipelines: + root_pipeline: &pipeline + permissions: + - {group_name: "${var.group}", level: CAN_RUN} + - {user_name: reader@example.test, level: CAN_RUN} + - {service_principal_name: reader-sp, level: CAN_RUN,} + +targets: + literal: + permissions: *target_permissions + resources: &target_resources + jobs: + target_job: *job + pipelines: + target_pipeline: *pipeline + complex: + permissions: ${var.acl} + resources: *target_resources diff --git a/acceptance/bundle/validate/permissions_target/out.test.toml b/acceptance/bundle/validate/permissions_target/out.test.toml new file mode 100644 index 00000000000..a927a5fbc06 --- /dev/null +++ b/acceptance/bundle/validate/permissions_target/out.test.toml @@ -0,0 +1,2 @@ +Cloud = false +EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/validate/permissions_target/output.txt b/acceptance/bundle/validate/permissions_target/output.txt new file mode 100644 index 00000000000..04bd744753f --- /dev/null +++ b/acceptance/bundle/validate/permissions_target/output.txt @@ -0,0 +1,216 @@ + +>>> [CLI] bundle validate --strict -t literal -o json +Recommendation: permissions section should explicitly include the current deployment identity '[USERNAME]' or one of its groups +If it is not included, CAN_MANAGE permissions are only applied if the present identity is used to deploy. + +Consider using a adding a top-level permissions section such as the following: + + permissions: + - user_name: [USERNAME] + level: CAN_MANAGE + +See https://docs.databricks.com/dev-tools/bundles/permissions.html to learn more about permission configuration. + in databricks.yml:9:14 + +{ + "jobs": { + "root_job": [ + { + "group_name": "developers", + "level": "CAN_MANAGE_RUN" + }, + { + "level": "CAN_MANAGE_RUN", + "user_name": "reader@example.test" + }, + { + "level": "CAN_MANAGE_RUN", + "service_principal_name": "reader-sp" + }, + { + "group_name": "inherited", + "level": "CAN_VIEW" + }, + { + "level": "IS_OWNER", + "user_name": "[USERNAME]" + } + ], + "target_job": [ + { + "group_name": "developers", + "level": "CAN_MANAGE_RUN" + }, + { + "level": "CAN_MANAGE_RUN", + "user_name": "reader@example.test" + }, + { + "level": "CAN_MANAGE_RUN", + "service_principal_name": "reader-sp" + }, + { + "group_name": "inherited", + "level": "CAN_VIEW" + }, + { + "level": "IS_OWNER", + "user_name": "[USERNAME]" + } + ] + }, + "pipelines": { + "root_pipeline": [ + { + "group_name": "developers", + "level": "CAN_RUN" + }, + { + "level": "CAN_RUN", + "user_name": "reader@example.test" + }, + { + "level": "CAN_RUN", + "service_principal_name": "reader-sp" + }, + { + "group_name": "inherited", + "level": "CAN_VIEW" + }, + { + "level": "IS_OWNER", + "user_name": "[USERNAME]" + } + ], + "target_pipeline": [ + { + "group_name": "developers", + "level": "CAN_RUN" + }, + { + "level": "CAN_RUN", + "user_name": "reader@example.test" + }, + { + "level": "CAN_RUN", + "service_principal_name": "reader-sp" + }, + { + "group_name": "inherited", + "level": "CAN_VIEW" + }, + { + "level": "IS_OWNER", + "user_name": "[USERNAME]" + } + ] + } +} + +>>> [CLI] bundle validate --strict -t complex -o json +Recommendation: permissions section should explicitly include the current deployment identity '[USERNAME]' or one of its groups +If it is not included, CAN_MANAGE permissions are only applied if the present identity is used to deploy. + +Consider using a adding a top-level permissions section such as the following: + + permissions: + - user_name: [USERNAME] + level: CAN_MANAGE + +See https://docs.databricks.com/dev-tools/bundles/permissions.html to learn more about permission configuration. + in databricks.yml:43:18 + +{ + "jobs": { + "root_job": [ + { + "group_name": "developers", + "level": "CAN_MANAGE_RUN" + }, + { + "level": "CAN_MANAGE_RUN", + "user_name": "reader@example.test" + }, + { + "level": "CAN_MANAGE_RUN", + "service_principal_name": "reader-sp" + }, + { + "group_name": "inherited", + "level": "CAN_VIEW" + }, + { + "level": "IS_OWNER", + "user_name": "[USERNAME]" + } + ], + "target_job": [ + { + "group_name": "developers", + "level": "CAN_MANAGE_RUN" + }, + { + "level": "CAN_MANAGE_RUN", + "user_name": "reader@example.test" + }, + { + "level": "CAN_MANAGE_RUN", + "service_principal_name": "reader-sp" + }, + { + "group_name": "inherited", + "level": "CAN_VIEW" + }, + { + "level": "IS_OWNER", + "user_name": "[USERNAME]" + } + ] + }, + "pipelines": { + "root_pipeline": [ + { + "group_name": "developers", + "level": "CAN_RUN" + }, + { + "level": "CAN_RUN", + "user_name": "reader@example.test" + }, + { + "level": "CAN_RUN", + "service_principal_name": "reader-sp" + }, + { + "group_name": "inherited", + "level": "CAN_VIEW" + }, + { + "level": "IS_OWNER", + "user_name": "[USERNAME]" + } + ], + "target_pipeline": [ + { + "group_name": "developers", + "level": "CAN_RUN" + }, + { + "level": "CAN_RUN", + "user_name": "reader@example.test" + }, + { + "level": "CAN_RUN", + "service_principal_name": "reader-sp" + }, + { + "group_name": "inherited", + "level": "CAN_VIEW" + }, + { + "level": "IS_OWNER", + "user_name": "[USERNAME]" + } + ] + } +} diff --git a/acceptance/bundle/validate/permissions_target/script b/acceptance/bundle/validate/permissions_target/script new file mode 100644 index 00000000000..1a034fe035c --- /dev/null +++ b/acceptance/bundle/validate/permissions_target/script @@ -0,0 +1,4 @@ +for target in literal complex; do + trace $CLI bundle validate --strict -t "$target" -o json > config.$target.json + jq '.resources | map_values(map_values(.permissions))' config.$target.json +done diff --git a/acceptance/bundle/validate/permissions_target/test.toml b/acceptance/bundle/validate/permissions_target/test.toml new file mode 100644 index 00000000000..a49a24c2a58 --- /dev/null +++ b/acceptance/bundle/validate/permissions_target/test.toml @@ -0,0 +1 @@ +Ignore = ["config.literal.json", "config.complex.json"] diff --git a/bundle/config/mutator/resourcemutator/apply_bundle_permissions.go b/bundle/config/mutator/resourcemutator/apply_bundle_permissions.go index 15493ae9d15..33264c9cead 100644 --- a/bundle/config/mutator/resourcemutator/apply_bundle_permissions.go +++ b/bundle/config/mutator/resourcemutator/apply_bundle_permissions.go @@ -13,7 +13,6 @@ import ( "github.com/databricks/cli/bundle" "github.com/databricks/cli/bundle/config/resources" "github.com/databricks/cli/libs/diag" - "github.com/databricks/cli/libs/logdiag" "github.com/databricks/databricks-sdk-go/service/iam" ) @@ -102,7 +101,7 @@ func ApplyBundlePermissions() bundle.Mutator { return &bundlePermissions{} } -func (m *bundlePermissions) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics { +func (m *bundlePermissions) Apply(_ context.Context, b *bundle.Bundle) diag.Diagnostics { err := validatePermissions(b) if err != nil { return diag.FromErr(err) @@ -119,10 +118,8 @@ func (m *bundlePermissions) Apply(ctx context.Context, b *bundle.Bundle) diag.Di field := reflect.ValueOf(group.Resources[name]).Elem().FieldByName("Permissions") permissions := readPermissions(field) permissions = append(permissions, convertPermissions( - ctx, b.Config.Permissions, permissions, - key, lm, )...) writePermissions(field, permissions) @@ -182,10 +179,8 @@ func (m *bundlePermissions) Name() string { } func convertPermissions( - ctx context.Context, bundlePermissions []resources.Permission, resourcePermissions []resources.Permission, - resourceName string, lm map[string]string, ) []resources.Permission { var permissions []resources.Permission @@ -197,7 +192,7 @@ func convertPermissions( continue } - if notifyForPermissionOverlap(ctx, p, resourcePermissions, resourceName) { + if isPermissionOverlap(p, resourcePermissions) { continue } @@ -215,42 +210,20 @@ func convertPermissions( func isPermissionOverlap( permission resources.Permission, resourcePermissions []resources.Permission, - resourceName string, -) (bool, diag.Diagnostics) { - var diagnostics diag.Diagnostics +) bool { for _, rp := range resourcePermissions { if rp.GroupName != "" && rp.GroupName == permission.GroupName { - diagnostics = diagnostics.Extend( - diag.Warningf("'%s' already has permissions set for '%s' group", resourceName, rp.GroupName), - ) + return true } if rp.UserName != "" && rp.UserName == permission.UserName { - diagnostics = diagnostics.Extend( - diag.Warningf("'%s' already has permissions set for '%s' user name", resourceName, rp.UserName), - ) + return true } if rp.ServicePrincipalName != "" && rp.ServicePrincipalName == permission.ServicePrincipalName { - diagnostics = diagnostics.Extend( - diag.Warningf("'%s' already has permissions set for '%s' service principal name", resourceName, rp.ServicePrincipalName), - ) + return true } } - return len(diagnostics) > 0, diagnostics -} - -func notifyForPermissionOverlap( - ctx context.Context, - permission resources.Permission, - resourcePermissions []resources.Permission, - resourceName string, -) bool { - isOverlap, diagnostics := isPermissionOverlap(permission, resourcePermissions, resourceName) - for _, d := range diagnostics { - logdiag.LogDiag(ctx, d) - } - - return isOverlap + return false } diff --git a/bundle/config/mutator/resourcemutator/apply_bundle_permissions_test.go b/bundle/config/mutator/resourcemutator/apply_bundle_permissions_test.go index a88a6f37a3e..8620caddfd0 100644 --- a/bundle/config/mutator/resourcemutator/apply_bundle_permissions_test.go +++ b/bundle/config/mutator/resourcemutator/apply_bundle_permissions_test.go @@ -3,14 +3,15 @@ package resourcemutator import ( "fmt" "slices" + "strings" "testing" "github.com/databricks/cli/bundle/permissions" "github.com/databricks/cli/bundle" "github.com/databricks/cli/bundle/config" + "github.com/databricks/cli/bundle/config/mutator" "github.com/databricks/cli/bundle/config/resources" - "github.com/databricks/cli/libs/diag" "github.com/databricks/cli/libs/dyn" "github.com/databricks/databricks-sdk-go/service/jobs" "github.com/stretchr/testify/assert" @@ -180,7 +181,7 @@ func TestApplyBundlePermissions(t *testing.T) { require.Contains(t, b.Config.Resources.InstancePools["instance_pool_1"].Permissions, resources.InstancePoolPermission{Level: "CAN_ATTACH_TO", GroupName: "TestGroup"}) } -func TestWarningOnOverlapPermission(t *testing.T) { +func TestResourcePermissionsOverrideRoot(t *testing.T) { b := &bundle.Bundle{ Config: config.Root{ Workspace: config.Workspace{ @@ -214,11 +215,7 @@ func TestWarningOnOverlapPermission(t *testing.T) { } diags := bundle.Apply(t.Context(), b, ApplyBundlePermissions()) - require.NoError(t, diags.Error()) - - require.Len(t, diags, 1) - require.Equal(t, diag.Warning, diags[0].Severity) - require.Equal(t, "'jobs' already has permissions set for 'TestUser' user name", diags[0].Summary) + require.Empty(t, diags) require.Contains(t, b.Config.Resources.Jobs["job_1"].Permissions, resources.JobPermission{Level: "CAN_VIEW", UserName: "TestUser"}) require.Contains(t, b.Config.Resources.Jobs["job_1"].Permissions, resources.JobPermission{Level: "CAN_VIEW", GroupName: "TestGroup"}) @@ -227,6 +224,120 @@ func TestWarningOnOverlapPermission(t *testing.T) { require.Contains(t, b.Config.Resources.Jobs["job_2"].Permissions, resources.JobPermission{Level: "CAN_VIEW", GroupName: "TestGroup"}) } +func TestResourcePermissionsOverrideDefaultsWithoutWarning(t *testing.T) { + for resourceType, lm := range levelsMap { + for _, resourceLayer := range []string{"root", "target"} { + for _, defaultsLayer := range []string{"root", "target", "both"} { + t.Run(fmt.Sprintf("%s/resource=%s/defaults=%s", resourceType, resourceLayer, defaultsLayer), func(t *testing.T) { + resourceConfig := fmt.Sprintf(` +resources: + %s: + test: + permissions: + - {group_name: principal, level: %s} + - {user_name: principal, level: %s} + - {service_principal_name: principal, level: %s} +`, resourceType, lm[permissions.CAN_MANAGE], lm[permissions.CAN_MANAGE], lm[permissions.CAN_MANAGE]) + defaultPermissions := `permissions: + - {group_name: principal, level: CAN_VIEW} + - {user_name: principal, level: CAN_VIEW} + - {service_principal_name: principal, level: CAN_VIEW} + - {group_name: inherited, level: CAN_VIEW} +` + rootConfig, targetConfig := "", "" + switch defaultsLayer { + case "root": + rootConfig = defaultPermissions + case "target": + targetConfig = defaultPermissions + case "both": + rootConfig = "permissions:\n - {group_name: principal, level: CAN_VIEW}\n" + targetConfig = defaultPermissions + } + if resourceLayer == "root" { + rootConfig += resourceConfig + } else { + targetConfig += resourceConfig + } + yaml := rootConfig + "\ntargets:\n test:\n default: true\n" + " " + strings.ReplaceAll(strings.TrimSpace(targetConfig), "\n", "\n ") + "\n" + root, diags := config.LoadFromBytes("databricks.yml", []byte(yaml)) + require.Empty(t, diags) + b := &bundle.Bundle{Config: *root} + diags = bundle.ApplySeq(t.Context(), b, mutator.SelectTarget("test"), ApplyBundlePermissions()) + require.Empty(t, diags) + actual := b.Config.Value().Get("resources").Get(resourceType).Get("test").Get("permissions").AsAny() + assert.Equal(t, []any{ + map[string]any{"group_name": "principal", "level": lm[permissions.CAN_MANAGE]}, + map[string]any{"user_name": "principal", "level": lm[permissions.CAN_MANAGE]}, + map[string]any{"service_principal_name": "principal", "level": lm[permissions.CAN_MANAGE]}, + map[string]any{"group_name": "inherited", "level": lm[permissions.CAN_VIEW]}, + }, actual) + }) + } + } + } +} + +func TestPermissionDefaultsVariableResolution(t *testing.T) { + for _, tc := range []struct { + name string + root string + target string + }{ + {name: "target literal", target: `[{group_name: "${var.group}", level: CAN_VIEW}]`}, + {name: "target reference", target: "${var.acl}"}, + {name: "null root", root: "null", target: "${var.acl}"}, + {name: "resource narrows target", target: `[{group_name: developers, level: CAN_MANAGE}]`}, + {name: "target entry reference", target: "[\"${var.acl_entry}\"]"}, + {name: "root reference", root: "${var.acl}"}, + {name: "root literal", root: `[{group_name: "${var.group}", level: CAN_VIEW}]`}, + {name: "both literals", root: `[{group_name: "${var.group}", level: CAN_VIEW}]`, target: `[{group_name: "${var.group}", level: CAN_VIEW}]`}, + {name: "reference overrides reference", root: "${var.unused_acl}", target: "${var.acl}"}, + {name: "null target", root: "${var.acl}", target: "null"}, + {name: "empty target", root: `[{group_name: "${var.group}", level: CAN_VIEW}]`, target: "[]"}, + } { + t.Run(tc.name, func(t *testing.T) { + yaml := ` +variables: + group: + default: developers + acl: + type: complex + default: + - {group_name: "${var.group}", level: CAN_VIEW} + acl_entry: + type: complex + default: {group_name: "${var.group}", level: CAN_VIEW} + unused_acl: + type: complex + default: + - {group_name: overridden, level: CAN_MANAGE} +resources: + jobs: + test: + permissions: + - {group_name: developers, level: CAN_MANAGE_RUN} +` + if tc.root != "" { + yaml += "permissions: " + tc.root + "\n" + } + yaml += "targets:\n test:\n default: true\n" + if tc.target != "" { + yaml += " permissions: " + tc.target + "\n" + } + root, diags := config.LoadFromBytes("databricks.yml", []byte(yaml)) + require.Empty(t, diags) + b := &bundle.Bundle{Config: *root} + diags = bundle.ApplySeq(t.Context(), b, + mutator.SelectTarget("test"), mutator.SetVariables(), + mutator.ResolveVariableReferencesWithoutResources(), ApplyBundlePermissions(), + ) + require.Empty(t, diags) + assert.Equal(t, []resources.JobPermission{{GroupName: "developers", Level: "CAN_MANAGE_RUN"}}, b.Config.Resources.Jobs["test"].Permissions) + }) + } +} + func TestAllResourcesExplicitlyDefinedForPermissionsSupport(t *testing.T) { r := config.Resources{} diff --git a/bundle/internal/schema/annotations.yml b/bundle/internal/schema/annotations.yml index db3cc5585e3..b47501c2d59 100644 --- a/bundle/internal/schema/annotations.yml +++ b/bundle/internal/schema/annotations.yml @@ -270,7 +270,7 @@ resources: "description": |- The permissions to apply to this resource. "markdown_description": |- - A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping. + A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions. See [\_](/dev-tools/bundles/settings.md#permissions) and [\_](/dev-tools/bundles/permissions.md). "markdown_examples": |- @@ -431,7 +431,7 @@ resources: "description": |- The permissions to apply to this resource. "markdown_description": |- - A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping. + A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions. See [\_](/dev-tools/bundles/settings.md#permissions) and [\_](/dev-tools/bundles/permissions.md). "markdown_examples": |- @@ -529,7 +529,7 @@ resources: "description": |- The permissions to apply to this resource. "markdown_description": |- - A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping. + A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. See [\_](/dev-tools/bundles/settings.md#permissions) and [\_](/dev-tools/bundles/permissions.md). "$fields": @@ -600,7 +600,7 @@ resources: "description": |- The permissions to apply to this resource. "markdown_description": |- - A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping. + A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions. See [\_](/dev-tools/bundles/settings.md#permissions) and [\_](/dev-tools/bundles/permissions.md). "markdown_examples": |- @@ -695,7 +695,7 @@ resources: "description": |- The permissions to apply to this resource. "markdown_description": |- - A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping. + A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions. See [\_](/dev-tools/bundles/settings.md#permissions) and [\_](/dev-tools/bundles/permissions.md). "markdown_examples": |- @@ -790,7 +790,7 @@ resources: "description": |- The permissions to apply to this resource. "markdown_description": |- - A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping. + A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions. See [\_](/dev-tools/bundles/settings.md#permissions) and [\_](/dev-tools/bundles/permissions.md). "markdown_examples": |- @@ -832,7 +832,7 @@ resources: "description": |- The permissions to apply to this resource. "markdown_description": |- - A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping. + A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions. See [\_](/dev-tools/bundles/settings.md#permissions) and [\_](/dev-tools/bundles/permissions.md). "markdown_examples": |- @@ -1016,7 +1016,7 @@ resources: "description": |- The permissions to apply to this resource. "markdown_description": |- - A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping. + A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions. See [\_](/dev-tools/bundles/settings.md#permissions) and [\_](/dev-tools/bundles/permissions.md). "markdown_examples": |- @@ -1075,7 +1075,7 @@ resources: "description": |- The permissions to apply to this resource. "markdown_description": |- - A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping. + A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions. See [\_](/dev-tools/bundles/settings.md#permissions) and [\_](/dev-tools/bundles/permissions.md). "$fields": @@ -1198,7 +1198,7 @@ resources: "description": |- The permissions to apply to this resource. "markdown_description": |- - A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping. + A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions. See [\_](/dev-tools/bundles/settings.md#permissions) and [\_](/dev-tools/bundles/permissions.md). "markdown_examples": |- @@ -1397,7 +1397,7 @@ resources: "description": |- The permissions to apply to this resource. "markdown_description": |- - A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping. + A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions. See [\_](/dev-tools/bundles/settings.md#permissions) and [\_](/dev-tools/bundles/permissions.md). "markdown_examples": |- @@ -1439,7 +1439,7 @@ resources: "description": |- The permissions to apply to this resource. "markdown_description": |- - A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping. + A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions. See [\_](/dev-tools/bundles/settings.md#permissions) and [\_](/dev-tools/bundles/permissions.md). "markdown_examples": |- @@ -1569,7 +1569,7 @@ resources: "description": |- The permissions to apply to this resource. "markdown_description": |- - A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping. + A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions. See [\_](/dev-tools/bundles/settings.md#permissions) and [\_](/dev-tools/bundles/permissions.md). "markdown_examples": |- @@ -1703,7 +1703,7 @@ resources: "description": |- The permissions to apply to this resource. "markdown_description": |- - A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping. + A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions. See [\_](/dev-tools/bundles/settings.md#permissions) and [\_](/dev-tools/bundles/permissions.md). "markdown_examples": |- @@ -1973,7 +1973,7 @@ resources: Scope name requested by the user. Scope names are unique. "permissions": "description": |- - The permissions to apply to the secret scope. Permissions are managed via secret scope ACLs. + The permissions to apply to the secret scope. Permissions are managed via secret scope ACLs. For the same principal, resource permissions take precedence over top-level or target permissions. "$fields": "group_name": "description": |- @@ -2051,7 +2051,7 @@ resources: "description": |- The permissions to apply to this resource. "markdown_description": |- - A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping. + A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions. See [\_](/dev-tools/bundles/settings.md#permissions) and [\_](/dev-tools/bundles/permissions.md). "markdown_examples": |- @@ -2114,7 +2114,7 @@ resources: "description": |- The permissions to apply to this resource. "markdown_description": |- - A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping. + A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions. See [\_](/dev-tools/bundles/settings.md#permissions) and [\_](/dev-tools/bundles/permissions.md). "markdown_examples": |- diff --git a/bundle/schema/jsonschema.json b/bundle/schema/jsonschema.json index 14fcb5e83ad..d8fd1c98185 100644 --- a/bundle/schema/jsonschema.json +++ b/bundle/schema/jsonschema.json @@ -127,7 +127,7 @@ "permissions": { "description": "The permissions to apply to this resource.", "$ref": "#/$defs/slice/github.com/databricks/cli/bundle/config/resources.Permission", - "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." + "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." }, "query_text": { "description": "Text of the query to be run.", @@ -232,7 +232,7 @@ "permissions": { "description": "The permissions to apply to this resource.", "$ref": "#/$defs/slice/github.com/databricks/cli/bundle/config/resources.AppPermission", - "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." + "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." }, "resources": { "description": "Resources for the app.", @@ -565,7 +565,7 @@ "permissions": { "description": "The permissions to apply to this resource.", "$ref": "#/$defs/slice/github.com/databricks/cli/bundle/config/resources.ClusterPermission", - "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." + "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." }, "policy_id": { "description": "The ID of the cluster policy used to create the cluster if applicable.", @@ -706,7 +706,7 @@ "permissions": { "description": "The permissions to apply to this resource.", "$ref": "#/$defs/slice/github.com/databricks/cli/bundle/config/resources.ClusterPolicyPermission", - "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." + "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." }, "policy_family_definition_overrides": { "description": "Policy definition JSON document expressed in [Databricks Policy Definition Language](https://docs.databricks.com/administration-guide/clusters/policy-definition.html).\nThe JSON document must be passed as a string and cannot be embedded in the requests.\n\nYou can use this to customize the policy definition inherited from the policy family.\nPolicy rules specified here are merged into the inherited policy definition.", @@ -814,7 +814,7 @@ "permissions": { "description": "The permissions to apply to this resource.", "$ref": "#/$defs/slice/github.com/databricks/cli/bundle/config/resources.Permission", - "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." + "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." }, "serialized_dashboard": { "description": "The contents of the dashboard in serialized string form.\nThis field is excluded in List Dashboards responses.\nUse the [get dashboard API](https://docs.databricks.com/api/workspace/lakeview/get)\nto retrieve an example response, which includes the `serialized_dashboard` field.\nThis field provides the structure of the JSON string that represents the dashboard's\nlayout and components.", @@ -973,7 +973,7 @@ "permissions": { "description": "The permissions to apply to this resource.", "$ref": "#/$defs/slice/github.com/databricks/cli/bundle/config/resources.Permission", - "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." + "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." }, "retention_window_in_days": { "description": "[Public Preview] The retention window for the instance. This is the time window in days\nfor which the historical data is retained. The default value is 7 days.\nValid values are 2 to 35 days.", @@ -1261,7 +1261,7 @@ "permissions": { "description": "The permissions to apply to this resource.", "$ref": "#/$defs/slice/github.com/databricks/cli/bundle/config/resources.Permission", - "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." + "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." }, "serialized_space": { "description": "Serialized Genie space body. May be provided inline as a JSON string (or YAML that will be marshalled to JSON) or referenced via `file_path`. To round-trip an existing space into a bundle, use `databricks bundle generate genie-space`.", @@ -1356,7 +1356,7 @@ "permissions": { "description": "The permissions to apply to this resource.", "$ref": "#/$defs/slice/github.com/databricks/cli/bundle/config/resources.InstancePoolPermission", - "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." + "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." }, "preloaded_docker_images": { "description": "Custom Docker Image BYOC", @@ -1519,7 +1519,7 @@ "permissions": { "description": "The permissions to apply to this resource.", "$ref": "#/$defs/slice/github.com/databricks/cli/bundle/config/resources.JobPermission", - "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." + "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." }, "queue": { "description": "The queue settings of the job.", @@ -1919,7 +1919,7 @@ "permissions": { "description": "The permissions to apply to this resource.", "$ref": "#/$defs/slice/github.com/databricks/cli/bundle/config/resources.MlflowExperimentPermission", - "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." + "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." }, "tags": { "description": "A collection of tags to set on the experiment. Maximum tag size and number of tags per request\ndepends on the storage backend. All storage backends are guaranteed to support tag keys up\nto 250 bytes in size and tag values up to 5000 bytes in size. All storage backends are also\nguaranteed to support up to 20 tags per request.", @@ -2000,7 +2000,7 @@ "permissions": { "description": "The permissions to apply to this resource.", "$ref": "#/$defs/slice/github.com/databricks/cli/bundle/config/resources.MlflowModelPermission", - "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." + "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." }, "tags": { "description": "Additional metadata for registered model.", @@ -2167,7 +2167,7 @@ "permissions": { "description": "The permissions to apply to this resource.", "$ref": "#/$defs/slice/github.com/databricks/cli/bundle/config/resources.ModelServingEndpointPermission", - "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." + "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." }, "rate_limits": { "description": "Rate limits to be applied to the serving endpoint. NOTE: this field is deprecated, please use AI Gateway to manage rate limits.", @@ -2392,7 +2392,7 @@ "permissions": { "description": "The permissions to apply to this resource.", "$ref": "#/$defs/slice/github.com/databricks/cli/bundle/config/resources.PipelinePermission", - "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." + "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." }, "photon": { "description": "Whether Photon is enabled for this pipeline.", @@ -2881,7 +2881,7 @@ "permissions": { "description": "The permissions to apply to this resource.", "$ref": "#/$defs/slice/github.com/databricks/cli/bundle/config/resources.Permission", - "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." + "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." }, "pg_version": { "description": "[Beta] The major Postgres version number. The set of supported versions may vary; consult the API documentation for currently accepted values.", @@ -3420,7 +3420,7 @@ "$ref": "#/$defs/string" }, "permissions": { - "description": "The permissions to apply to the secret scope. Permissions are managed via secret scope ACLs.", + "description": "The permissions to apply to the secret scope. Permissions are managed via secret scope ACLs. For the same principal, resource permissions take precedence over top-level or target permissions.", "$ref": "#/$defs/slice/github.com/databricks/cli/bundle/config/resources.SecretScopePermission" } }, @@ -3555,7 +3555,7 @@ "permissions": { "description": "The permissions to apply to this resource.", "$ref": "#/$defs/slice/github.com/databricks/cli/bundle/config/resources.SqlWarehousePermission", - "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." + "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." }, "reyden_cluster_size_multiplier": { "description": "[Private Preview] Cluster size multiplier for Reyden warehouses. Scales the effective compute\ncapacity relative to the nominal virtual cluster size. Only meaningful when\nthe warehouse is of Reyden type.\n\nAccepted range: 1.0 to the workspace-configured maximum (decimals\nallowed). The default maximum is 100.0.\n- Values below 1.0 are normalized to 1.0.\n- Values above the configured maximum are capped at that maximum.\n- When absent, the warehouse is treated as having a multiplier of 1.0.", @@ -3693,7 +3693,7 @@ "permissions": { "description": "The permissions to apply to this resource.", "$ref": "#/$defs/slice/github.com/databricks/cli/bundle/config/resources.VectorSearchEndpointPermission", - "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. A principal cannot be set in both a resource's `permissions` and the top-level `permissions` mapping.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." + "markdownDescription": "A Sequence of permissions to apply to this resource, where each item grants a permission `level` to a single `user_name`, `group_name`, or `service_principal_name`. For the same principal, resource permissions take precedence over top-level or target permissions.\n\nSee [permissions](https://docs.databricks.com/dev-tools/bundles/settings.html#permissions) and [link](https://docs.databricks.com/dev-tools/bundles/permissions.html)." }, "target_qps": { "description": "Target QPS for the endpoint. Mutually exclusive with num_replicas.\nThe actual replica count is calculated at index creation/sync time based on this value.\nBest-effort target; the system does not guarantee this QPS will be achieved.", diff --git a/python/databricks/bundles/secret_scopes/_models/secret_scope.py b/python/databricks/bundles/secret_scopes/_models/secret_scope.py index 5e436f1d247..7094549afe3 100644 --- a/python/databricks/bundles/secret_scopes/_models/secret_scope.py +++ b/python/databricks/bundles/secret_scopes/_models/secret_scope.py @@ -55,7 +55,7 @@ class SecretScope(Resource): permissions: VariableOrList[SecretScopePermission] = field(default_factory=list) """ - The permissions to apply to the secret scope. Permissions are managed via secret scope ACLs. + The permissions to apply to the secret scope. Permissions are managed via secret scope ACLs. For the same principal, resource permissions take precedence over top-level or target permissions. """ @classmethod @@ -91,7 +91,7 @@ class SecretScopeDict(TypedDict, total=False): permissions: VariableOrList[SecretScopePermissionParam] """ - The permissions to apply to the secret scope. Permissions are managed via secret scope ACLs. + The permissions to apply to the secret scope. Permissions are managed via secret scope ACLs. For the same principal, resource permissions take precedence over top-level or target permissions. """