From 915295965f82a5e0d91d7e1b7f2301aff793dda2 Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Fri, 21 Nov 2025 14:03:54 +0000 Subject: [PATCH 1/3] Regenerate autogenerated files This equalizes a diff with the current version of the templates. --- .../internal/schema/annotations_openapi.yml | 26 ------------ .../schema/annotations_openapi_overrides.yml | 4 ++ bundle/schema/jsonschema.json | 17 +------- cmd/account/workspaces/workspaces.go | 4 +- cmd/workspace/apps/apps.go | 40 +++++++++---------- cmd/workspace/clusters/clusters.go | 4 +- .../model-registry/model-registry.go | 2 +- cmd/workspace/pipelines/pipelines.go | 2 +- cmd/workspace/policies/policies.go | 4 +- cmd/workspace/workspace/workspace.go | 4 +- 10 files changed, 36 insertions(+), 71 deletions(-) diff --git a/bundle/internal/schema/annotations_openapi.yml b/bundle/internal/schema/annotations_openapi.yml index 6e1b1da081..a2704cf7f5 100644 --- a/bundle/internal/schema/annotations_openapi.yml +++ b/bundle/internal/schema/annotations_openapi.yml @@ -1192,8 +1192,6 @@ github.com/databricks/databricks-sdk-go/service/apps.ComputeSize: MEDIUM - |- LARGE - - |- - LIQUID github.com/databricks/databricks-sdk-go/service/apps.ComputeState: "_": "enum": @@ -3761,10 +3759,6 @@ github.com/databricks/databricks-sdk-go/service/pipelines.IngestionSourceType: MYSQL - |- POSTGRESQL - - |- - REDSHIFT - - |- - SQLDW - |- SQLSERVER - |- @@ -3789,26 +3783,6 @@ github.com/databricks/databricks-sdk-go/service/pipelines.IngestionSourceType: SHAREPOINT - |- DYNAMICS365 - - |- - CONFLUENCE - - |- - META_MARKETING - - |- - GOOGLE_ADS - - |- - TIKTOK_ADS - - |- - SALESFORCE_MARKETING_CLOUD - - |- - HUBSPOT - - |- - WORKDAY_HCM - - |- - GUIDEWIRE - - |- - ZENDESK - - |- - FOREIGN_CATALOG github.com/databricks/databricks-sdk-go/service/pipelines.ManualTrigger: {} github.com/databricks/databricks-sdk-go/service/pipelines.NotebookLibrary: "path": diff --git a/bundle/internal/schema/annotations_openapi_overrides.yml b/bundle/internal/schema/annotations_openapi_overrides.yml index 72d50bf2ab..51ed3d0db4 100644 --- a/bundle/internal/schema/annotations_openapi_overrides.yml +++ b/bundle/internal/schema/annotations_openapi_overrides.yml @@ -594,6 +594,10 @@ github.com/databricks/cli/bundle/config/resources.SqlWarehousePermissionLevel: CAN_MONITOR - |- CAN_VIEW +github.com/databricks/cli/bundle/config/resources.SyncedDatabaseTable: + "lifecycle": + "description": |- + PLACEHOLDER github.com/databricks/cli/bundle/config/resources.Volume: "_": "markdown_description": |- diff --git a/bundle/schema/jsonschema.json b/bundle/schema/jsonschema.json index 3a92b4e929..9c892a15ba 100644 --- a/bundle/schema/jsonschema.json +++ b/bundle/schema/jsonschema.json @@ -3102,8 +3102,7 @@ "type": "string", "enum": [ "MEDIUM", - "LARGE", - "LIQUID" + "LARGE" ] }, { @@ -7090,8 +7089,6 @@ "enum": [ "MYSQL", "POSTGRESQL", - "REDSHIFT", - "SQLDW", "SQLSERVER", "SALESFORCE", "BIGQUERY", @@ -7103,17 +7100,7 @@ "ORACLE", "TERADATA", "SHAREPOINT", - "DYNAMICS365", - "CONFLUENCE", - "META_MARKETING", - "GOOGLE_ADS", - "TIKTOK_ADS", - "SALESFORCE_MARKETING_CLOUD", - "HUBSPOT", - "WORKDAY_HCM", - "GUIDEWIRE", - "ZENDESK", - "FOREIGN_CATALOG" + "DYNAMICS365" ] }, { diff --git a/cmd/account/workspaces/workspaces.go b/cmd/account/workspaces/workspaces.go index 9272b1f8a1..6a360bcd48 100755 --- a/cmd/account/workspaces/workspaces.go +++ b/cmd/account/workspaces/workspaces.go @@ -95,7 +95,7 @@ func newCreate() *cobra.Command { PREMIUM, STANDARD, UNKNOWN, -].`) +]`) cmd.Flags().StringVar(&createReq.PrivateAccessSettingsId, "private-access-settings-id", createReq.PrivateAccessSettingsId, `ID of the workspace's private access settings object.`) cmd.Flags().StringVar(&createReq.StorageConfigurationId, "storage-configuration-id", createReq.StorageConfigurationId, `ID of the workspace's storage configuration object.`) cmd.Flags().StringVar(&createReq.StorageCustomerManagedKeyId, "storage-customer-managed-key-id", createReq.StorageCustomerManagedKeyId, `The ID of the workspace's storage encryption key configuration object.`) @@ -399,7 +399,7 @@ func newUpdate() *cobra.Command { NOT_PROVISIONED, PROVISIONING, RUNNING, -].`) +]`) // TODO: complex arg: gcp_managed_network_config // TODO: complex arg: gke_config cmd.Flags().StringVar(&updateReq.CustomerFacingWorkspace.Location, "location", updateReq.CustomerFacingWorkspace.Location, `The Google Cloud region of the workspace data plane in your Google account (for example, us-east4).`) diff --git a/cmd/workspace/apps/apps.go b/cmd/workspace/apps/apps.go index 8def993cc6..34824ddba0 100755 --- a/cmd/workspace/apps/apps.go +++ b/cmd/workspace/apps/apps.go @@ -86,7 +86,7 @@ func newCreate() *cobra.Command { // TODO: complex arg: active_deployment // TODO: complex arg: app_status cmd.Flags().StringVar(&createReq.App.BudgetPolicyId, "budget-policy-id", createReq.App.BudgetPolicyId, ``) - cmd.Flags().Var(&createReq.App.ComputeSize, "compute-size", `Supported values: [LARGE, LIQUID, MEDIUM]`) + cmd.Flags().Var(&createReq.App.ComputeSize, "compute-size", `Supported values: [LARGE, MEDIUM]`) // TODO: complex arg: compute_status cmd.Flags().StringVar(&createReq.App.Description, "description", createReq.App.Description, `The description of the app.`) // TODO: array: effective_user_api_scopes @@ -97,7 +97,7 @@ func newCreate() *cobra.Command { cmd.Use = "create NAME" cmd.Short = `Create an app.` cmd.Long = `Create an app. - + Creates a new app. Arguments: @@ -205,20 +205,20 @@ func newCreateUpdate() *cobra.Command { cmd.Use = "create-update APP_NAME UPDATE_MASK" cmd.Short = `Create an app update.` cmd.Long = `Create an app update. - + Creates an app update and starts the update process. The update process is asynchronous and the status of the update can be checked with the GetAppUpdate method. Arguments: - APP_NAME: + APP_NAME: UPDATE_MASK: The field mask must be a single string, with multiple fields separated by commas (no spaces). The field path is relative to the resource object, using a dot (.) to navigate sub-fields (e.g., author.given_name). Specification of elements in sequence or map fields is not allowed, as only the entire collection field can be specified. Field names must exactly match the resource field names. - + A field mask of * indicates full replacement. It’s recommended to always explicitly list the fields being updated and avoid using * wildcards, as it can lead to unintended results if the API changes in the @@ -315,7 +315,7 @@ func newDelete() *cobra.Command { cmd.Use = "delete NAME" cmd.Short = `Delete an app.` cmd.Long = `Delete an app. - + Deletes an app. Arguments: @@ -387,7 +387,7 @@ func newDeploy() *cobra.Command { cmd.Use = "deploy APP_NAME" cmd.Short = `Create an app deployment.` cmd.Long = `Create an app deployment. - + Creates an app deployment for the app with the supplied name. Arguments: @@ -474,7 +474,7 @@ func newGet() *cobra.Command { cmd.Use = "get NAME" cmd.Short = `Get an app.` cmd.Long = `Get an app. - + Retrieves information for the app with the supplied name. Arguments: @@ -530,7 +530,7 @@ func newGetDeployment() *cobra.Command { cmd.Use = "get-deployment APP_NAME DEPLOYMENT_ID" cmd.Short = `Get an app deployment.` cmd.Long = `Get an app deployment. - + Retrieves information for the app deployment with the supplied name and deployment id. @@ -589,7 +589,7 @@ func newGetPermissionLevels() *cobra.Command { cmd.Use = "get-permission-levels APP_NAME" cmd.Short = `Get app permission levels.` cmd.Long = `Get app permission levels. - + Gets the permission levels that a user can have on an object. Arguments: @@ -645,7 +645,7 @@ func newGetPermissions() *cobra.Command { cmd.Use = "get-permissions APP_NAME" cmd.Short = `Get app permissions.` cmd.Long = `Get app permissions. - + Gets the permissions of an app. Apps can inherit permissions from their root object. @@ -702,7 +702,7 @@ func newGetUpdate() *cobra.Command { cmd.Use = "get-update APP_NAME" cmd.Short = `Get an app update.` cmd.Long = `Get an app update. - + Gets the status of an app update. Arguments: @@ -761,7 +761,7 @@ func newList() *cobra.Command { cmd.Use = "list" cmd.Short = `List apps.` cmd.Long = `List apps. - + Lists all apps in the workspace.` cmd.Annotations = make(map[string]string) @@ -812,7 +812,7 @@ func newListDeployments() *cobra.Command { cmd.Use = "list-deployments APP_NAME" cmd.Short = `List app deployments.` cmd.Long = `List app deployments. - + Lists all app deployments for the app with the supplied name. Arguments: @@ -870,7 +870,7 @@ func newSetPermissions() *cobra.Command { cmd.Use = "set-permissions APP_NAME" cmd.Short = `Set app permissions.` cmd.Long = `Set app permissions. - + Sets permissions on an object, replacing existing permissions if they exist. Deletes all direct permissions if none are specified. Objects can inherit permissions from their root object. @@ -946,7 +946,7 @@ func newStart() *cobra.Command { cmd.Use = "start NAME" cmd.Short = `Start an app.` cmd.Long = `Start an app. - + Start the last active deployment of the app in the workspace. Arguments: @@ -1027,7 +1027,7 @@ func newStop() *cobra.Command { cmd.Use = "stop NAME" cmd.Short = `Stop an app.` cmd.Long = `Stop an app. - + Stops the active deployment of the app in the workspace. Arguments: @@ -1106,7 +1106,7 @@ func newUpdate() *cobra.Command { // TODO: complex arg: active_deployment // TODO: complex arg: app_status cmd.Flags().StringVar(&updateReq.App.BudgetPolicyId, "budget-policy-id", updateReq.App.BudgetPolicyId, ``) - cmd.Flags().Var(&updateReq.App.ComputeSize, "compute-size", `Supported values: [LARGE, LIQUID, MEDIUM]`) + cmd.Flags().Var(&updateReq.App.ComputeSize, "compute-size", `Supported values: [LARGE, MEDIUM]`) // TODO: complex arg: compute_status cmd.Flags().StringVar(&updateReq.App.Description, "description", updateReq.App.Description, `The description of the app.`) // TODO: array: effective_user_api_scopes @@ -1117,7 +1117,7 @@ func newUpdate() *cobra.Command { cmd.Use = "update NAME" cmd.Short = `Update an app.` cmd.Long = `Update an app. - + Updates the app with the supplied name. Arguments: @@ -1191,7 +1191,7 @@ func newUpdatePermissions() *cobra.Command { cmd.Use = "update-permissions APP_NAME" cmd.Short = `Update app permissions.` cmd.Long = `Update app permissions. - + Updates the permissions on an app. Apps can inherit permissions from their root object. diff --git a/cmd/workspace/clusters/clusters.go b/cmd/workspace/clusters/clusters.go index ebaa1e7803..9d99e81062 100755 --- a/cmd/workspace/clusters/clusters.go +++ b/cmd/workspace/clusters/clusters.go @@ -215,7 +215,7 @@ func newCreate() *cobra.Command { NONE, SINGLE_USER, USER_ISOLATION, -].`) +]`) // TODO: complex arg: docker_image cmd.Flags().StringVar(&createReq.DriverInstancePoolId, "driver-instance-pool-id", createReq.DriverInstancePoolId, `The optional ID of the instance pool for the driver of the cluster belongs.`) cmd.Flags().StringVar(&createReq.DriverNodeTypeId, "driver-node-type-id", createReq.DriverNodeTypeId, `The node type of the Spark driver.`) @@ -490,7 +490,7 @@ func newEdit() *cobra.Command { NONE, SINGLE_USER, USER_ISOLATION, -].`) +]`) // TODO: complex arg: docker_image cmd.Flags().StringVar(&editReq.DriverInstancePoolId, "driver-instance-pool-id", editReq.DriverInstancePoolId, `The optional ID of the instance pool for the driver of the cluster belongs.`) cmd.Flags().StringVar(&editReq.DriverNodeTypeId, "driver-node-type-id", editReq.DriverNodeTypeId, `The node type of the Spark driver.`) diff --git a/cmd/workspace/model-registry/model-registry.go b/cmd/workspace/model-registry/model-registry.go index 618b22cce1..8340a80cc9 100755 --- a/cmd/workspace/model-registry/model-registry.go +++ b/cmd/workspace/model-registry/model-registry.go @@ -2148,7 +2148,7 @@ func newTestRegistryWebhook() *cobra.Command { TRANSITION_REQUEST_TO_ARCHIVED_CREATED, TRANSITION_REQUEST_TO_PRODUCTION_CREATED, TRANSITION_REQUEST_TO_STAGING_CREATED, -].`) +]`) cmd.Use = "test-registry-webhook ID" cmd.Short = `Test a webhook.` diff --git a/cmd/workspace/pipelines/pipelines.go b/cmd/workspace/pipelines/pipelines.go index 758c398640..d58dd5f605 100755 --- a/cmd/workspace/pipelines/pipelines.go +++ b/cmd/workspace/pipelines/pipelines.go @@ -763,7 +763,7 @@ func newStartUpdate() *cobra.Command { SCHEMA_CHANGE, SERVICE_UPGRADE, USER_ACTION, -].`) +]`) cmd.Flags().BoolVar(&startUpdateReq.FullRefresh, "full-refresh", startUpdateReq.FullRefresh, `If true, this update will reset all tables before running.`) // TODO: array: full_refresh_selection // TODO: array: refresh_selection diff --git a/cmd/workspace/policies/policies.go b/cmd/workspace/policies/policies.go index 3115ce9a5f..15a45238f9 100755 --- a/cmd/workspace/policies/policies.go +++ b/cmd/workspace/policies/policies.go @@ -93,7 +93,7 @@ func newCreatePolicy() *cobra.Command { STORAGE_CREDENTIAL, TABLE, VOLUME, -].`) +]`) // TODO: complex arg: row_filter cmd.Flags().StringVar(&createPolicyReq.PolicyInfo.WhenCondition, "when-condition", createPolicyReq.PolicyInfo.WhenCondition, `Optional condition when the policy should take effect.`) @@ -432,7 +432,7 @@ func newUpdatePolicy() *cobra.Command { STORAGE_CREDENTIAL, TABLE, VOLUME, -].`) +]`) // TODO: complex arg: row_filter cmd.Flags().StringVar(&updatePolicyReq.PolicyInfo.WhenCondition, "when-condition", updatePolicyReq.PolicyInfo.WhenCondition, `Optional condition when the policy should take effect.`) diff --git a/cmd/workspace/workspace/workspace.go b/cmd/workspace/workspace/workspace.go index 0b4b7e7ddf..502b11fdb7 100755 --- a/cmd/workspace/workspace/workspace.go +++ b/cmd/workspace/workspace/workspace.go @@ -180,7 +180,7 @@ func newExport() *cobra.Command { RAW, R_MARKDOWN, SOURCE, -].`) +]`) cmd.Use = "export PATH" cmd.Short = `Export a workspace object.` @@ -444,7 +444,7 @@ func newImport() *cobra.Command { RAW, R_MARKDOWN, SOURCE, -].`) +]`) cmd.Flags().Var(&importReq.Language, "language", `The language of the object. Supported values: [PYTHON, R, SCALA, SQL]`) cmd.Flags().BoolVar(&importReq.Overwrite, "overwrite", importReq.Overwrite, `The flag that specifies whether to overwrite existing object.`) From 5e218b7f8d2851c5e134dac406e8dce3a4671596 Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Fri, 21 Nov 2025 15:39:37 +0100 Subject: [PATCH 2/3] Update acc --- acceptance/cmd/workspace/apps/output.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acceptance/cmd/workspace/apps/output.txt b/acceptance/cmd/workspace/apps/output.txt index 775a200604..f7d7a7b07b 100644 --- a/acceptance/cmd/workspace/apps/output.txt +++ b/acceptance/cmd/workspace/apps/output.txt @@ -64,7 +64,7 @@ Usage: Flags: --budget-policy-id string - --compute-size ComputeSize Supported values: [LARGE, LIQUID, MEDIUM] + --compute-size ComputeSize Supported values: [LARGE, MEDIUM] --description string The description of the app. -h, --help help for update --json JSON either inline JSON string or @path/to/file.json with request body (default JSON (0 bytes)) From 27ef046fe770f32376756fd6a242a0e124a5f964 Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Fri, 21 Nov 2025 15:48:25 +0100 Subject: [PATCH 3/3] Revert annotation overrides --- bundle/internal/schema/annotations_openapi_overrides.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/bundle/internal/schema/annotations_openapi_overrides.yml b/bundle/internal/schema/annotations_openapi_overrides.yml index 51ed3d0db4..72d50bf2ab 100644 --- a/bundle/internal/schema/annotations_openapi_overrides.yml +++ b/bundle/internal/schema/annotations_openapi_overrides.yml @@ -594,10 +594,6 @@ github.com/databricks/cli/bundle/config/resources.SqlWarehousePermissionLevel: CAN_MONITOR - |- CAN_VIEW -github.com/databricks/cli/bundle/config/resources.SyncedDatabaseTable: - "lifecycle": - "description": |- - PLACEHOLDER github.com/databricks/cli/bundle/config/resources.Volume: "_": "markdown_description": |-