PR

loilo-inc · Jul 10, 2024 · 65afc07 · 65afc07
1 parent b6f9c45
commit 65afc07
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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':")
 	})
 }