Skip to content

Commit 45c5cd4

Browse files
denikdenik
committed
update
1 parent eaf3797 commit 45c5cd4

File tree

2 files changed

+85
-180
lines changed

2 files changed

+85
-180
lines changed

‎bundle/schema/jsonschema_for_docs.json‎

Lines changed: 82 additions & 180 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,11 @@
144144
"$ref": "#/$defs/github.com/databricks/databricks-sdk-go/service/apps.GitSource",
145145
"x-since-version": "v0.290.0"
146146
},
147+
"lifecycle": {
148+
"description": "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.",
149+
"$ref": "#/$defs/github.com/databricks/cli/bundle/config/resources.Lifecycle",
150+
"x-since-version": "v0.268.0"
151+
},
147152
"name": {
148153
"description": "The name of the app. The name must contain only lowercase alphanumeric characters and hyphens.\nIt must be unique within the workspace.",
149154
"$ref": "#/$defs/string",
@@ -173,11 +178,6 @@
173178
"$ref": "#/$defs/string",
174179
"x-since-version": "v0.283.0"
175180
},
176-
"lifecycle": {
177-
"description": "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.",
178-
"$ref": "#/$defs/github.com/databricks/cli/bundle/config/resources.Lifecycle",
179-
"x-since-version": "v0.268.0"
180-
},
181181
"user_api_scopes": {
182182
"$ref": "#/$defs/slice/string",
183183
"x-since-version": "v0.246.0"
@@ -304,36 +304,6 @@
304304
"name"
305305
]
306306
},
307-
"resources.CatalogGrantPrivilege": {
308-
"type": "string",
309-
"enum": [
310-
"ALL_PRIVILEGES",
311-
"APPLY_TAG",
312-
"CREATE_CONNECTION",
313-
"CREATE_EXTERNAL_LOCATION",
314-
"CREATE_EXTERNAL_TABLE",
315-
"CREATE_EXTERNAL_VOLUME",
316-
"CREATE_FOREIGN_CATALOG",
317-
"CREATE_FUNCTION",
318-
"CREATE_MANAGED_STORAGE",
319-
"CREATE_MATERIALIZED_VIEW",
320-
"CREATE_MODEL",
321-
"CREATE_SCHEMA",
322-
"CREATE_STORAGE_CREDENTIAL",
323-
"CREATE_TABLE",
324-
"CREATE_VOLUME",
325-
"EXECUTE",
326-
"MANAGE",
327-
"MODIFY",
328-
"READ_VOLUME",
329-
"REFRESH",
330-
"SELECT",
331-
"USE_CATALOG",
332-
"USE_CONNECTION",
333-
"USE_SCHEMA",
334-
"WRITE_VOLUME"
335-
]
336-
},
337307
"resources.Cluster": {
338308
"type": "object",
339309
"description": "Contains a snapshot of the latest user specified settings that were used to create/edit the cluster.",
@@ -804,7 +774,6 @@
804774
"CAN_MANAGE"
805775
]
806776
},
807-
<<<<<<< HEAD
808777
"resources.DatabaseProjectPermission": {
809778
"type": "object",
810779
"properties": {
@@ -830,37 +799,13 @@
830799
"level"
831800
]
832801
},
833-
||||||| parent of 839ba969a (generate)
834-
=======
835-
"resources.DatabaseProjectPermission": {
836-
"type": "object",
837-
"properties": {
838-
"group_name": {
839-
"$ref": "#/$defs/string"
840-
},
841-
"level": {
842-
"$ref": "#/$defs/github.com/databricks/cli/bundle/config/resources.DatabaseProjectPermissionLevel"
843-
},
844-
"service_principal_name": {
845-
"$ref": "#/$defs/string"
846-
},
847-
"user_name": {
848-
"$ref": "#/$defs/string"
849-
}
850-
},
851-
"additionalProperties": false,
852-
"required": [
853-
"level"
802+
"resources.DatabaseProjectPermissionLevel": {
803+
"type": "string",
804+
"enum": [
805+
"CAN_USE",
806+
"CAN_MANAGE"
854807
]
855808
},
856-
>>>>>>> 839ba969a (generate)
857-
"resources.DatabaseProjectPermissionLevel": {
858-
"type": "string",
859-
"enum": [
860-
"CAN_USE",
861-
"CAN_MANAGE"
862-
]
863-
},
864809
"resources.ExternalLocation": {
865810
"type": "object",
866811
"properties": {
@@ -920,21 +865,6 @@
920865
"url"
921866
]
922867
},
923-
"resources.ExternalLocationGrantPrivilege": {
924-
"type": "string",
925-
"description": "Privilege to grant on an external location",
926-
"enum": [
927-
"ALL_PRIVILEGES",
928-
"CREATE_EXTERNAL_TABLE",
929-
"CREATE_EXTERNAL_VOLUME",
930-
"CREATE_MANAGED_STORAGE",
931-
"CREATE_TABLE",
932-
"CREATE_VOLUME",
933-
"MANAGE",
934-
"READ_FILES",
935-
"WRITE_FILES"
936-
]
937-
},
938868
"resources.Job": {
939869
"type": "object",
940870
"properties": {
@@ -1705,21 +1635,14 @@
17051635
"$ref": "#/$defs/github.com/databricks/cli/bundle/config/resources.Lifecycle",
17061636
"x-since-version": "v0.287.0"
17071637
},
1708-
<<<<<<< HEAD
17091638
"permissions": {
17101639
"$ref": "#/$defs/slice/github.com/databricks/cli/bundle/config/resources.DatabaseProjectPermission",
17111640
"x-since-version": "v0.292.0"
17121641
},
1713-
||||||| parent of 839ba969a (generate)
1714-
=======
1715-
"permissions": {
1716-
"$ref": "#/$defs/slice/github.com/databricks/cli/bundle/config/resources.DatabaseProjectPermission"
1717-
},
1718-
>>>>>>> 839ba969a (generate)
17191642
"pg_version": {
1720-
"$ref": "#/$defs/int",
1721-
"x-since-version": "v0.287.0"
1722-
},
1643+
"$ref": "#/$defs/int",
1644+
"x-since-version": "v0.287.0"
1645+
},
17231646
"project_id": {
17241647
"$ref": "#/$defs/string",
17251648
"x-since-version": "v0.287.0"
@@ -1943,27 +1866,6 @@
19431866
],
19441867
"markdownDescription": "The schema resource type allows you to define Unity Catalog [schemas](https://docs.databricks.com/api/workspace/schemas/create) for tables and other assets in your workflows and pipelines created as part of a bundle. A schema, different from other resource types, has the following limitations:\n\n- The owner of a schema resource is always the deployment user, and cannot be changed. If `run_as` is specified in the bundle, it will be ignored by operations on the schema.\n- Only fields supported by the corresponding [Schemas object create API](https://docs.databricks.com/api/workspace/schemas/create) are available for the schema resource. For example, `enable_predictive_optimization` is not supported as it is only available on the [update API](https://docs.databricks.com/api/workspace/schemas/update)."
19451868
},
1946-
"resources.SchemaGrantPrivilege": {
1947-
"type": "string",
1948-
"enum": [
1949-
"ALL_PRIVILEGES",
1950-
"APPLY_TAG",
1951-
"CREATE_FUNCTION",
1952-
"CREATE_MATERIALIZED_VIEW",
1953-
"CREATE_MODEL",
1954-
"CREATE_TABLE",
1955-
"CREATE_VOLUME",
1956-
"EXECUTE",
1957-
"EXTERNAL_USE_SCHEMA",
1958-
"MANAGE",
1959-
"MODIFY",
1960-
"READ_VOLUME",
1961-
"REFRESH",
1962-
"SELECT",
1963-
"USE_SCHEMA",
1964-
"WRITE_VOLUME"
1965-
]
1966-
},
19671869
"resources.SecretScope": {
19681870
"type": "object",
19691871
"properties": {
@@ -3740,6 +3642,75 @@
37403642
"timestamp_col"
37413643
]
37423644
},
3645+
"catalog.Privilege": {
3646+
"type": "string",
3647+
"enum": [
3648+
"SELECT",
3649+
"READ_PRIVATE_FILES",
3650+
"WRITE_PRIVATE_FILES",
3651+
"CREATE",
3652+
"USAGE",
3653+
"USE_CATALOG",
3654+
"USE_SCHEMA",
3655+
"CREATE_SCHEMA",
3656+
"CREATE_VIEW",
3657+
"CREATE_EXTERNAL_TABLE",
3658+
"CREATE_MATERIALIZED_VIEW",
3659+
"CREATE_FUNCTION",
3660+
"CREATE_MODEL",
3661+
"CREATE_CATALOG",
3662+
"CREATE_MANAGED_STORAGE",
3663+
"CREATE_EXTERNAL_LOCATION",
3664+
"CREATE_STORAGE_CREDENTIAL",
3665+
"CREATE_SERVICE_CREDENTIAL",
3666+
"ACCESS",
3667+
"CREATE_SHARE",
3668+
"CREATE_RECIPIENT",
3669+
"CREATE_PROVIDER",
3670+
"USE_SHARE",
3671+
"USE_RECIPIENT",
3672+
"USE_PROVIDER",
3673+
"USE_MARKETPLACE_ASSETS",
3674+
"SET_SHARE_PERMISSION",
3675+
"MODIFY",
3676+
"REFRESH",
3677+
"EXECUTE",
3678+
"READ_FILES",
3679+
"WRITE_FILES",
3680+
"CREATE_TABLE",
3681+
"ALL_PRIVILEGES",
3682+
"CREATE_CONNECTION",
3683+
"USE_CONNECTION",
3684+
"APPLY_TAG",
3685+
"CREATE_FOREIGN_CATALOG",
3686+
"CREATE_FOREIGN_SECURABLE",
3687+
"MANAGE_ALLOWLIST",
3688+
"CREATE_VOLUME",
3689+
"CREATE_EXTERNAL_VOLUME",
3690+
"READ_VOLUME",
3691+
"WRITE_VOLUME",
3692+
"MANAGE",
3693+
"BROWSE",
3694+
"CREATE_CLEAN_ROOM",
3695+
"MODIFY_CLEAN_ROOM",
3696+
"EXECUTE_CLEAN_ROOM_TASK",
3697+
"EXTERNAL_USE_SCHEMA"
3698+
]
3699+
},
3700+
"catalog.PrivilegeAssignment": {
3701+
"type": "object",
3702+
"properties": {
3703+
"principal": {
3704+
"description": "The principal (user email address or group name).\nFor deleted principals, `principal` is empty while `principal_id` is populated.",
3705+
"$ref": "#/$defs/string"
3706+
},
3707+
"privileges": {
3708+
"description": "The privileges assigned to the principal.",
3709+
"$ref": "#/$defs/slice/github.com/databricks/databricks-sdk-go/service/catalog.Privilege"
3710+
}
3711+
},
3712+
"additionalProperties": false
3713+
},
37433714
"catalog.RegisteredModelAlias": {
37443715
"type": "object",
37453716
"properties": {
@@ -8816,75 +8787,6 @@
88168787
"resource_id"
88178788
]
88188789
},
8819-
"catalog.Privilege": {
8820-
"type": "string",
8821-
"enum": [
8822-
"SELECT",
8823-
"READ_PRIVATE_FILES",
8824-
"WRITE_PRIVATE_FILES",
8825-
"CREATE",
8826-
"USAGE",
8827-
"USE_CATALOG",
8828-
"USE_SCHEMA",
8829-
"CREATE_SCHEMA",
8830-
"CREATE_VIEW",
8831-
"CREATE_EXTERNAL_TABLE",
8832-
"CREATE_MATERIALIZED_VIEW",
8833-
"CREATE_FUNCTION",
8834-
"CREATE_MODEL",
8835-
"CREATE_CATALOG",
8836-
"CREATE_MANAGED_STORAGE",
8837-
"CREATE_EXTERNAL_LOCATION",
8838-
"CREATE_STORAGE_CREDENTIAL",
8839-
"CREATE_SERVICE_CREDENTIAL",
8840-
"ACCESS",
8841-
"CREATE_SHARE",
8842-
"CREATE_RECIPIENT",
8843-
"CREATE_PROVIDER",
8844-
"USE_SHARE",
8845-
"USE_RECIPIENT",
8846-
"USE_PROVIDER",
8847-
"USE_MARKETPLACE_ASSETS",
8848-
"SET_SHARE_PERMISSION",
8849-
"MODIFY",
8850-
"REFRESH",
8851-
"EXECUTE",
8852-
"READ_FILES",
8853-
"WRITE_FILES",
8854-
"CREATE_TABLE",
8855-
"ALL_PRIVILEGES",
8856-
"CREATE_CONNECTION",
8857-
"USE_CONNECTION",
8858-
"APPLY_TAG",
8859-
"CREATE_FOREIGN_CATALOG",
8860-
"CREATE_FOREIGN_SECURABLE",
8861-
"MANAGE_ALLOWLIST",
8862-
"CREATE_VOLUME",
8863-
"CREATE_EXTERNAL_VOLUME",
8864-
"READ_VOLUME",
8865-
"WRITE_VOLUME",
8866-
"MANAGE",
8867-
"BROWSE",
8868-
"CREATE_CLEAN_ROOM",
8869-
"MODIFY_CLEAN_ROOM",
8870-
"EXECUTE_CLEAN_ROOM_TASK",
8871-
"EXTERNAL_USE_SCHEMA"
8872-
]
8873-
},
8874-
"catalog.PrivilegeAssignment": {
8875-
"type": "object",
8876-
"properties": {
8877-
"principal": {
8878-
"description": "The principal (user email address or group name).\nFor deleted principals, `principal` is empty while `principal_id` is populated.",
8879-
"$ref": "#/$defs/string"
8880-
},
8881-
"privileges": {
8882-
"description": "The privileges assigned to the principal.",
8883-
"$ref": "#/$defs/slice/github.com/databricks/databricks-sdk-go/service/catalog.Privilege"
8884-
}
8885-
},
8886-
"additionalProperties": false
8887-
},
88888790
"workspace.ScopeBackendType": {
88898791
"type": "string",
88908792
"description": "The types of secret scope backends in the Secret Manager. Azure KeyVault backed secret scopes\nwill be supported in a later release.",

‎python/databricks/bundles/schemas/__init__.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
"Lifecycle",
33
"LifecycleDict",
44
"LifecycleParam",
5+
"Privilege",
56
"PrivilegeAssignment",
67
"PrivilegeAssignmentDict",
78
"PrivilegeAssignmentParam",
9+
"PrivilegeParam",
810
"Schema",
911
"SchemaDict",
1012
"SchemaParam",
@@ -16,6 +18,7 @@
1618
LifecycleDict,
1719
LifecycleParam,
1820
)
21+
from databricks.bundles.schemas._models.privilege import Privilege, PrivilegeParam
1922
from databricks.bundles.schemas._models.privilege_assignment import (
2023
PrivilegeAssignment,
2124
PrivilegeAssignmentDict,

0 commit comments

Comments
 (0)