Skip to content
Merged
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
1 change: 0 additions & 1 deletion .wsignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ acceptance/bundle/artifacts/shell/err-sh/output.txt
acceptance/bundle/templates-machinery/helpers-error/output.txt

# "bundle deploy" with apps has trailing whitespace:
acceptance/bundle/apps/config_section/output.txt
integration/bundle/testdata/apps/bundle_deploy.txt

# Extra whitespace in test output:
Expand Down
1 change: 1 addition & 0 deletions NEXT_CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
### Dependency updates

### Bundles
* Remove resources.apps.config section ([#3680](https://github.com/databricks/cli/pull/3680))
* Prompt for serverless compute in `dbt-sql` template (defaults to `yes`) ([#3668](https://github.com/databricks/cli/pull/3668))

### API Changes
Expand Down
1 change: 0 additions & 1 deletion acceptance/bundle/apps/config_section/app/app.py

This file was deleted.

9 changes: 0 additions & 9 deletions acceptance/bundle/apps/config_section/databricks.yml

This file was deleted.

5 changes: 0 additions & 5 deletions acceptance/bundle/apps/config_section/out.app.yml.txt

This file was deleted.

5 changes: 0 additions & 5 deletions acceptance/bundle/apps/config_section/out.test.toml

This file was deleted.

23 changes: 0 additions & 23 deletions acceptance/bundle/apps/config_section/output.txt

This file was deleted.

4 changes: 0 additions & 4 deletions acceptance/bundle/apps/config_section/script

This file was deleted.

2 changes: 0 additions & 2 deletions acceptance/bundle/refschema/out.fields.txt
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ resources.apps.*.budget_policy_id string ALL
resources.apps.*.compute_status *apps.ComputeStatus ALL
resources.apps.*.compute_status.message string ALL
resources.apps.*.compute_status.state apps.ComputeState ALL
resources.apps.*.config map[string]any INPUT
resources.apps.*.config.* any INPUT
resources.apps.*.create_time string ALL
resources.apps.*.creator string ALL
resources.apps.*.default_source_code_path string ALL
Expand Down
45 changes: 0 additions & 45 deletions bundle/apps/interpolate_variables.go

This file was deleted.

49 changes: 0 additions & 49 deletions bundle/apps/interpolate_variables_test.go

This file was deleted.

93 changes: 0 additions & 93 deletions bundle/apps/upload_config.go

This file was deleted.

75 changes: 0 additions & 75 deletions bundle/apps/upload_config_test.go

This file was deleted.

8 changes: 0 additions & 8 deletions bundle/apps/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,6 @@ func (v *validate) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics
})
}
usedSourceCodePaths[app.SourceCodePath] = key

if app.Config != nil {
diags = append(diags, diag.Diagnostic{
Severity: diag.Warning,
Summary: "App config section detected",
Detail: fmt.Sprintf("remove 'config' from app resource '%s' section and use app.yml file in the root of this app instead", key),
})
}
}

return diags
Expand Down
12 changes: 0 additions & 12 deletions bundle/config/mutator/log_resource_references_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,6 @@ func TestConvertReferenceToMetric_Table(t *testing.T) {

"niljob": nil,
},
Apps: map[string]*cres.App{
"app1": {
Config: map[string]any{
"k": "v",
},
},
},
},
}

Expand Down Expand Up @@ -73,11 +66,6 @@ func TestConvertReferenceToMetric_Table(t *testing.T) {
ref: "resources.jobs",
want: "",
},
{
name: "mapkey censor on app config",
ref: "resources.apps.app1.config.foo",
want: "resref_apps.config.*",
},
{
name: "nil job pointer yields plain id",
ref: "resources.jobs.niljob.id",
Expand Down
6 changes: 0 additions & 6 deletions bundle/config/resources/apps.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,6 @@ type App struct {
// on local disk and to the corresponding workspace path during app deployment.
SourceCodePath string `json:"source_code_path"`

// Config is an optional field which allows configuring the app following Databricks app configuration format like in app.yml.
// When this field is set, DABs read the configuration set in this field and write
// it to app.yml in the root of the source code folder in Databricks workspace.
// If there's app.yml defined locally, DABs will raise an error.
Config map[string]any `json:"config,omitempty"`

Permissions []AppPermission `json:"permissions,omitempty"`
}

Expand Down
Loading
Loading