Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .codegen/_openapi_sha
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0555d6a59265799ed8ea12f355eee662e739430d
87b666fa172b01444d306112309b6109c096f98b
Empty file modified .github/workflows/tagging.yml
100644 → 100755
Empty file.
3 changes: 3 additions & 0 deletions NEXT_CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@
* Retry transient HTTP 504 Gateway Timeout errors in direct deployment engine ([#5349](https://github.com/databricks/cli/pull/5349)).

### Dependency updates
* Bump `github.com/databricks/databricks-sdk-go` from v0.136.0 to v0.138.0 ([#5361](https://github.com/databricks/cli/pull/5361))

### API Changes
7 changes: 4 additions & 3 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,7 @@ tasks:
fi
git checkout $(cat {{.ROOT_DIR}}/.codegen/_openapi_sha)
- echo "Building genkit..."
- cd {{.UNIVERSE_DIR}} && bazel build //openapi/genkit
- cd {{.UNIVERSE_DIR}} && ./tools/bazel build //openapi/genkit
- echo "Generating CLI code..."
- "{{.UNIVERSE_DIR}}/bazel-bin/openapi/genkit/genkit_/genkit update-sdk"
- "cat .gitattributes.manual .gitattributes > .gitattributes.tmp && mv .gitattributes.tmp .gitattributes"
Expand Down Expand Up @@ -786,7 +786,8 @@ tasks:
generates:
- acceptance/bundle/refschema/out.fields.txt
cmds:
- go test ./acceptance -run TestAccept/bundle/refschema -update &> /dev/null
- cmd: go test ./acceptance -run TestAccept/bundle/refschema -update &> /dev/null
ignore_error: true # -update returns non-zero exit code on changes

generate-schema:
desc: Generate bundle JSON schema
Expand Down Expand Up @@ -874,7 +875,7 @@ tasks:
generates:
- bundle/direct/dresources/resources.generated.yml
cmds:
- "sh -c 'python3 bundle/direct/tools/generate_resources.py .codegen/openapi.json bundle/direct/dresources/apitypes.generated.yml bundle/direct/dresources/apitypes.yml acceptance/bundle/refschema/out.fields.txt > bundle/direct/dresources/resources.generated.yml'"
- "sh -c 'uv run --script bundle/direct/tools/generate_resources.py .codegen/openapi.json bundle/direct/dresources/apitypes.generated.yml bundle/direct/dresources/apitypes.yml acceptance/bundle/refschema/out.fields.txt > bundle/direct/dresources/resources.generated.yml'"

generate-openapi-json:
desc: Download OpenAPI spec (triggered by _openapi_sha change)
Expand Down
3 changes: 3 additions & 0 deletions acceptance/bundle/refschema/out.fields.txt
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ resources.apps.*.app_status *apps.ApplicationStatus ALL
resources.apps.*.app_status.message string ALL
resources.apps.*.app_status.state apps.ApplicationState ALL
resources.apps.*.budget_policy_id string ALL
resources.apps.*.compute_max_instances int ALL
resources.apps.*.compute_min_instances int ALL
resources.apps.*.compute_size apps.ComputeSize ALL
resources.apps.*.compute_status *apps.ComputeStatus ALL
resources.apps.*.compute_status.active_instances int ALL
Expand Down Expand Up @@ -2985,6 +2987,7 @@ resources.postgres_synced_tables.*.status.ongoing_sync_progress.total_row_count
resources.postgres_synced_tables.*.status.pipeline_id string REMOTE
resources.postgres_synced_tables.*.status.project string REMOTE
resources.postgres_synced_tables.*.status.provisioning_phase postgres.ProvisioningPhase REMOTE
resources.postgres_synced_tables.*.status.synced_table_id string REMOTE
resources.postgres_synced_tables.*.status.unity_catalog_provisioning_state postgres.ProvisioningInfoState REMOTE
resources.postgres_synced_tables.*.synced_table_id string ALL
resources.postgres_synced_tables.*.timeseries_key string ALL
Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/resources/apps/lifecycle-started/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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,git_repository,telemetry_export_destinations"
"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"
}
}

Expand All @@ -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,git_repository,telemetry_export_destinations"
"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"
}
}
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,git_repository,telemetry_export_destinations"
"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"
},
"method": "POST",
"path": "/api/2.0/apps/myappname/update"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@
]
},
"method": "GET",
"path": "/api/2.0/preview/scim/v2/Me"
"path": "/api/2.0/preview/scim/v2/Me",
"q": {
"excludedAttributes": "entitlements"
}
}
{
"headers": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@
]
},
"method": "GET",
"path": "/api/2.0/preview/scim/v2/Me"
"path": "/api/2.0/preview/scim/v2/Me",
"q": {
"excludedAttributes": "entitlements"
}
}
{
"headers": {
Expand Down
14 changes: 8 additions & 6 deletions acceptance/cmd/workspace/apps/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,14 @@ Usage:
databricks apps update NAME [flags]

Flags:
--budget-policy-id string
--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))
--space string Name of the space this app belongs to.
--budget-policy-id string
--compute-max-instances int Maximum number of app instances.
--compute-min-instances int Minimum number of app instances.
--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))
--space string Name of the space this app belongs to.
--usage-policy-id string

Global Flags:
Expand Down
2 changes: 2 additions & 0 deletions bundle/direct/dresources/apitypes.generated.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions bundle/direct/dresources/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ var UpdateMaskFields = []string{
"resources",
"user_api_scopes",
"compute_size",
"compute_min_instances",
"compute_max_instances",
"git_repository",
"telemetry_export_destinations",
}
Expand Down
7 changes: 7 additions & 0 deletions bundle/direct/dresources/resources.generated.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions bundle/direct/tools/generate_resources.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
#!/usr/bin/env python3
# /// script
# dependencies = [
# "pyyaml",
# ]
# ///
"""
Generate resources.generated.yml from OpenAPI schema field behaviors.
"""
Expand Down
Loading
Loading