From ede9ec65c570d72f9952154549e4e6e72f098eab Mon Sep 17 00:00:00 2001 From: Andrew Nester Date: Mon, 3 Mar 2025 12:39:38 +0100 Subject: [PATCH 01/10] Warn about usage of apps.config section --- bundle/apps/validate.go | 19 ++++++------------- bundle/apps/validate_test.go | 16 ++++++---------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/bundle/apps/validate.go b/bundle/apps/validate.go index fc50aeafc7..8bf1856276 100644 --- a/bundle/apps/validate.go +++ b/bundle/apps/validate.go @@ -3,8 +3,6 @@ package apps import ( "context" "fmt" - "path" - "strings" "github.com/databricks/cli/bundle" "github.com/databricks/cli/libs/diag" @@ -14,7 +12,6 @@ type validate struct{} func (v *validate) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics { var diags diag.Diagnostics - possibleConfigFiles := []string{"app.yml", "app.yaml"} usedSourceCodePaths := make(map[string]string) for key, app := range b.Config.Resources.Apps { @@ -28,16 +25,12 @@ func (v *validate) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics } usedSourceCodePaths[app.SourceCodePath] = key - for _, configFile := range possibleConfigFiles { - appPath := strings.TrimPrefix(app.SourceCodePath, b.Config.Workspace.FilePath) - cf := path.Join(appPath, configFile) - if _, err := b.SyncRoot.Stat(cf); err == nil { - diags = append(diags, diag.Diagnostic{ - Severity: diag.Error, - Summary: configFile + " detected", - Detail: fmt.Sprintf("remove %s and use 'config' property for app resource '%s' instead", cf, app.Name), - }) - } + 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", app.Name), + }) } } diff --git a/bundle/apps/validate_test.go b/bundle/apps/validate_test.go index 11270198e1..265c37e8d9 100644 --- a/bundle/apps/validate_test.go +++ b/bundle/apps/validate_test.go @@ -11,6 +11,7 @@ import ( "github.com/databricks/cli/bundle/config/resources" "github.com/databricks/cli/bundle/internal/bundletest" "github.com/databricks/cli/internal/testutil" + "github.com/databricks/cli/libs/diag" "github.com/databricks/cli/libs/dyn" "github.com/databricks/cli/libs/vfs" "github.com/databricks/databricks-sdk-go/service/apps" @@ -19,8 +20,7 @@ import ( func TestAppsValidate(t *testing.T) { tmpDir := t.TempDir() - testutil.Touch(t, tmpDir, "app1", "app.yml") - testutil.Touch(t, tmpDir, "app2", "app.py") + testutil.Touch(t, tmpDir, "app1", "app.py") b := &bundle.Bundle{ BundleRootPath: tmpDir, @@ -37,12 +37,7 @@ func TestAppsValidate(t *testing.T) { Name: "app1", }, SourceCodePath: "./app1", - }, - "app2": { - App: &apps.App{ - Name: "app2", - }, - SourceCodePath: "./app2", + Config: map[string]any{}, }, }, }, @@ -53,8 +48,9 @@ func TestAppsValidate(t *testing.T) { diags := bundle.ApplySeq(context.Background(), b, mutator.TranslatePaths(), Validate()) require.Len(t, diags, 1) - require.Equal(t, "app.yml detected", diags[0].Summary) - require.Contains(t, diags[0].Detail, "app.yml and use 'config' property for app resource") + require.Equal(t, diag.Warning, diags[0].Severity) + require.Equal(t, "App config section detected", diags[0].Summary) + require.Contains(t, diags[0].Detail, "remove 'config' from app resource 'app1' section and use app.yml file in the root of this app instead") } func TestAppsValidateSameSourcePath(t *testing.T) { From 9c48a0b5a0a9674cebdba40ca38ea246a38791c4 Mon Sep 17 00:00:00 2001 From: Andrew Nester Date: Mon, 3 Mar 2025 12:59:12 +0100 Subject: [PATCH 02/10] added acc test --- acceptance/bundle/apps/app_yaml/app/app.py | 0 acceptance/bundle/apps/app_yaml/app/app.yml | 3 ++ .../bundle/apps/app_yaml/databricks.yml | 8 +++++ .../bundle/apps/app_yaml/out.app.yml.txt | 5 +++ acceptance/bundle/apps/app_yaml/output.txt | 15 ++++++++ acceptance/bundle/apps/app_yaml/script | 4 +++ .../bundle/apps/config_section/app/app.py | 1 + .../bundle/apps/config_section/databricks.yml | 12 +++++++ .../apps/config_section/out.app.yml.txt | 5 +++ .../bundle/apps/config_section/output.txt | 23 ++++++++++++ acceptance/bundle/apps/config_section/script | 4 +++ acceptance/bundle/apps/test.toml | 26 ++++++++++++++ bundle/apps/validate_test.go | 36 ------------------- 13 files changed, 106 insertions(+), 36 deletions(-) create mode 100644 acceptance/bundle/apps/app_yaml/app/app.py create mode 100644 acceptance/bundle/apps/app_yaml/app/app.yml create mode 100644 acceptance/bundle/apps/app_yaml/databricks.yml create mode 100644 acceptance/bundle/apps/app_yaml/out.app.yml.txt create mode 100644 acceptance/bundle/apps/app_yaml/output.txt create mode 100644 acceptance/bundle/apps/app_yaml/script create mode 100644 acceptance/bundle/apps/config_section/app/app.py create mode 100644 acceptance/bundle/apps/config_section/databricks.yml create mode 100644 acceptance/bundle/apps/config_section/out.app.yml.txt create mode 100644 acceptance/bundle/apps/config_section/output.txt create mode 100644 acceptance/bundle/apps/config_section/script create mode 100644 acceptance/bundle/apps/test.toml diff --git a/acceptance/bundle/apps/app_yaml/app/app.py b/acceptance/bundle/apps/app_yaml/app/app.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/acceptance/bundle/apps/app_yaml/app/app.yml b/acceptance/bundle/apps/app_yaml/app/app.yml new file mode 100644 index 0000000000..61471358dc --- /dev/null +++ b/acceptance/bundle/apps/app_yaml/app/app.yml @@ -0,0 +1,3 @@ +command: + - python + - app.py diff --git a/acceptance/bundle/apps/app_yaml/databricks.yml b/acceptance/bundle/apps/app_yaml/databricks.yml new file mode 100644 index 0000000000..0064e6c6b1 --- /dev/null +++ b/acceptance/bundle/apps/app_yaml/databricks.yml @@ -0,0 +1,8 @@ +bundle: + name: apps_yaml + +resources: + apps: + myapp: + name: myapp + source_code_path: ./app diff --git a/acceptance/bundle/apps/app_yaml/out.app.yml.txt b/acceptance/bundle/apps/app_yaml/out.app.yml.txt new file mode 100644 index 0000000000..eccd4eb138 --- /dev/null +++ b/acceptance/bundle/apps/app_yaml/out.app.yml.txt @@ -0,0 +1,5 @@ +{ + "method": "POST", + "path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/apps_yaml/default/files/app/app.yml", + "raw_body": "command:\n - python\n - app.py\n" +} diff --git a/acceptance/bundle/apps/app_yaml/output.txt b/acceptance/bundle/apps/app_yaml/output.txt new file mode 100644 index 0000000000..2a946e5ee1 --- /dev/null +++ b/acceptance/bundle/apps/app_yaml/output.txt @@ -0,0 +1,15 @@ + +>>> [CLI] bundle validate +Name: apps_yaml +Target: default +Workspace: + User: [USERNAME] + Path: /Workspace/Users/[USERNAME]/.bundle/apps_yaml/default + +Validation OK! + +>>> [CLI] bundle deploy +Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/apps_yaml/default/files... +Deploying resources... +Updating deployment state... +Deployment complete! diff --git a/acceptance/bundle/apps/app_yaml/script b/acceptance/bundle/apps/app_yaml/script new file mode 100644 index 0000000000..a05e007bd3 --- /dev/null +++ b/acceptance/bundle/apps/app_yaml/script @@ -0,0 +1,4 @@ +trace $CLI bundle validate +trace $CLI bundle deploy +cat out.requests.txt | jq 'select(.path == "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/apps_yaml/default/files/app/app.yml")' > out.app.yml.txt +rm out.requests.txt diff --git a/acceptance/bundle/apps/config_section/app/app.py b/acceptance/bundle/apps/config_section/app/app.py new file mode 100644 index 0000000000..f1a18139c8 --- /dev/null +++ b/acceptance/bundle/apps/config_section/app/app.py @@ -0,0 +1 @@ +print("Hello world!") diff --git a/acceptance/bundle/apps/config_section/databricks.yml b/acceptance/bundle/apps/config_section/databricks.yml new file mode 100644 index 0000000000..25ab2f2616 --- /dev/null +++ b/acceptance/bundle/apps/config_section/databricks.yml @@ -0,0 +1,12 @@ +bundle: + name: apps_config_section + +resources: + apps: + myapp: + name: myapp + source_code_path: ./app + config: + command: + - python + - app.py diff --git a/acceptance/bundle/apps/config_section/out.app.yml.txt b/acceptance/bundle/apps/config_section/out.app.yml.txt new file mode 100644 index 0000000000..a3e69351b1 --- /dev/null +++ b/acceptance/bundle/apps/config_section/out.app.yml.txt @@ -0,0 +1,5 @@ +{ + "method": "POST", + "path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/apps_config_section/default/files/app/app.yml", + "raw_body": "command:\n - python\n - app.py\n" +} diff --git a/acceptance/bundle/apps/config_section/output.txt b/acceptance/bundle/apps/config_section/output.txt new file mode 100644 index 0000000000..800945278c --- /dev/null +++ b/acceptance/bundle/apps/config_section/output.txt @@ -0,0 +1,23 @@ + +>>> [CLI] bundle validate +Warning: App config section detected + +remove 'config' from app resource 'myapp' section and use app.yml file in the root of this app instead + +Name: apps_config_section +Target: default +Workspace: + User: [USERNAME] + Path: /Workspace/Users/[USERNAME]/.bundle/apps_config_section/default + +Found 1 warning + +>>> [CLI] bundle deploy +Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/apps_config_section/default/files... +Deploying resources... +Updating deployment state... +Deployment complete! +Warning: App config section detected + +remove 'config' from app resource 'myapp' section and use app.yml file in the root of this app instead + diff --git a/acceptance/bundle/apps/config_section/script b/acceptance/bundle/apps/config_section/script new file mode 100644 index 0000000000..1ec143faf1 --- /dev/null +++ b/acceptance/bundle/apps/config_section/script @@ -0,0 +1,4 @@ +trace $CLI bundle validate +trace $CLI bundle deploy +cat out.requests.txt | jq 'select(.path == "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/apps_config_section/default/files/app/app.yml")' > out.app.yml.txt +rm out.requests.txt diff --git a/acceptance/bundle/apps/test.toml b/acceptance/bundle/apps/test.toml new file mode 100644 index 0000000000..6999f20890 --- /dev/null +++ b/acceptance/bundle/apps/test.toml @@ -0,0 +1,26 @@ +Cloud = false +RecordRequests = true + +Ignore = [ + '.databricks', +] + +[[Server]] +Pattern = "POST /api/2.0/apps" + +[[Server]] +Pattern = "GET /api/2.0/apps/myapp" +Response.Body = ''' +{ + "name": "myapp", + "description": "", + "compute_status": { + "state": "ACTIVE", + "message": "App compute is active." + }, + "app_status": { + "state": "RUNNING", + "message": "Application is running." + } +} +''' diff --git a/bundle/apps/validate_test.go b/bundle/apps/validate_test.go index 265c37e8d9..d218f96ca0 100644 --- a/bundle/apps/validate_test.go +++ b/bundle/apps/validate_test.go @@ -11,48 +11,12 @@ import ( "github.com/databricks/cli/bundle/config/resources" "github.com/databricks/cli/bundle/internal/bundletest" "github.com/databricks/cli/internal/testutil" - "github.com/databricks/cli/libs/diag" "github.com/databricks/cli/libs/dyn" "github.com/databricks/cli/libs/vfs" "github.com/databricks/databricks-sdk-go/service/apps" "github.com/stretchr/testify/require" ) -func TestAppsValidate(t *testing.T) { - tmpDir := t.TempDir() - testutil.Touch(t, tmpDir, "app1", "app.py") - - b := &bundle.Bundle{ - BundleRootPath: tmpDir, - SyncRootPath: tmpDir, - SyncRoot: vfs.MustNew(tmpDir), - Config: config.Root{ - Workspace: config.Workspace{ - FilePath: "/foo/bar/", - }, - Resources: config.Resources{ - Apps: map[string]*resources.App{ - "app1": { - App: &apps.App{ - Name: "app1", - }, - SourceCodePath: "./app1", - Config: map[string]any{}, - }, - }, - }, - }, - } - - bundletest.SetLocation(b, ".", []dyn.Location{{File: filepath.Join(tmpDir, "databricks.yml")}}) - - diags := bundle.ApplySeq(context.Background(), b, mutator.TranslatePaths(), Validate()) - require.Len(t, diags, 1) - require.Equal(t, diag.Warning, diags[0].Severity) - require.Equal(t, "App config section detected", diags[0].Summary) - require.Contains(t, diags[0].Detail, "remove 'config' from app resource 'app1' section and use app.yml file in the root of this app instead") -} - func TestAppsValidateSameSourcePath(t *testing.T) { tmpDir := t.TempDir() testutil.Touch(t, tmpDir, "app1", "app.py") From 6f7e4f0792c503ba41c51342fcd375b9d95177dc Mon Sep 17 00:00:00 2001 From: Andrew Nester Date: Mon, 3 Mar 2025 13:41:05 +0100 Subject: [PATCH 03/10] fix test for windows --- acceptance/bundle/apps/app_yaml/script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acceptance/bundle/apps/app_yaml/script b/acceptance/bundle/apps/app_yaml/script index a05e007bd3..1edc5b9e95 100644 --- a/acceptance/bundle/apps/app_yaml/script +++ b/acceptance/bundle/apps/app_yaml/script @@ -1,4 +1,4 @@ trace $CLI bundle validate trace $CLI bundle deploy -cat out.requests.txt | jq 'select(.path == "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/apps_yaml/default/files/app/app.yml")' > out.app.yml.txt +cat out.requests.txt | jq 'select(.path == "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/apps_yaml/default/files/app/app.yml")' | sed 's/\r$//' > out.app.yml.txt rm out.requests.txt From a38977ddb6fd34f935fa282d22c1b9b225541ce4 Mon Sep 17 00:00:00 2001 From: Andrew Nester Date: Mon, 3 Mar 2025 13:56:03 +0100 Subject: [PATCH 04/10] fixes --- acceptance/bundle/apps/app_yaml/script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acceptance/bundle/apps/app_yaml/script b/acceptance/bundle/apps/app_yaml/script index 1edc5b9e95..e639c58b73 100644 --- a/acceptance/bundle/apps/app_yaml/script +++ b/acceptance/bundle/apps/app_yaml/script @@ -1,4 +1,4 @@ trace $CLI bundle validate trace $CLI bundle deploy -cat out.requests.txt | jq 'select(.path == "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/apps_yaml/default/files/app/app.yml")' | sed 's/\r$//' > out.app.yml.txt +cat out.requests.txt | jq 'select(.path == "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/apps_yaml/default/files/app/app.yml")' | sed 's/\\r//' > out.app.yml.txt rm out.requests.txt From 67019459942eba7384059e6a125588c5b418d3ad Mon Sep 17 00:00:00 2001 From: Andrew Nester Date: Mon, 3 Mar 2025 14:03:58 +0100 Subject: [PATCH 05/10] sed global --- acceptance/bundle/apps/app_yaml/script | 2 +- acceptance/bundle/apps/config_section/script | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/acceptance/bundle/apps/app_yaml/script b/acceptance/bundle/apps/app_yaml/script index e639c58b73..1573f65f31 100644 --- a/acceptance/bundle/apps/app_yaml/script +++ b/acceptance/bundle/apps/app_yaml/script @@ -1,4 +1,4 @@ trace $CLI bundle validate trace $CLI bundle deploy -cat out.requests.txt | jq 'select(.path == "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/apps_yaml/default/files/app/app.yml")' | sed 's/\\r//' > out.app.yml.txt +jq 'select(.path == "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/apps_yaml/default/files/app/app.yml")' out.requests.txt | sed 's/\\r//' > out.app.yml.txt rm out.requests.txt diff --git a/acceptance/bundle/apps/config_section/script b/acceptance/bundle/apps/config_section/script index 1ec143faf1..5769918be2 100644 --- a/acceptance/bundle/apps/config_section/script +++ b/acceptance/bundle/apps/config_section/script @@ -1,4 +1,4 @@ trace $CLI bundle validate trace $CLI bundle deploy -cat out.requests.txt | jq 'select(.path == "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/apps_config_section/default/files/app/app.yml")' > out.app.yml.txt +jq 'select(.path == "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/apps_config_section/default/files/app/app.yml")' out.requests.txt > out.app.yml.txt rm out.requests.txt From 59934ac5179ecf5260031d2574b08d7bf84bd748 Mon Sep 17 00:00:00 2001 From: Andrew Nester Date: Mon, 3 Mar 2025 14:04:49 +0100 Subject: [PATCH 06/10] /g flag --- acceptance/bundle/apps/app_yaml/script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acceptance/bundle/apps/app_yaml/script b/acceptance/bundle/apps/app_yaml/script index 1573f65f31..8cb34c62df 100644 --- a/acceptance/bundle/apps/app_yaml/script +++ b/acceptance/bundle/apps/app_yaml/script @@ -1,4 +1,4 @@ trace $CLI bundle validate trace $CLI bundle deploy -jq 'select(.path == "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/apps_yaml/default/files/app/app.yml")' out.requests.txt | sed 's/\\r//' > out.app.yml.txt +jq 'select(.path == "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/apps_yaml/default/files/app/app.yml")' out.requests.txt | sed 's/\\r//g' > out.app.yml.txt rm out.requests.txt From eba4c8ff531518e58fd5502ba9884a3a435040ab Mon Sep 17 00:00:00 2001 From: Andrew Nester Date: Mon, 3 Mar 2025 14:47:02 +0100 Subject: [PATCH 07/10] update output --- integration/bundle/testdata/apps/bundle_deploy.txt | 4 ++++ integration/bundle/testdata/apps/bundle_validate.txt | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/integration/bundle/testdata/apps/bundle_deploy.txt b/integration/bundle/testdata/apps/bundle_deploy.txt index 437a555965..738aac79fc 100644 --- a/integration/bundle/testdata/apps/bundle_deploy.txt +++ b/integration/bundle/testdata/apps/bundle_deploy.txt @@ -2,3 +2,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/$UNIQUE_PRJ/files. Deploying resources... Updating deployment state... Deployment complete! +Warning: App config section detected + +remove 'config' from app resource 'app-e3dfea6b' section and use app.yml file in the root of this app instead + diff --git a/integration/bundle/testdata/apps/bundle_validate.txt b/integration/bundle/testdata/apps/bundle_validate.txt index 567fafd24b..7400acef64 100644 --- a/integration/bundle/testdata/apps/bundle_validate.txt +++ b/integration/bundle/testdata/apps/bundle_validate.txt @@ -1,7 +1,11 @@ +Warning: App config section detected + +remove 'config' from app resource 'app-e3dfea6b' section and use app.yml file in the root of this app instead + Name: basic Target: default Workspace: User: [USERNAME] Path: /Workspace/Users/[USERNAME]/.bundle/$UNIQUE_PRJ -Validation OK! +Found 1 warning From be1cd31ea86445cc876139a92946eca1fcac3a52 Mon Sep 17 00:00:00 2001 From: Andrew Nester Date: Mon, 3 Mar 2025 15:12:24 +0100 Subject: [PATCH 08/10] use key instead of name --- bundle/apps/validate.go | 2 +- integration/bundle/testdata/apps/bundle_deploy.txt | 3 +-- integration/bundle/testdata/apps/bundle_validate.txt | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bundle/apps/validate.go b/bundle/apps/validate.go index 8bf1856276..7a4fe71263 100644 --- a/bundle/apps/validate.go +++ b/bundle/apps/validate.go @@ -29,7 +29,7 @@ func (v *validate) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics 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", app.Name), + Detail: fmt.Sprintf("remove 'config' from app resource '%s' section and use app.yml file in the root of this app instead", key), }) } } diff --git a/integration/bundle/testdata/apps/bundle_deploy.txt b/integration/bundle/testdata/apps/bundle_deploy.txt index 738aac79fc..b7c777efc5 100644 --- a/integration/bundle/testdata/apps/bundle_deploy.txt +++ b/integration/bundle/testdata/apps/bundle_deploy.txt @@ -4,5 +4,4 @@ Updating deployment state... Deployment complete! Warning: App config section detected -remove 'config' from app resource 'app-e3dfea6b' section and use app.yml file in the root of this app instead - +remove 'config' from app resource 'test_app' section and use app.yml file in the root of this app instead diff --git a/integration/bundle/testdata/apps/bundle_validate.txt b/integration/bundle/testdata/apps/bundle_validate.txt index 7400acef64..cb37fc4bde 100644 --- a/integration/bundle/testdata/apps/bundle_validate.txt +++ b/integration/bundle/testdata/apps/bundle_validate.txt @@ -1,6 +1,6 @@ Warning: App config section detected -remove 'config' from app resource 'app-e3dfea6b' section and use app.yml file in the root of this app instead +remove 'config' from app resource 'test_app' section and use app.yml file in the root of this app instead Name: basic Target: default From 545b5c63f367154bbb4ce72854229f67d224ee2c Mon Sep 17 00:00:00 2001 From: Andrew Nester Date: Mon, 3 Mar 2025 16:21:01 +0100 Subject: [PATCH 09/10] - --- integration/bundle/testdata/apps/bundle_deploy.txt | 1 + integration/bundle/testdata/apps/bundle_validate.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/integration/bundle/testdata/apps/bundle_deploy.txt b/integration/bundle/testdata/apps/bundle_deploy.txt index b7c777efc5..55b8dedc6b 100644 --- a/integration/bundle/testdata/apps/bundle_deploy.txt +++ b/integration/bundle/testdata/apps/bundle_deploy.txt @@ -5,3 +5,4 @@ Deployment complete! Warning: App config section detected remove 'config' from app resource 'test_app' section and use app.yml file in the root of this app instead + diff --git a/integration/bundle/testdata/apps/bundle_validate.txt b/integration/bundle/testdata/apps/bundle_validate.txt index cb37fc4bde..46b8079be3 100644 --- a/integration/bundle/testdata/apps/bundle_validate.txt +++ b/integration/bundle/testdata/apps/bundle_validate.txt @@ -9,3 +9,4 @@ Workspace: Path: /Workspace/Users/[USERNAME]/.bundle/$UNIQUE_PRJ Found 1 warning + From 319bf56e4689e095efc4182d2d40f8887d83070b Mon Sep 17 00:00:00 2001 From: Andrew Nester Date: Mon, 3 Mar 2025 17:20:48 +0100 Subject: [PATCH 10/10] remove new line from validate output --- integration/bundle/testdata/apps/bundle_validate.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/integration/bundle/testdata/apps/bundle_validate.txt b/integration/bundle/testdata/apps/bundle_validate.txt index 46b8079be3..cb37fc4bde 100644 --- a/integration/bundle/testdata/apps/bundle_validate.txt +++ b/integration/bundle/testdata/apps/bundle_validate.txt @@ -9,4 +9,3 @@ Workspace: Path: /Workspace/Users/[USERNAME]/.bundle/$UNIQUE_PRJ Found 1 warning -