From e725391769f556b08867de5f0f45587436785049 Mon Sep 17 00:00:00 2001 From: aknysh Date: Sun, 9 Jun 2024 10:43:08 -0400 Subject: [PATCH] Update to Atmos 1.79.0 --- internal/merge/merge_test.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/internal/merge/merge_test.go b/internal/merge/merge_test.go index 88879c1..9c7a0d9 100644 --- a/internal/merge/merge_test.go +++ b/internal/merge/merge_test.go @@ -1,9 +1,11 @@ package merge import ( - m "github.com/cloudposse/atmos/pkg/merge" "github.com/stretchr/testify/assert" "testing" + + m "github.com/cloudposse/atmos/pkg/merge" + "github.com/cloudposse/atmos/pkg/schema" ) func TestMergeBasic(t *testing.T) { @@ -13,7 +15,7 @@ func TestMergeBasic(t *testing.T) { inputs := []map[any]any{map1, map2} expected := map[any]any{"foo": "bar", "baz": "bat"} - result, err := m.Merge(inputs) + result, err := m.Merge(schema.CliConfiguration{}, inputs) assert.Nil(t, err) assert.Equal(t, expected, result) } @@ -26,7 +28,7 @@ func TestMergeBasicOverride(t *testing.T) { inputs := []map[any]any{map1, map2, map3} expected := map[any]any{"foo": "ood", "baz": "bat"} - result, err := m.Merge(inputs) + result, err := m.Merge(schema.CliConfiguration{}, inputs) assert.Nil(t, err) assert.Equal(t, expected, result) }