From 061c4d7614b03d424343e01ed7964513f960c3b5 Mon Sep 17 00:00:00 2001 From: Lionello Lunesu Date: Wed, 20 Dec 2023 10:24:10 -0800 Subject: [PATCH] fix #512 revert err check Signed-off-by: Lionello Lunesu --- loader/loader.go | 3 +++ loader/loader_test.go | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/loader/loader.go b/loader/loader.go index 3977da75..2501dab7 100644 --- a/loader/loader.go +++ b/loader/loader.go @@ -342,6 +342,9 @@ func loadYamlModel(ctx context.Context, config types.ConfigDetails, opts *Option if err == io.EOF { break } + if err != nil { + return nil, err + } if err := processRawYaml(raw, processor); err != nil { return nil, err } diff --git a/loader/loader_test.go b/loader/loader_test.go index 3e1ad481..ad66e663 100644 --- a/loader/loader_test.go +++ b/loader/loader_test.go @@ -944,6 +944,14 @@ services: assert.DeepEqual(t, configWithoutEnvFiles.Services["web"].Environment, expectedEnvironmentMap) } +func TestDecodeErrors(t *testing.T) { + dict := "name: test\nservices:\n web:\n image: nginx\n\tbuild: ." + + configDetails := buildConfigDetails(dict, nil) + _, err := Load(configDetails) + assert.Error(t, err, "yaml: line 4: found a tab character that violates indentation") +} + func TestBuildProperties(t *testing.T) { dict := ` name: test @@ -2768,7 +2776,7 @@ services: image: example/proxy build: ./proxy develop: - watch: + watch: # rebuild image and recreate service - path: ./proxy/proxy.conf action: sync+restart