From b6c9e31fc5e7965e52614b2fc82dda7403476061 Mon Sep 17 00:00:00 2001 From: Dan Duvall Date: Thu, 9 Aug 2018 12:10:57 -0700 Subject: Bump Blubber config version to v3 Change-Id: I91cac046976cf88d513487e27e1b52bf77a6f974 --- 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 | 6 +++--- docker/compiler_test.go | 8 ++++---- 17 files changed, 42 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 71cd850..b50ba20 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ running ad-hoc commands. ## Example configuration ```yaml -version: v2 +version: v3 base: debian:jessie apt: packages: [libjpeg, libyaml] @@ -69,7 +69,7 @@ In the example configuration, the `test` variant when expanded effectively becomes: ```yaml -version: v2 +version: v3 base: debian:jessie apt: packages: [libjpeg, libyaml, libjpeg-dev, libyaml-dev, chromium] diff --git a/blubber.example.yaml b/blubber.example.yaml index bfb3a37..8f39c9b 100644 --- a/blubber.example.yaml +++ b/blubber.example.yaml @@ -1,5 +1,5 @@ --- -version: v2 +version: v3 base: debian:jessie apt: packages: [libjpeg, libyaml] diff --git a/config/apt_test.go b/config/apt_test.go index ae4fce2..1bff48e 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: v2 + version: v3 apt: packages: - libfoo diff --git a/config/artifacts_test.go b/config/artifacts_test.go index 49927db..44dd89c 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: v2 + version: v3 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: v2 + version: v3 variants: build: {} foo: @@ -94,7 +94,7 @@ func TestArtifactsConfigValidation(t *testing.T) { t.Run("missing", func(t *testing.T) { _, err := config.ReadConfig([]byte(`--- - version: v2 + version: v3 variants: build: {} foo: @@ -112,7 +112,7 @@ func TestArtifactsConfigValidation(t *testing.T) { t.Run("bad", func(t *testing.T) { _, err := config.ReadConfig([]byte(`--- - version: v2 + version: v3 variants: build: {} foo: diff --git a/config/builder_test.go b/config/builder_test.go index 773ddd1..0785f7a 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: v2 + version: v3 base: foo builder: command: [make, -f, Makefile, test] diff --git a/config/common_test.go b/config/common_test.go index 3674d64..535e64b 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: v2 + version: v3 base: fooimage sharedvolume: true entrypoint: ["/bin/foo"] diff --git a/config/config_test.go b/config/config_test.go index 5f694ee..45151bc 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: v2 + version: v3 variants: foo: {}`)) if assert.NoError(t, err) { - assert.Equal(t, "v2", cfg.Version) + assert.Equal(t, "v3", 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: "v2"}, + VersionConfig: config.VersionConfig{Version: "v3"}, 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: "v2"}, + VersionConfig: config.VersionConfig{Version: "v3"}, 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 fb3ac12..d4e2c70 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: v2 + version: v3 base: foo runs: { insecurely: true } sharedvolume: false diff --git a/config/lives_test.go b/config/lives_test.go index d740586..2220652 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: v2 + version: v3 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: v2 + version: v3 base: foo`)) if assert.NoError(t, err) { diff --git a/config/node_test.go b/config/node_test.go index 9771251..0cb48fa 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: v2 + version: v3 base: foo node: requirements: [package.json] diff --git a/config/python_test.go b/config/python_test.go index 03abad0..3ece2e5 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: v2 + version: v3 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: v2 + version: v3 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: v2 + version: v3 base: foo python: requirements: [requirements.txt] diff --git a/config/reader_test.go b/config/reader_test.go index 172bf20..1a7d529 100644 --- a/config/reader_test.go +++ b/config/reader_test.go @@ -11,7 +11,7 @@ import ( func ExampleResolveIncludes() { cfg, _ := config.ReadConfig([]byte(`--- - version: v2 + version: v3 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: v2 + version: v3 newphone: whodis variants: foo: {}`)) @@ -57,7 +57,7 @@ func TestReadConfigValidateVersionBeforeStrictUnmarshal(t *testing.T) { func TestResolveIncludesPreventsInfiniteRecursion(t *testing.T) { cfg, err := config.ReadConfig([]byte(`--- - version: v2 + version: v3 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: v2 + version: v3 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: v2 + version: v3 variants: mammal: base: neutral diff --git a/config/runs_test.go b/config/runs_test.go index 0f2266d..8d685c7 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: v2 + version: v3 base: foo runs: as: someuser diff --git a/config/variant_test.go b/config/variant_test.go index 0479c08..d40437c 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: v2 + version: v3 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: v2 + version: v3 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: v2 + version: v3 variants: build: {} foo: {}`)) @@ -236,7 +236,7 @@ func TestVariantConfigValidation(t *testing.T) { t.Run("bad", func(t *testing.T) { _, err := config.ReadConfig([]byte(`--- - version: v2 + version: v3 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: v2 + version: v3 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: v2 + version: v3 variants: build: {} foo: {}`)) @@ -276,7 +276,7 @@ func TestVariantConfigValidation(t *testing.T) { t.Run("bad", func(t *testing.T) { _, err := config.ReadConfig([]byte(`--- - version: v2 + version: v3 variants: build: {} foo: { copies: foobuild }`)) diff --git a/config/version.go b/config/version.go index 6162573..0a41fca 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 = "v2" +const CurrentVersion string = "v3" // 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 ac9f5b7..3b25d5e 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: v2 + version: v3 variants: foo: {}`)) assert.Nil(t, err) if assert.NoError(t, err) { - assert.Equal(t, "v2", cfg.Version) + assert.Equal(t, "v3", cfg.Version) } } func TestVersionConfigValidation(t *testing.T) { t.Run("supported version", func(t *testing.T) { err := config.Validate(config.VersionConfig{ - Version: "v2", + Version: "v3", }) assert.False(t, config.IsValidationError(err)) diff --git a/docker/compiler_test.go b/docker/compiler_test.go index d8ab18f..6d7f4f2 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: v2 + version: v3 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: v2 + version: v3 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: v2 + version: v3 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: v2 + version: v3 base: foo/bar variants: development: {}`)) -- cgit v1.2.1