From fcac885ce2a9770074e99bf389caadf635e2c93e Mon Sep 17 00:00:00 2001 From: sh0rez Date: Fri, 28 Feb 2020 23:22:41 +0100 Subject: [PATCH] fix: unmarshal legacyImports --- cmd/jb/install_test.go | 6 +++--- pkg/jsonnetfile/jsonnetfile_test.go | 2 +- spec/v1/spec.go | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmd/jb/install_test.go b/cmd/jb/install_test.go index 894c6ea..5657534 100644 --- a/cmd/jb/install_test.go +++ b/cmd/jb/install_test.go @@ -28,7 +28,7 @@ import ( "github.com/jsonnet-bundler/jsonnet-bundler/spec/v1/deps" ) -const initContents = `{"version": 1, "dependencies": [], "legacyImports": false}` +const initContents = `{"version": 1, "dependencies": [], "legacyImports": true}` func TestInstallCommand(t *testing.T) { testInstallCommandWithJsonnetHome(t, "vendor") @@ -59,14 +59,14 @@ func testInstallCommandWithJsonnetHome(t *testing.T, jsonnetHome string) { Name: "OneURL", URIs: []string{"github.com/jsonnet-bundler/jsonnet-bundler@v0.1.0"}, ExpectedCode: 0, - ExpectedJsonnetFile: []byte(`{"version": 1, "dependencies": [{"source": {"git": {"remote": "https://github.com/jsonnet-bundler/jsonnet-bundler", "subdir": ""}}, "version": "v0.1.0"}], "legacyImports": false}`), + ExpectedJsonnetFile: []byte(`{"version": 1, "dependencies": [{"source": {"git": {"remote": "https://github.com/jsonnet-bundler/jsonnet-bundler", "subdir": ""}}, "version": "v0.1.0"}], "legacyImports": true}`), ExpectedJsonnetLockFile: []byte(`{"version": 1, "dependencies": [{"source": {"git": {"remote": "https://github.com/jsonnet-bundler/jsonnet-bundler", "subdir": ""}}, "version": "080f157c7fb85ad0281ea78f6c641eaa570a582f", "sum": "W1uI550rQ66axRpPXA2EZDquyPg/5PHZlvUz1NEzefg="}], "legacyImports": false}`), }, { Name: "Local", URIs: []string{"jsonnet/foobar"}, ExpectedCode: 0, - ExpectedJsonnetFile: []byte(`{"version": 1, "dependencies": [{"source": {"local": {"directory": "jsonnet/foobar"}}, "version": ""}], "legacyImports": false}`), + ExpectedJsonnetFile: []byte(`{"version": 1, "dependencies": [{"source": {"local": {"directory": "jsonnet/foobar"}}, "version": ""}], "legacyImports": true}`), ExpectedJsonnetLockFile: []byte(`{"version": 1, "dependencies": [{"source": {"local": {"directory": "jsonnet/foobar"}}, "version": ""}], "legacyImports": false}`), }, } diff --git a/pkg/jsonnetfile/jsonnetfile_test.go b/pkg/jsonnetfile/jsonnetfile_test.go index 8596ddc..4e3be52 100644 --- a/pkg/jsonnetfile/jsonnetfile_test.go +++ b/pkg/jsonnetfile/jsonnetfile_test.go @@ -210,7 +210,7 @@ func TestLoadEmpty(t *testing.T) { // write empty json file tempFile := filepath.Join(tempDir, jsonnetfile.File) - err = ioutil.WriteFile(tempFile, []byte(`{"version":1}`), os.ModePerm) + err = ioutil.WriteFile(tempFile, []byte(`{}`), os.ModePerm) assert.Nil(t, err) // expect it to be loaded properly diff --git a/spec/v1/spec.go b/spec/v1/spec.go index a83b9cb..b2ca5ef 100644 --- a/spec/v1/spec.go +++ b/spec/v1/spec.go @@ -73,6 +73,7 @@ func (jf JsonnetFile) MarshalJSON() ([]byte, error) { var s jsonFile s.Version = Version + s.LegacyImports = jf.LegacyImports for _, d := range jf.Dependencies { s.Dependencies = append(s.Dependencies, d)