move test configs to a separate folder to avoid them to appear in go.…

…mod archive (unzip error with double dots)
spacetab-io · Apr 30, 2020 · b3f073d · b3f073d
1 parent 15c64bf
commit b3f073d
Show file tree

Hide file tree

Showing 24 changed files with 8 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -21,8 +21,8 @@ jobs:
           command: |
             sudo mkdir -p /cfgs/defaults
             sudo mkdir -p /cfgs/dev
-            sudo cp test/configuration/defaults/* /cfgs/defaults
-            sudo cp test/configuration/dev/* /cfgs/dev
+            sudo cp config_examples/configuration/defaults/* /cfgs/defaults
+            sudo cp config_examples/configuration/dev/* /cfgs/dev
             make test
             mv coverage.html /tmp/artifacts
             mv c.out /tmp/artifacts

diff --git a/test/configuration/defaults/redis.yaml → ...xamples/configuration/defaults/redis.yaml b/test/configuration/defaults/redis.yaml → ...xamples/configuration/defaults/redis.yaml
diff --git a/test/configuration/defaults/service.yaml → ...mples/configuration/defaults/service.yaml b/test/configuration/defaults/service.yaml → ...mples/configuration/defaults/service.yaml
diff --git a/test/configuration/dev/log.yaml → config_examples/configuration/dev/log.yaml b/test/configuration/dev/log.yaml → config_examples/configuration/dev/log.yaml
diff --git a/test/configuration/dev/redis.yaml → config_examples/configuration/dev/redis.yaml b/test/configuration/dev/redis.yaml → config_examples/configuration/dev/redis.yaml
diff --git a/test/configuration/dev/service.yaml → ...g_examples/configuration/dev/service.yaml b/test/configuration/dev/service.yaml → ...g_examples/configuration/dev/service.yaml
diff --git a/test/configuration2/defaults/hotelbook.yaml → ...es/configuration2/defaults/hotelbook.yaml b/test/configuration2/defaults/hotelbook.yaml → ...es/configuration2/defaults/hotelbook.yaml
diff --git a/.../configuration2/development/settings.yaml → .../configuration2/development/settings.yaml b/.../configuration2/development/settings.yaml → .../configuration2/development/settings.yaml
diff --git a/...iguration2/production/cache_settings.yaml → ...iguration2/production/cache_settings.yaml b/...iguration2/production/cache_settings.yaml → ...iguration2/production/cache_settings.yaml
diff --git a/test/configuration2/production/settings.yaml → ...s/configuration2/production/settings.yaml b/test/configuration2/production/settings.yaml → ...s/configuration2/production/settings.yaml
diff --git a/test/merge_error/defaults/redis.yaml → ..._examples/merge_error/defaults/redis.yaml b/test/merge_error/defaults/redis.yaml → ..._examples/merge_error/defaults/redis.yaml
diff --git a/test/merge_error/defaults/service.yaml → ...xamples/merge_error/defaults/service.yaml b/test/merge_error/defaults/service.yaml → ...xamples/merge_error/defaults/service.yaml
diff --git a/test/merge_error/dev/service.yaml → config_examples/merge_error/dev/service.yaml b/test/merge_error/dev/service.yaml → config_examples/merge_error/dev/service.yaml
diff --git a/test/no_defaults/development/service.yaml → ...ples/no_defaults/development/service.yaml b/test/no_defaults/development/service.yaml → ...ples/no_defaults/development/service.yaml
diff --git a/...no_defaults/development/subdir/extra.yaml → ...no_defaults/development/subdir/extra.yaml b/...no_defaults/development/subdir/extra.yaml → ...no_defaults/development/subdir/extra.yaml
diff --git a/test/symnlinkedConfigs/defaults/redis.yaml → ...les/symnlinkedConfigs/defaults/redis.yaml b/test/symnlinkedConfigs/defaults/redis.yaml → ...les/symnlinkedConfigs/defaults/redis.yaml
diff --git a/test/symnlinkedConfigs/defaults/service.yaml → ...s/symnlinkedConfigs/defaults/service.yaml b/test/symnlinkedConfigs/defaults/service.yaml → ...s/symnlinkedConfigs/defaults/service.yaml
diff --git a/.../..2018_10_05_08_42_42.488643040/log.yaml → .../..2018_10_05_08_42_42.488643040/log.yaml b/.../..2018_10_05_08_42_42.488643040/log.yaml → .../..2018_10_05_08_42_42.488643040/log.yaml
diff --git a/test/symnlinkedConfigs/dev/..data → config_examples/symnlinkedConfigs/dev/..data b/test/symnlinkedConfigs/dev/..data → config_examples/symnlinkedConfigs/dev/..data
diff --git a/test/symnlinkedConfigs/dev/log.yaml → ...g_examples/symnlinkedConfigs/dev/log.yaml b/test/symnlinkedConfigs/dev/log.yaml → ...g_examples/symnlinkedConfigs/dev/log.yaml
diff --git a/test/symnlinkedConfigs/dev/redis.yaml → ...examples/symnlinkedConfigs/dev/redis.yaml b/test/symnlinkedConfigs/dev/redis.yaml → ...examples/symnlinkedConfigs/dev/redis.yaml
diff --git a/test/symnlinkedConfigs/dev/service.yaml → ...amples/symnlinkedConfigs/dev/service.yaml b/test/symnlinkedConfigs/dev/service.yaml → ...amples/symnlinkedConfigs/dev/service.yaml
diff --git a/reader_test.go b/reader_test.go
@@ -11,7 +11,7 @@ import (
 func TestReadConfigs(t *testing.T) {
 	t.Run("Success parsing common dirs and files", func(t *testing.T) {
 		os.Setenv("STAGE", "dev")
-		configBytes, err := ReadConfigs("./test/configuration")
+		configBytes, err := ReadConfigs("./config_examples/configuration")
 		if !assert.NoError(t, err) {
 			t.FailNow()
 		}
@@ -46,7 +46,7 @@ func TestReadConfigs(t *testing.T) {
 	})
 	t.Run("Success parsing complex dirs and files", func(t *testing.T) {
 		os.Setenv("STAGE", "development")
-		configBytes, err := ReadConfigs("./test/configuration2")
+		configBytes, err := ReadConfigs("./config_examples/configuration2")
 		if !assert.NoError(t, err) {
 			t.FailNow()
 		}
@@ -110,7 +110,7 @@ func TestReadConfigs(t *testing.T) {
 
 	t.Run("Success parsing symlinked files and dirs", func(t *testing.T) {
 		os.Setenv("STAGE", "dev")
-		configBytes, err := ReadConfigs("./test/symnlinkedConfigs")
+		configBytes, err := ReadConfigs("./config_examples/symnlinkedConfigs")
 		if !assert.NoError(t, err) {
 			t.FailNow()
 		}
@@ -189,13 +189,13 @@ func TestReadConfigs(t *testing.T) {
 		}
 	})
 	t.Run("no defaults configs", func(t *testing.T) {
-		_, err := ReadConfigs("./test/no_defaults")
+		_, err := ReadConfigs("./config_examples/no_defaults")
 		if !assert.Error(t, err) {
 			t.FailNow()
 		}
 	})
 	t.Run("merge errors", func(t *testing.T) {
-		_, err := ReadConfigs("./test/merge_error")
+		_, err := ReadConfigs("./config_examples/merge_error")
 		if !assert.Error(t, err) {
 			t.FailNow()
 		}

diff --git a/test/deep/deeper/thedeepest/relative_path_test.go b/test/deep/deeper/thedeepest/relative_path_test.go
@@ -13,7 +13,7 @@ import (
 func TestRelativePath(t *testing.T) {
 	t.Run("Success parsing relative dirs", func(t *testing.T) {
 		os.Setenv("STAGE", "dev")
-		configBytes, err := config.ReadConfigs("../../../../test/configuration")
+		configBytes, err := config.ReadConfigs("../../../../config_examples/configuration")
 		if !assert.NoError(t, err) {
 			t.FailNow()
 		}