Skip to content

Commit 6225f44

Browse files
Fix merge conflicts with grants SDK type change
After rebase on main, adapt to #4666 which switched grants from custom per-resource types to SDK catalog.PrivilegeAssignment. Remove stale per-resource grant annotation entries (descriptions now come from OpenAPI), regenerate schema and python codegen, and clean up .wsignore references to deleted docsgen files. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 0905c93 commit 6225f44

28 files changed

Lines changed: 536 additions & 548 deletions

.wsignore

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,3 @@ python/databricks/bundles/*/_models/*.py
2727

2828
# Developed elsewhere:
2929
internal/genkit/tagging.py
30-
31-
# Docsgen:
32-
bundle/docsgen/output/resources.md
33-
bundle/docsgen/output/reference.md
34-
bundle/docsgen/testdata/anchors.md

bundle/internal/schema/annotations.yml

Lines changed: 0 additions & 159 deletions
Original file line numberDiff line numberDiff line change
@@ -499,66 +499,6 @@ resources.catalogs.*:
499499
"storage_root":
500500
"description": |-
501501
PLACEHOLDER
502-
resources.catalogs.*.grants.*:
503-
"principal":
504-
"description": |-
505-
PLACEHOLDER
506-
"privileges":
507-
"description": |-
508-
PLACEHOLDER
509-
resources.catalogs.*.grants.*.privileges.*:
510-
"_":
511-
"enum":
512-
- |-
513-
ALL_PRIVILEGES
514-
- |-
515-
APPLY_TAG
516-
- |-
517-
CREATE_CONNECTION
518-
- |-
519-
CREATE_EXTERNAL_LOCATION
520-
- |-
521-
CREATE_EXTERNAL_TABLE
522-
- |-
523-
CREATE_EXTERNAL_VOLUME
524-
- |-
525-
CREATE_FOREIGN_CATALOG
526-
- |-
527-
CREATE_FUNCTION
528-
- |-
529-
CREATE_MANAGED_STORAGE
530-
- |-
531-
CREATE_MATERIALIZED_VIEW
532-
- |-
533-
CREATE_MODEL
534-
- |-
535-
CREATE_SCHEMA
536-
- |-
537-
CREATE_STORAGE_CREDENTIAL
538-
- |-
539-
CREATE_TABLE
540-
- |-
541-
CREATE_VOLUME
542-
- |-
543-
EXECUTE
544-
- |-
545-
MANAGE
546-
- |-
547-
MODIFY
548-
- |-
549-
READ_VOLUME
550-
- |-
551-
REFRESH
552-
- |-
553-
SELECT
554-
- |-
555-
USE_CATALOG
556-
- |-
557-
USE_CONNECTION
558-
- |-
559-
USE_SCHEMA
560-
- |-
561-
WRITE_VOLUME
562502
resources.clusters.*:
563503
"_":
564504
"markdown_description": |-
@@ -787,36 +727,6 @@ resources.external_locations.*:
787727
"url":
788728
"description": |-
789729
PLACEHOLDER
790-
resources.external_locations.*.grants.*:
791-
"principal":
792-
"description": |-
793-
PLACEHOLDER
794-
"privileges":
795-
"description": |-
796-
PLACEHOLDER
797-
resources.external_locations.*.grants.*.privileges.*:
798-
"_":
799-
"description": |-
800-
Privilege to grant on an external location
801-
"enum":
802-
- |-
803-
ALL_PRIVILEGES
804-
- |-
805-
CREATE_EXTERNAL_TABLE
806-
- |-
807-
CREATE_EXTERNAL_VOLUME
808-
- |-
809-
CREATE_MANAGED_STORAGE
810-
- |-
811-
CREATE_TABLE
812-
- |-
813-
CREATE_VOLUME
814-
- |-
815-
MANAGE
816-
- |-
817-
READ_FILES
818-
- |-
819-
WRITE_FILES
820730
resources.jobs.*:
821731
"_":
822732
"markdown_description": |-
@@ -1144,13 +1054,6 @@ resources.registered_models.*:
11441054
"lifecycle":
11451055
"description": |-
11461056
Lifecycle is a struct that contains the lifecycle settings for a resource. It controls the behavior of the resource when it is deployed or destroyed.
1147-
resources.registered_models.*.grants.*:
1148-
"principal":
1149-
"description": |-
1150-
The name of the principal that will be granted privileges
1151-
"privileges":
1152-
"description": |-
1153-
The privileges to grant to the specified entity
11541057
resources.schemas.*:
11551058
"_":
11561059
"markdown_description": |-
@@ -1164,48 +1067,6 @@ resources.schemas.*:
11641067
"lifecycle":
11651068
"description": |-
11661069
Lifecycle is a struct that contains the lifecycle settings for a resource. It controls the behavior of the resource when it is deployed or destroyed.
1167-
resources.schemas.*.grants.*:
1168-
"principal":
1169-
"description": |-
1170-
PLACEHOLDER
1171-
"privileges":
1172-
"description": |-
1173-
PLACEHOLDER
1174-
resources.schemas.*.grants.*.privileges.*:
1175-
"_":
1176-
"enum":
1177-
- |-
1178-
ALL_PRIVILEGES
1179-
- |-
1180-
APPLY_TAG
1181-
- |-
1182-
CREATE_FUNCTION
1183-
- |-
1184-
CREATE_MATERIALIZED_VIEW
1185-
- |-
1186-
CREATE_MODEL
1187-
- |-
1188-
CREATE_TABLE
1189-
- |-
1190-
CREATE_VOLUME
1191-
- |-
1192-
EXECUTE
1193-
- |-
1194-
EXTERNAL_USE_SCHEMA
1195-
- |-
1196-
MANAGE
1197-
- |-
1198-
MODIFY
1199-
- |-
1200-
READ_VOLUME
1201-
- |-
1202-
REFRESH
1203-
- |-
1204-
SELECT
1205-
- |-
1206-
USE_SCHEMA
1207-
- |-
1208-
WRITE_VOLUME
12091070
resources.secret_scopes.*:
12101071
"backend_type":
12111072
"description": |-
@@ -1340,26 +1201,6 @@ resources.volumes.*:
13401201
"lifecycle":
13411202
"description": |-
13421203
Lifecycle is a struct that contains the lifecycle settings for a resource. It controls the behavior of the resource when it is deployed or destroyed.
1343-
resources.volumes.*.grants.*:
1344-
"principal":
1345-
"description": |-
1346-
PLACEHOLDER
1347-
"privileges":
1348-
"description": |-
1349-
PLACEHOLDER
1350-
resources.volumes.*.grants.*.privileges.*:
1351-
"_":
1352-
"enum":
1353-
- |-
1354-
ALL_PRIVILEGES
1355-
- |-
1356-
APPLY_TAG
1357-
- |-
1358-
MANAGE
1359-
- |-
1360-
READ_VOLUME
1361-
- |-
1362-
WRITE_VOLUME
13631204
root:
13641205
"artifacts":
13651206
"description": |-

0 commit comments

Comments
 (0)