From 65afc07d5ec9cc0e7e3b0c8c827f1eef06ebdcf9 Mon Sep 17 00:00:00 2001 From: Yusuke Sakurai Date: Wed, 10 Jul 2024 20:55:54 +0900 Subject: [PATCH] PR --- env/env.go | 8 ++++---- env/env_test.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/env/env.go b/env/env.go index 54bdff5..0922204 100644 --- a/env/env.go +++ b/env/env.go @@ -69,10 +69,10 @@ func LoadServiceDefinition(dir string) (*ecs.CreateServiceInput, error) { _, noSvc := os.Stat(svcPath) var service ecs.CreateServiceInput if noSvc != nil { - return nil, xerrors.Errorf("roll out context specified at '%s' but no 'service.json' or 'task-definition.json'", dir) + return nil, xerrors.Errorf("no 'service.json' found in %s", dir) } if err := ReadAndUnmarshalJson(svcPath, &service); err != nil { - return nil, xerrors.Errorf("failed to read and unmarshal service.json: %s", err) + return nil, xerrors.Errorf("failed to read and unmarshal 'service.json': %s", err) } return &service, nil } @@ -82,10 +82,10 @@ func LoadTaskDefinition(dir string) (*ecs.RegisterTaskDefinitionInput, error) { _, noTd := os.Stat(tdPath) var td ecs.RegisterTaskDefinitionInput if noTd != nil { - return nil, xerrors.Errorf("roll out context specified at '%s' but no 'service.json' or 'task-definition.json'", dir) + return nil, xerrors.Errorf("no 'task-definition.json' found in %s", dir) } if err := ReadAndUnmarshalJson(tdPath, &td); err != nil { - return nil, xerrors.Errorf("failed to read and unmarshal task-definition.json: %s", err) + return nil, xerrors.Errorf("failed to read and unmarshal 'task-definition.json': %s", err) } return &td, nil } diff --git a/env/env_test.go b/env/env_test.go index 90de950..425999e 100644 --- a/env/env_test.go +++ b/env/env_test.go @@ -96,11 +96,11 @@ func TestLoadServiceDefinition(t *testing.T) { }) t.Run("should error if service.json is not found", func(t *testing.T) { _, err := env.LoadServiceDefinition("./testdata") - assert.EqualError(t, err, "roll out context specified at './testdata' but no 'service.json' or 'task-definition.json'") + assert.EqualError(t, err, "no 'service.json' found in ./testdata") }) t.Run("should error if service.json is invalid", func(t *testing.T) { _, err := env.LoadServiceDefinition("./testdata/invalid") - assert.ErrorContains(t, err, "failed to read and unmarshal service.json:") + assert.ErrorContains(t, err, "failed to read and unmarshal 'service.json':") }) } @@ -114,11 +114,11 @@ func TestLoadTaskDefinition(t *testing.T) { }) t.Run("should error if task-definition.json is not found", func(t *testing.T) { _, err := env.LoadTaskDefinition("./testdata") - assert.EqualError(t, err, "roll out context specified at './testdata' but no 'service.json' or 'task-definition.json'") + assert.EqualError(t, err, "no 'task-definition.json' found in ./testdata") }) t.Run("should error if task-definition.json is invalid", func(t *testing.T) { _, err := env.LoadTaskDefinition("./testdata/invalid") - assert.ErrorContains(t, err, "failed to read and unmarshal task-definition.json:") + assert.ErrorContains(t, err, "failed to read and unmarshal 'task-definition.json':") }) }