mirror of
https://github.com/TECHNOFAB11/jsonnet-bundler.git
synced 2025-12-11 23:50:05 +01:00
feat: absolute imports (#63)
* feat: go-like import style jb now creates a directory structure inside of vendor/ that is similar to how go does (github.com/grafana/jsonnet-libs). This is reflected in the final import paths, which means they will be go-like * refactor(spec/deps): named regexs * feat: make goImportStyle configurable Defaults to off, can be enabled in `jsonnetfile.json` * fix: integration test * doc: license headers * fix(deps): remove GO_IMPORT_STYLE not an option anymore, will always do so and symlink * feat: symlink to legacy location * feat: allow to disable legacy links * fix(test): legacyImports in integration tests * fix(spec): test * fix: respect legacyName aliases It was possible to alias packages by changing `name` previously. While names are now absolute (and computed), legacy links should still respect old aliases to avoid breaking code. * fix(test): integration * fix(init): keep legacyImports enabled for now * feat: rewrite imports adds a command to automatically rewrite imports from legacy to absolute style * fix(tool): rewrite confused by prefixing packages When a package was a prefix of another one, it broke. Fixed that by using a proper regular expression. Added a test to make sure it works as expected * Update cmd/jb/init.go * fix: exclude local packages from legacy linking They actually still use the old style, which is fine. LegacyLinking messed them up, but from now on it just ignores symlinks that match a localPackage.
This commit is contained in:
Tom
GitHub
parent
184841238b
commit
7b8a7836a4
22 changed files with 1129 additions and 361 deletions
|
|
@ -25,8 +25,12 @@ import (
|
|||
|
||||
"github.com/jsonnet-bundler/jsonnet-bundler/pkg/jsonnetfile"
|
||||
"github.com/jsonnet-bundler/jsonnet-bundler/spec"
|
||||
"github.com/jsonnet-bundler/jsonnet-bundler/spec/deps"
|
||||
)
|
||||
|
||||
// TODO: Change legacyImports to false eventually
|
||||
const initContents = `{"dependencies": [], "legacyImports": true}`
|
||||
|
||||
func TestInstallCommand(t *testing.T) {
|
||||
testcases := []struct {
|
||||
Name string
|
||||
|
|
@ -38,19 +42,21 @@ func TestInstallCommand(t *testing.T) {
|
|||
{
|
||||
Name: "NoURLs",
|
||||
ExpectedCode: 0,
|
||||
ExpectedJsonnetFile: []byte(`{}`),
|
||||
}, {
|
||||
ExpectedJsonnetFile: []byte(initContents),
|
||||
},
|
||||
{
|
||||
Name: "OneURL",
|
||||
URIs: []string{"github.com/jsonnet-bundler/jsonnet-bundler@v0.1.0"},
|
||||
ExpectedCode: 0,
|
||||
ExpectedJsonnetFile: []byte(`{"dependencies": [{"name": "jsonnet-bundler", "source": {"git": {"remote": "https://github.com/jsonnet-bundler/jsonnet-bundler", "subdir": ""}}, "version": "v0.1.0"}]}`),
|
||||
ExpectedJsonnetLockFile: []byte(`{"dependencies": [{"name": "jsonnet-bundler", "source": {"git": {"remote": "https://github.com/jsonnet-bundler/jsonnet-bundler", "subdir": ""}}, "version": "080f157c7fb85ad0281ea78f6c641eaa570a582f", "sum": "W1uI550rQ66axRpPXA2EZDquyPg/5PHZlvUz1NEzefg="}]}`),
|
||||
}, {
|
||||
Name: "Relative",
|
||||
ExpectedJsonnetFile: []byte(`{"dependencies": [{"source": {"git": {"remote": "https://github.com/jsonnet-bundler/jsonnet-bundler", "subdir": ""}}, "version": "v0.1.0"}], "legacyImports": true}`),
|
||||
ExpectedJsonnetLockFile: []byte(`{"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(`{"dependencies": [{"name": "foobar", "source": {"local": {"directory": "jsonnet/foobar"}}, "version": ""}]}`),
|
||||
ExpectedJsonnetLockFile: []byte(`{"dependencies": [{"name": "foobar", "source": {"local": {"directory": "jsonnet/foobar"}}, "version": ""}]}`),
|
||||
ExpectedJsonnetFile: []byte(`{"dependencies": [{"source": {"local": {"directory": "jsonnet/foobar"}}, "version": ""}], "legacyImports": true}`),
|
||||
ExpectedJsonnetLockFile: []byte(`{"dependencies": [{"source": {"local": {"directory": "jsonnet/foobar"}}, "version": ""}], "legacyImports": false}`),
|
||||
},
|
||||
}
|
||||
|
||||
|
|
@ -70,12 +76,12 @@ func TestInstallCommand(t *testing.T) {
|
|||
err := os.MkdirAll(localDependency, os.ModePerm)
|
||||
assert.NoError(t, err)
|
||||
|
||||
// init + check it works correctly (legacyImports true, empty dependencies)
|
||||
initCommand("")
|
||||
jsonnetFileContent(t, jsonnetfile.File, []byte(initContents))
|
||||
|
||||
jsonnetFileContent(t, jsonnetfile.File, []byte(`{}`))
|
||||
|
||||
// install something, check it writes only if required, etc.
|
||||
installCommand("", "vendor", tc.URIs)
|
||||
|
||||
jsonnetFileContent(t, jsonnetfile.File, tc.ExpectedJsonnetFile)
|
||||
if tc.ExpectedJsonnetLockFile != nil {
|
||||
jsonnetFileContent(t, jsonnetfile.LockFile, tc.ExpectedJsonnetLockFile)
|
||||
|
|
@ -111,11 +117,11 @@ func TestWriteChangedJsonnetFile(t *testing.T) {
|
|||
},
|
||||
{
|
||||
Name: "NoDiffNotEmpty",
|
||||
JsonnetFileBytes: []byte(`{"dependencies": [{"name": "foobar"}]}`),
|
||||
JsonnetFileBytes: []byte(`{"dependencies": [{"version": "master"}]}`),
|
||||
NewJsonnetFile: spec.JsonnetFile{
|
||||
Dependencies: map[string]spec.Dependency{
|
||||
"foobar": {
|
||||
Name: "foobar",
|
||||
Dependencies: map[string]deps.Dependency{
|
||||
"": {
|
||||
Version: "master",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -123,11 +129,10 @@ func TestWriteChangedJsonnetFile(t *testing.T) {
|
|||
},
|
||||
{
|
||||
Name: "DiffVersion",
|
||||
JsonnetFileBytes: []byte(`{"dependencies": [{"name": "foobar", "version": "1.0"}]}`),
|
||||
JsonnetFileBytes: []byte(`{"dependencies": [{"version": "1.0"}]}`),
|
||||
NewJsonnetFile: spec.JsonnetFile{
|
||||
Dependencies: map[string]spec.Dependency{
|
||||
"foobar": {
|
||||
Name: "foobar",
|
||||
Dependencies: map[string]deps.Dependency{
|
||||
"": {
|
||||
Version: "2.0",
|
||||
},
|
||||
},
|
||||
|
|
@ -138,17 +143,18 @@ func TestWriteChangedJsonnetFile(t *testing.T) {
|
|||
Name: "Diff",
|
||||
JsonnetFileBytes: []byte(`{}`),
|
||||
NewJsonnetFile: spec.JsonnetFile{
|
||||
Dependencies: map[string]spec.Dependency{
|
||||
"foobar": {
|
||||
Name: "foobar",
|
||||
Source: spec.Source{
|
||||
GitSource: &spec.GitSource{
|
||||
Remote: "https://github.com/foobar/foobar",
|
||||
Dependencies: map[string]deps.Dependency{
|
||||
"github.com/foobar/foobar": {
|
||||
Source: deps.Source{
|
||||
GitSource: &deps.Git{
|
||||
Scheme: deps.GitSchemeHTTPS,
|
||||
Host: "github.com",
|
||||
User: "foobar",
|
||||
Repo: "foobar",
|
||||
Subdir: "",
|
||||
},
|
||||
},
|
||||
Version: "master",
|
||||
DepSource: "",
|
||||
Version: "master",
|
||||
}},
|
||||
},
|
||||
ExpectWrite: true,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue