diff --git a/NEXT_CHANGELOG.md b/NEXT_CHANGELOG.md index 2c48fdb1f20..57598672895 100644 --- a/NEXT_CHANGELOG.md +++ b/NEXT_CHANGELOG.md @@ -1,12 +1,13 @@ # NEXT CHANGELOG -## Release v1.3.0 +## Release v1.2.1 ### Notable Changes ### CLI ### Bundles +* direct: Fix updating the apps after the Go SDK upgrade ([#5444](https://github.com/databricks/cli/pull/5444)) ### Dependency updates diff --git a/acceptance/bundle/resources/apps/lifecycle-started/output.txt b/acceptance/bundle/resources/apps/lifecycle-started/output.txt index 4562a6b9b22..cfe10a2d65e 100644 --- a/acceptance/bundle/resources/apps/lifecycle-started/output.txt +++ b/acceptance/bundle/resources/apps/lifecycle-started/output.txt @@ -90,7 +90,7 @@ Deployment complete! "description": "MY_APP_DESCRIPTION_2", "name": "[UNIQUE_NAME]" }, - "update_mask": "description,budget_policy_id,usage_policy_id,resources,user_api_scopes,compute_size,compute_min_instances,compute_max_instances,git_repository,telemetry_export_destinations" + "update_mask": "description,budget_policy_id,usage_policy_id,resources,user_api_scopes,compute_size,git_repository,telemetry_export_destinations" } } @@ -117,7 +117,7 @@ Deployment complete! "description": "MY_APP_DESCRIPTION_3", "name": "[UNIQUE_NAME]" }, - "update_mask": "description,budget_policy_id,usage_policy_id,resources,user_api_scopes,compute_size,compute_min_instances,compute_max_instances,git_repository,telemetry_export_destinations" + "update_mask": "description,budget_policy_id,usage_policy_id,resources,user_api_scopes,compute_size,git_repository,telemetry_export_destinations" } } { diff --git a/acceptance/bundle/resources/apps/update/out.requests.direct.json b/acceptance/bundle/resources/apps/update/out.requests.direct.json index f2291c89cf3..e33ad270576 100644 --- a/acceptance/bundle/resources/apps/update/out.requests.direct.json +++ b/acceptance/bundle/resources/apps/update/out.requests.direct.json @@ -15,7 +15,7 @@ "description": "MY_APP_DESCRIPTION", "name": "myappname" }, - "update_mask": "description,budget_policy_id,usage_policy_id,resources,user_api_scopes,compute_size,compute_min_instances,compute_max_instances,git_repository,telemetry_export_destinations" + "update_mask": "description,budget_policy_id,usage_policy_id,resources,user_api_scopes,compute_size,git_repository,telemetry_export_destinations" }, "method": "POST", "path": "/api/2.0/apps/myappname/update" diff --git a/bundle/direct/dresources/app.go b/bundle/direct/dresources/app.go index ed6752d834d..e629027b24b 100644 --- a/bundle/direct/dresources/app.go +++ b/bundle/direct/dresources/app.go @@ -164,8 +164,8 @@ var UpdateMaskFields = []string{ "resources", "user_api_scopes", "compute_size", - "compute_min_instances", - "compute_max_instances", + // "compute_min_instances", // TODO: add back when update APIs correctly support it + // "compute_max_instances", // TODO: add back when update APIs correctly support it "git_repository", "telemetry_export_destinations", } diff --git a/bundle/direct/dresources/resources.yml b/bundle/direct/dresources/resources.yml index 8da2d5fee50..c283e6f0b68 100644 --- a/bundle/direct/dresources/resources.yml +++ b/bundle/direct/dresources/resources.yml @@ -376,6 +376,10 @@ resources: ignore_remote_changes: - field: space # This field is not yet supported by Update APIs but exposed in the API spec. TODO: fix when update APIs supports it. reason: managed + - field: compute_min_instances # This field does not work correctly in update_mask but exposed in the API spec. TODO: add back when update APIs correctly support it + reason: managed + - field: compute_max_instances # This field does not work correctly in update_mask but exposed in the API spec. TODO: add back when update APIs correctly support it + reason: managed secret_scopes: backend_defaults: