Skip to content

Commit b1677c3

Browse files
committed
Merge permissions/grants invariant configs into their base configs
The invariant configs had separate base and *_with_permissions/*_with_grants variants that differed only by an appended permissions or grants block. Fold the block into the base config and drop the variant for jobs, database instances, model serving endpoints, schemas, and secret scopes. model is left as a separate model/model_with_permissions pair: continue_293 deploys first with CLI v0.293.0, which cannot deploy model permissions (see its no_model_with_permissions exclude, PR #4941). Merging permissions into model.yml.tmpl would force excluding it from continue_293 and lose base-model continue-from-0.293.0 coverage. The other five resources have no such old-version limitation. Co-authored-by: Isaac
1 parent a54e88f commit b1677c3

14 files changed

Lines changed: 18 additions & 76 deletions

acceptance/bundle/invariant/configs/database_instance.yml.tmpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ resources:
66
foo:
77
name: test-db-instance-$UNIQUE_NAME
88
capacity: CU_1
9+
permissions:
10+
- level: CAN_USE
11+
group_name: users

acceptance/bundle/invariant/configs/database_instance_with_permissions.yml.tmpl

Lines changed: 0 additions & 11 deletions
This file was deleted.

acceptance/bundle/invariant/configs/job.yml.tmpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ resources:
55
jobs:
66
foo:
77
name: test-job-$UNIQUE_NAME
8+
permissions:
9+
- level: CAN_VIEW
10+
group_name: users

acceptance/bundle/invariant/configs/job_with_permissions.yml.tmpl

Lines changed: 0 additions & 10 deletions
This file was deleted.

acceptance/bundle/invariant/configs/model_serving_endpoint.yml.tmpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ resources:
55
model_serving_endpoints:
66
foo:
77
name: test-endpoint-$UNIQUE_NAME
8+
permissions:
9+
- level: CAN_VIEW
10+
group_name: users

acceptance/bundle/invariant/configs/model_serving_endpoint_with_permissions.yml.tmpl

Lines changed: 0 additions & 10 deletions
This file was deleted.

acceptance/bundle/invariant/configs/schema.yml.tmpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@ resources:
66
foo:
77
catalog_name: main
88
name: test-schema-$UNIQUE_NAME
9+
grants:
10+
- principal: account users
11+
privileges:
12+
- USE_SCHEMA

acceptance/bundle/invariant/configs/schema_with_grants.yml.tmpl

Lines changed: 0 additions & 12 deletions
This file was deleted.

acceptance/bundle/invariant/configs/secret_scope.yml.tmpl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,8 @@ resources:
66
foo:
77
name: test-scope-$UNIQUE_NAME
88
backend_type: DATABRICKS
9+
permissions:
10+
- level: READ
11+
group_name: users
12+
- level: WRITE
13+
group_name: admins

acceptance/bundle/invariant/configs/secret_scope_with_permissions.yml.tmpl

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)