diff options
| author | Tyler Cipriani <tcipriani@wikimedia.org> | 2018-11-02 09:40:58 -0600 |
|---|---|---|
| committer | Tyler Cipriani <tcipriani@wikimedia.org> | 2018-12-10 17:33:15 -0700 |
| commit | 56e830f6417fe1ebda1bdc2cf7810dcccd9a7da6 (patch) | |
| tree | a081badcc905a516c3421f9534555fe916b961e3 /docker | |
| parent | 6597c943b6af809cc30e80070ad42953cab05dc4 (diff) | |
| download | blubber-56e830f6417fe1ebda1bdc2cf7810dcccd9a7da6.tar.gz | |
Use JSON as canonical config format
Uses the github.com/ghodss/yaml library to convert YAML to JSON before
unmarshaling for the purposes of supporting YAML and JSON input while
converting to only support JSON internally.
Bug: T207694
Change-Id: I00668014907e9ea54917f5d5067cac08d0668053
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/compiler_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/compiler_test.go b/docker/compiler_test.go index 6d7f4f2..0a12c69 100644 --- a/docker/compiler_test.go +++ b/docker/compiler_test.go @@ -12,7 +12,7 @@ import ( ) func TestSingleStageHasNoName(t *testing.T) { - cfg, err := config.ReadConfig([]byte(`--- + cfg, err := config.ReadYAMLConfig([]byte(`--- version: v3 base: foo/bar variants: @@ -27,7 +27,7 @@ func TestSingleStageHasNoName(t *testing.T) { } func TestMultiStageIncludesStageNames(t *testing.T) { - cfg, err := config.ReadConfig([]byte(`--- + cfg, err := config.ReadYAMLConfig([]byte(`--- version: v3 base: foo/bar variants: @@ -51,7 +51,7 @@ func TestMultiStageIncludesStageNames(t *testing.T) { } func TestMultipleArtifactsFromSameStage(t *testing.T) { - cfg, err := config.ReadConfig([]byte(`--- + cfg, err := config.ReadYAMLConfig([]byte(`--- version: v3 base: foo/bar variants: @@ -78,7 +78,7 @@ func TestMultipleArtifactsFromSameStage(t *testing.T) { } func TestMetaDataLabels(t *testing.T) { - cfg, err := config.ReadConfig([]byte(`--- + cfg, err := config.ReadYAMLConfig([]byte(`--- version: v3 base: foo/bar variants: |