From 798f96381057f4b2ebf4ba08852da8d976c62502 Mon Sep 17 00:00:00 2001 From: Dan Duvall Date: Sun, 20 May 2018 11:53:02 +0200 Subject: Bump config version to v2 --- README.md | 4 ++-- blubber.example.yaml | 2 +- config/apt_test.go | 2 +- config/artifacts_test.go | 8 ++++---- config/builder_test.go | 2 +- config/common_test.go | 2 +- config/config_test.go | 8 ++++---- config/flag_test.go | 2 +- config/lives_test.go | 4 ++-- config/node_test.go | 2 +- config/python_test.go | 6 +++--- config/reader_test.go | 10 +++++----- config/runs_test.go | 2 +- config/variant_test.go | 14 +++++++------- config/version.go | 2 +- config/version_test.go | 10 +++++----- docker/compiler_test.go | 8 ++++---- 17 files changed, 44 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index 51d69a1..810b847 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ running ad-hoc commands. ## Example configuration ```yaml -version: v1 +version: v2 base: debian:jessie apt: packages: [libjpeg, libyaml] @@ -71,7 +71,7 @@ In the example configuration, the `test` variant when expanded effectively becomes: ```yaml -version: v1 +version: v2 base: debian:jessie apt: packages: [libjpeg, libyaml, libjpeg-dev, libyaml-dev, chromium] diff --git a/blubber.example.yaml b/blubber.example.yaml index 25df24e..1979ee5 100644 --- a/blubber.example.yaml +++ b/blubber.example.yaml @@ -1,5 +1,5 @@ --- -version: v1 +version: v2 base: debian:jessie apt: packages: [libjpeg, libyaml] diff --git a/config/apt_test.go b/config/apt_test.go index df2480d..f8f0a44 100644 --- a/config/apt_test.go +++ b/config/apt_test.go @@ -12,7 +12,7 @@ import ( func TestAptConfigYAML(t *testing.T) { cfg, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 apt: packages: - libfoo diff --git a/config/artifacts_test.go b/config/artifacts_test.go index f538165..3574020 100644 --- a/config/artifacts_test.go +++ b/config/artifacts_test.go @@ -11,7 +11,7 @@ import ( func TestArtifactsConfigYAML(t *testing.T) { cfg, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 base: foo variants: build: {} @@ -80,7 +80,7 @@ func TestArtifactsConfigValidation(t *testing.T) { t.Run("from", func(t *testing.T) { t.Run("ok", func(t *testing.T) { _, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 variants: build: {} foo: @@ -94,7 +94,7 @@ func TestArtifactsConfigValidation(t *testing.T) { t.Run("missing", func(t *testing.T) { _, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 variants: build: {} foo: @@ -112,7 +112,7 @@ func TestArtifactsConfigValidation(t *testing.T) { t.Run("bad", func(t *testing.T) { _, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 variants: build: {} foo: diff --git a/config/builder_test.go b/config/builder_test.go index dbc95d9..42b5e09 100644 --- a/config/builder_test.go +++ b/config/builder_test.go @@ -11,7 +11,7 @@ import ( func TestBuilderConfigYAML(t *testing.T) { cfg, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 base: foo variants: build: diff --git a/config/common_test.go b/config/common_test.go index 315630d..0b3fd9b 100644 --- a/config/common_test.go +++ b/config/common_test.go @@ -10,7 +10,7 @@ import ( func TestCommonConfigYAML(t *testing.T) { cfg, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 base: fooimage sharedvolume: true entrypoint: ["/bin/foo"] diff --git a/config/config_test.go b/config/config_test.go index 98e91a7..78dee30 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -10,12 +10,12 @@ import ( func TestConfigYAML(t *testing.T) { cfg, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 variants: foo: {}`)) if assert.NoError(t, err) { - assert.Equal(t, "v1", cfg.Version) + assert.Equal(t, "v2", cfg.Version) assert.Contains(t, cfg.Variants, "foo") assert.IsType(t, config.VariantConfig{}, cfg.Variants["foo"]) } @@ -25,7 +25,7 @@ func TestConfigValidation(t *testing.T) { t.Run("variants", func(t *testing.T) { t.Run("ok", func(t *testing.T) { err := config.Validate(config.Config{ - VersionConfig: config.VersionConfig{Version: "v1"}, + VersionConfig: config.VersionConfig{Version: "v2"}, Variants: map[string]config.VariantConfig{ "build": config.VariantConfig{}, "foo": config.VariantConfig{}, @@ -37,7 +37,7 @@ func TestConfigValidation(t *testing.T) { t.Run("bad", func(t *testing.T) { err := config.Validate(config.Config{ - VersionConfig: config.VersionConfig{Version: "v1"}, + VersionConfig: config.VersionConfig{Version: "v2"}, Variants: map[string]config.VariantConfig{ "build foo": config.VariantConfig{}, "foo bar": config.VariantConfig{}, diff --git a/config/flag_test.go b/config/flag_test.go index e637faf..0f6bcdf 100644 --- a/config/flag_test.go +++ b/config/flag_test.go @@ -10,7 +10,7 @@ import ( func TestFlagMerge(t *testing.T) { cfg, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 base: foo runs: { insecurely: true } sharedvolume: false diff --git a/config/lives_test.go b/config/lives_test.go index 06da8f0..32916e5 100644 --- a/config/lives_test.go +++ b/config/lives_test.go @@ -11,7 +11,7 @@ import ( func TestLivesConfigYAML(t *testing.T) { cfg, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 base: foo lives: in: /some/directory @@ -40,7 +40,7 @@ func TestLivesConfigYAML(t *testing.T) { func TestLivesConfigDefaults(t *testing.T) { cfg, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 base: foo`)) if assert.NoError(t, err) { diff --git a/config/node_test.go b/config/node_test.go index f39b6cf..822da77 100644 --- a/config/node_test.go +++ b/config/node_test.go @@ -11,7 +11,7 @@ import ( func TestNodeConfigYAML(t *testing.T) { cfg, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 base: foo node: requirements: [package.json] diff --git a/config/python_test.go b/config/python_test.go index ee4dfc0..004d2d1 100644 --- a/config/python_test.go +++ b/config/python_test.go @@ -11,7 +11,7 @@ import ( func TestPythonConfigYAMLMerge(t *testing.T) { cfg, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 base: foo python: version: python2.7 @@ -37,7 +37,7 @@ func TestPythonConfigYAMLMerge(t *testing.T) { func TestPythonConfigYAMLMergeEmpty(t *testing.T) { cfg, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 base: foo python: requirements: [requirements.txt] @@ -59,7 +59,7 @@ func TestPythonConfigYAMLMergeEmpty(t *testing.T) { func TestPythonConfigYAMLDoNotMergeNil(t *testing.T) { cfg, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 base: foo python: requirements: [requirements.txt] diff --git a/config/reader_test.go b/config/reader_test.go index 8943adc..cb187ef 100644 --- a/config/reader_test.go +++ b/config/reader_test.go @@ -11,7 +11,7 @@ import ( func ExampleResolveIncludes() { cfg, _ := config.ReadConfig([]byte(`--- - version: v1 + version: v2 variants: varA: { includes: [varB, varC] } varB: { includes: [varD, varE] } @@ -29,7 +29,7 @@ func ExampleResolveIncludes() { func TestReadConfigErrorsOnUnknownYAML(t *testing.T) { _, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 newphone: whodis variants: foo: {}`)) @@ -57,7 +57,7 @@ func TestReadConfigValidateVersionBeforeStrictUnmarshal(t *testing.T) { func TestResolveIncludesPreventsInfiniteRecursion(t *testing.T) { cfg, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 variants: varA: { includes: [varB] } varB: { includes: [varA] }`)) @@ -71,7 +71,7 @@ func TestResolveIncludesPreventsInfiniteRecursion(t *testing.T) { func TestMultiLevelIncludes(t *testing.T) { cfg, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 base: foo-slim variants: build: @@ -103,7 +103,7 @@ func TestMultiLevelIncludes(t *testing.T) { func TestMultiIncludes(t *testing.T) { cfg, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 variants: mammal: base: neutral diff --git a/config/runs_test.go b/config/runs_test.go index 2719f6f..18ffeeb 100644 --- a/config/runs_test.go +++ b/config/runs_test.go @@ -11,7 +11,7 @@ import ( func TestRunsConfigYAML(t *testing.T) { cfg, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 base: foo runs: as: someuser diff --git a/config/variant_test.go b/config/variant_test.go index cd51143..a99f2f5 100644 --- a/config/variant_test.go +++ b/config/variant_test.go @@ -12,7 +12,7 @@ import ( func TestVariantConfigYAML(t *testing.T) { cfg, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 base: foo variants: build: {} @@ -216,7 +216,7 @@ func TestVariantConfigValidation(t *testing.T) { t.Run("includes", func(t *testing.T) { t.Run("ok", func(t *testing.T) { _, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 variants: build: {} foo: { includes: [build] }`)) @@ -226,7 +226,7 @@ func TestVariantConfigValidation(t *testing.T) { t.Run("optional", func(t *testing.T) { _, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 variants: build: {} foo: {}`)) @@ -236,7 +236,7 @@ func TestVariantConfigValidation(t *testing.T) { t.Run("bad", func(t *testing.T) { _, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 variants: build: {} foo: { includes: [build, foobuild, foo_build] }`)) @@ -256,7 +256,7 @@ func TestVariantConfigValidation(t *testing.T) { t.Run("ok", func(t *testing.T) { _, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 variants: build: {} foo: { copies: build }`)) @@ -266,7 +266,7 @@ func TestVariantConfigValidation(t *testing.T) { t.Run("optional", func(t *testing.T) { _, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 variants: build: {} foo: {}`)) @@ -276,7 +276,7 @@ func TestVariantConfigValidation(t *testing.T) { t.Run("bad", func(t *testing.T) { _, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 variants: build: {} foo: { copies: foobuild }`)) diff --git a/config/version.go b/config/version.go index 4a145fd..6162573 100644 --- a/config/version.go +++ b/config/version.go @@ -2,7 +2,7 @@ package config // CurrentVersion declares the currently supported config version. // -const CurrentVersion string = "v1" +const CurrentVersion string = "v2" // VersionConfig contains a single field that allows for validation of the // config version independent from an entire Config struct. diff --git a/config/version_test.go b/config/version_test.go index 628b31a..0b676c8 100644 --- a/config/version_test.go +++ b/config/version_test.go @@ -10,21 +10,21 @@ import ( func TestVersionConfigYAML(t *testing.T) { cfg, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 variants: foo: {}`)) assert.Nil(t, err) if assert.NoError(t, err) { - assert.Equal(t, "v1", cfg.Version) + assert.Equal(t, "v2", cfg.Version) } } func TestVersionConfigValidation(t *testing.T) { t.Run("supported version", func(t *testing.T) { err := config.Validate(config.VersionConfig{ - Version: "v1", + Version: "v2", }) assert.False(t, config.IsValidationError(err)) @@ -32,13 +32,13 @@ func TestVersionConfigValidation(t *testing.T) { t.Run("unsupported version", func(t *testing.T) { err := config.Validate(config.VersionConfig{ - Version: "v2", + Version: "vX", }) if assert.True(t, config.IsValidationError(err)) { msg := config.HumanizeValidationError(err) - assert.Equal(t, `version: config version "v2" is unsupported`, msg) + assert.Equal(t, `version: config version "vX" is unsupported`, msg) } }) } diff --git a/docker/compiler_test.go b/docker/compiler_test.go index c5e2a28..0c495af 100644 --- a/docker/compiler_test.go +++ b/docker/compiler_test.go @@ -13,7 +13,7 @@ import ( func TestSingleStageHasNoName(t *testing.T) { cfg, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 base: foo/bar variants: development: {}`)) @@ -28,7 +28,7 @@ func TestSingleStageHasNoName(t *testing.T) { func TestMultiStageIncludesStageNames(t *testing.T) { cfg, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 base: foo/bar variants: build: {} @@ -52,7 +52,7 @@ func TestMultiStageIncludesStageNames(t *testing.T) { func TestMultipleArtifactsFromSameStage(t *testing.T) { cfg, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 base: foo/bar variants: build: {} @@ -79,7 +79,7 @@ func TestMultipleArtifactsFromSameStage(t *testing.T) { func TestMetaDataLabels(t *testing.T) { cfg, err := config.ReadConfig([]byte(`--- - version: v1 + version: v2 base: foo/bar variants: development: {}`)) -- cgit v1.2.1