Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 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 @@
d09dbd77f5a9560cbb816746773da43a8bdbde08
11ae6f9d98f0d0838a5e53c27032f178fecc4ee0
3 changes: 0 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
NEXT_CHANGELOG.md merge=union

# Generated by genkit update-sdk:
Comment thread
simonfaltum marked this conversation as resolved.
Comment thread
simonfaltum marked this conversation as resolved.
cmd/account/access-control/access-control.go linguist-generated=true
cmd/account/billable-usage/billable-usage.go linguist-generated=true
cmd/account/budget-policy/budget-policy.go linguist-generated=true
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/tagging.yml
100644 → 100755
Comment thread
simonfaltum marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ on:
workflow_dispatch:
# No inputs are required for the manual dispatch.

# NOTE: Temporarily disable automated releases.
#
# Runs at 8:00 UTC on Monday, Tuesday, Wednesday, and Thursday. To enable automated
# tagging for a repository, simply add it to the if block of the tag job.
schedule:
- cron: '0 8 * * MON,TUE,WED,THU'
# schedule:
# - cron: '0 8 * * MON,TUE,WED,THU'

# Ensure that only a single instance of the workflow is running at a time.
concurrency:
Expand Down Expand Up @@ -58,4 +60,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
GITHUB_REPOSITORY: ${{ github.repository }}
run: uv run --locked internal/genkit/tagging.py
run: uv run --locked tagging.py
Comment thread
simonfaltum marked this conversation as resolved.
Outdated
Comment thread
simonfaltum marked this conversation as resolved.
Outdated
4 changes: 4 additions & 0 deletions NEXT_CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@

### CLI

* Added `--limit` flag to all paginated list commands for client-side result capping ([#4984](https://github.com/databricks/cli/pull/4984)).

### Bundles
Comment thread
simonfaltum marked this conversation as resolved.

### Dependency updates

* Bump `github.com/databricks/databricks-sdk-go` from v0.126.0 to v0.127.0 ([#4984](https://github.com/databricks/cli/pull/4984)).

### API Changes
145 changes: 145 additions & 0 deletions acceptance/bundle/refschema/out.fields.txt

Large diffs are not rendered by default.

21 changes: 12 additions & 9 deletions bundle/direct/dresources/catalog.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,16 @@ func (*ResourceCatalog) PrepareState(input *resources.Catalog) *catalog.CreateCa

func (*ResourceCatalog) RemapState(info *catalog.CatalogInfo) *catalog.CreateCatalog {
return &catalog.CreateCatalog{
Comment: info.Comment,
ConnectionName: info.ConnectionName,
Name: info.Name,
Options: info.Options,
Properties: info.Properties,
ProviderName: info.ProviderName,
ShareName: info.ShareName,
StorageRoot: info.StorageRoot,
ForceSendFields: utils.FilterFields[catalog.CreateCatalog](info.ForceSendFields),
Comment: info.Comment,
ConnectionName: info.ConnectionName,
ManagedEncryptionSettings: nil,
Comment thread
simonfaltum marked this conversation as resolved.
Outdated
Name: info.Name,
Options: info.Options,
Properties: info.Properties,
ProviderName: info.ProviderName,
ShareName: info.ShareName,
StorageRoot: info.StorageRoot,
ForceSendFields: utils.FilterFields[catalog.CreateCatalog](info.ForceSendFields),
}
}

Expand All @@ -53,6 +54,7 @@ func (r *ResourceCatalog) DoUpdate(ctx context.Context, id string, config *catal
Comment: config.Comment,
EnablePredictiveOptimization: "", // Not supported by DABs
IsolationMode: "", // Not supported by DABs
ManagedEncryptionSettings: nil,
Comment thread
simonfaltum marked this conversation as resolved.
Outdated
Name: id,
NewName: "", // Only set if name actually changes (see DoUpdateWithID)
Options: config.Options,
Expand All @@ -75,6 +77,7 @@ func (r *ResourceCatalog) DoUpdateWithID(ctx context.Context, id string, config
Comment: config.Comment,
EnablePredictiveOptimization: "", // Not supported by DABs
IsolationMode: "", // Not supported by DABs
ManagedEncryptionSettings: nil,
Name: id,
NewName: "", // Initialized below if needed
Options: config.Options,
Expand Down
17 changes: 9 additions & 8 deletions bundle/direct/dresources/external_location.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ func (*ResourceExternalLocation) RemapState(info *catalog.ExternalLocationInfo)
CredentialName: info.CredentialName,
// Output-only field mirrored into state to avoid churn in remapped config.
EffectiveEnableFileEvents: info.EffectiveEnableFileEvents,
EffectiveFileEventQueue: nil,
Comment thread
simonfaltum marked this conversation as resolved.
Outdated
EnableFileEvents: info.EnableFileEvents,
EncryptionDetails: info.EncryptionDetails,
Fallback: info.Fallback,
Expand Down Expand Up @@ -54,10 +55,10 @@ func (r *ResourceExternalLocation) DoCreate(ctx context.Context, config *catalog
// DoUpdate updates the external location in place and returns remote state.
func (r *ResourceExternalLocation) DoUpdate(ctx context.Context, id string, config *catalog.CreateExternalLocation, _ *PlanEntry) (*catalog.ExternalLocationInfo, error) {
updateRequest := catalog.UpdateExternalLocation{
Comment: config.Comment,
CredentialName: config.CredentialName,
// Output-only field; never sent in update payload.
EffectiveEnableFileEvents: false,
Comment: config.Comment,
CredentialName: config.CredentialName,
EffectiveEnableFileEvents: false, // Output-only field; never sent in update payload.
EffectiveFileEventQueue: nil,
EnableFileEvents: config.EnableFileEvents,
EncryptionDetails: config.EncryptionDetails,
Fallback: config.Fallback,
Expand All @@ -79,10 +80,10 @@ func (r *ResourceExternalLocation) DoUpdate(ctx context.Context, id string, conf
// DoUpdateWithID updates the external location and returns the new ID if the name changes.
func (r *ResourceExternalLocation) DoUpdateWithID(ctx context.Context, id string, config *catalog.CreateExternalLocation) (string, *catalog.ExternalLocationInfo, error) {
updateRequest := catalog.UpdateExternalLocation{
Comment: config.Comment,
CredentialName: config.CredentialName,
// Output-only field; never sent in update payload.
EffectiveEnableFileEvents: false,
Comment: config.Comment,
CredentialName: config.CredentialName,
EffectiveEnableFileEvents: false, // Output-only field; never sent in update payload.
EffectiveFileEventQueue: nil,
EnableFileEvents: config.EnableFileEvents,
EncryptionDetails: config.EncryptionDetails,
Fallback: config.Fallback,
Expand Down
1 change: 1 addition & 0 deletions bundle/direct/dresources/postgres_project.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ func (*ResourcePostgresProject) RemapState(remote *postgres.Project) *PostgresPr
ProjectSpec: postgres.ProjectSpec{
BudgetPolicyId: "",
CustomTags: nil,
DefaultBranch: "",
DefaultEndpointSettings: nil,
DisplayName: "",
EnablePgNativeLogin: false,
Expand Down
1 change: 1 addition & 0 deletions bundle/direct/dresources/type_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ var knownMissingInRemoteType = map[string][]string{
"postgres_projects": {
"budget_policy_id",
"custom_tags",
"default_branch",
"default_endpoint_settings",
"display_name",
"enable_pg_native_login",
Expand Down
3 changes: 3 additions & 0 deletions bundle/internal/schema/annotations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -849,6 +849,9 @@ github.com/databricks/cli/bundle/config/resources.PostgresProject:
"custom_tags":
"description": |-
PLACEHOLDER
"default_branch":
"description": |-
PLACEHOLDER
"default_endpoint_settings":
"description": |-
PLACEHOLDER
Expand Down
Loading
Loading