cmd/init: Enable importing external configuration from dependencies d…

…uring init

Enable importing other tools and add integration tests
- Turned off skip tools flag by default
- Added glide integration tests for the init case

CHANGELOG.md

@@ -5,6 +5,10 @@ BUG FIXES:
 * Releases targeting Windows now have a `.exe` suffix (#1291).
 * Adaptively recover from dirty and corrupted git repositories in cache (#1279).
 
+WIP:
+
+* dep: Enable importing external configuration from dependencies during init (#1277)
+
 IMPROVEMENTS:
 
 * Log as dependencies are pre-fetched during dep init ([#1176](https://github.com/golang/dep/pull/1176)).
@@ -52,7 +56,6 @@ WIP:
 * gps: Process canonical import paths. (#1017)
 * gps: Persistent cache. (#1127, #1215)
 
-
 # v0.3.1
 
 * gps: Add satisfiability check for case variants (#1079)

cmd/dep/init.go

@@ -160,8 +160,7 @@ func (cmd *initCommand) Run(ctx *dep.Ctx, args []string) error {
 		}
 	}
 
-	rootAnalyzer.skipTools = true // Don't import external config during solve for now
-	copyLock := *p.Lock           // Copy lock before solving. Use this to separate new lock projects from solved lock
+	copyLock := *p.Lock // Copy lock before solving. Use this to separate new lock projects from solved lock
 
 	params := gps.SolveParameters{
 		RootDir:         root,

cmd/dep/testdata/harness_tests/init/glide/case3/README.md

@@ -1 +1 @@
-Import glide config in dependencies.
+Import glide config in direct dependencies.

cmd/dep/testdata/harness_tests/init/glide/corrupt-glide/README.md

@@ -0,0 +1 @@
+Import deptestglideA tag v0.3.0 which has a corrupt glide manifest.

cmd/dep/testdata/harness_tests/init/glide/corrupt-glide/initial/glide.yaml

@@ -0,0 +1,10 @@
+package: github.com/golang/notexist
+homepage: http://example.com
+license: MIT
+owners:
+- name: Sam Boyer
+  email: [email protected]
+  homepage: http://sdboyer.io
+import:
+- package: github.com/ChinmayR/deptestglideA
+  version: v0.3.0

cmd/dep/testdata/harness_tests/init/glide/corrupt-glide/initial/main.go

@@ -0,0 +1,11 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"github.com/ChinmayR/deptestglideA"
+)
+
+type PointToDepTestGlideAv010 deptestglideA.Bversion2

cmd/dep/testdata/harness_tests/init/glide/corrupt-glide/testcase.json

@@ -0,0 +1,6 @@
+{
+  "commands": [
+    ["init", "-no-examples", "-v"]
+  ],
+  "error-expected": "v0.3.0: unable to parse"
+}

cmd/dep/testdata/harness_tests/init/glide/direct-trans-conflict/README.md

@@ -0,0 +1 @@
+Take a direct dependency on a transient dependency where the versions are conflicted. Resolving should fail.

cmd/dep/testdata/harness_tests/init/glide/direct-trans-conflict/initial/glide.yaml

@@ -0,0 +1,12 @@
+package: github.com/golang/notexist
+homepage: http://example.com
+license: MIT
+owners:
+- name: Sam Boyer
+  email: [email protected]
+  homepage: http://sdboyer.io
+import:
+- package: github.com/ChinmayR/deptestglideA
+  version: v0.1.0
+- package: github.com/ChinmayR/deptestglideB
+  version: v0.2.0

cmd/dep/testdata/harness_tests/init/glide/direct-trans-conflict/initial/main.go

@@ -0,0 +1,13 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"github.com/ChinmayR/deptestglideA"
+	"github.com/ChinmayR/deptestglideB"
+)
+
+type PointToDepTestGlideAv010 deptestglideA.Bversion1
+type FooVersion2 deptestglideB.FooVersion2

cmd/dep/testdata/harness_tests/init/glide/direct-trans-conflict/testcase.json

@@ -0,0 +1,6 @@
+{
+  "commands": [
+    ["init", "-no-examples", "-v"]
+  ],
+  "error-expected": "master: Could not introduce github.com/ChinmayR/deptestglideA@master, as it is not allowed by constraint ^0.1.0 from project github.com/golang/notexist."
+}

cmd/dep/testdata/harness_tests/init/glide/direct-trans-no-conflict/README.md

@@ -0,0 +1 @@
+Take a direct dependency on a transient dependency where the versions are not conflicted. Resolving should pass.

cmd/dep/testdata/harness_tests/init/glide/direct-trans-no-conflict/final/Gopkg.toml

@@ -0,0 +1,7 @@
+
+[[constraint]]
+  name = "github.com/ChinmayR/deptestglideA"
+  version = "0.2.0"
+
+[[constraint]]
+  name = "github.com/ChinmayR/deptestglideB"

cmd/dep/testdata/harness_tests/init/glide/direct-trans-no-conflict/initial/glide.yaml

@@ -0,0 +1,12 @@
+package: github.com/golang/notexist
+homepage: http://example.com
+license: MIT
+owners:
+- name: Sam Boyer
+  email: [email protected]
+  homepage: http://sdboyer.io
+import:
+- package: github.com/ChinmayR/deptestglideA
+  version: v0.2.0
+- package: github.com/ChinmayR/deptestglideB
+  version: ~0.1.0

cmd/dep/testdata/harness_tests/init/glide/direct-trans-no-conflict/initial/main.go

@@ -0,0 +1,13 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"github.com/ChinmayR/deptestglideA"
+	"github.com/ChinmayR/deptestglideB"
+)
+
+type PointToDepTestGlideAv010 deptestglideA.Bversion2
+type FooVersion2 deptestglideB.FooVersion2

cmd/dep/testdata/harness_tests/init/glide/direct-trans-no-conflict/testcase.json

@@ -0,0 +1,9 @@
+{
+  "commands": [
+    ["init", "-no-examples", "-v"]
+  ],
+  "vendor-final": [
+    "github.com/ChinmayR/deptestglideA",
+    "github.com/ChinmayR/deptestglideB"
+  ]
+}

cmd/dep/testdata/harness_tests/init/glide/trans-trans-conflict/README.md

@@ -0,0 +1 @@
+Have two transient dependencies have different versions of the same repo. Resolving should fail.

cmd/dep/testdata/harness_tests/init/glide/trans-trans-conflict/initial/glide.yaml

@@ -0,0 +1,12 @@
+package: github.com/golang/notexist
+homepage: http://example.com
+license: MIT
+owners:
+- name: Sam Boyer
+  email: [email protected]
+  homepage: http://sdboyer.io
+import:
+- package: github.com/ChinmayR/deptestglideA
+  version: v0.4.0
+- package: github.com/ChinmayR/deptestglideB
+  version: v0.3.0

cmd/dep/testdata/harness_tests/init/glide/trans-trans-conflict/initial/main.go

@@ -0,0 +1,13 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"github.com/ChinmayR/deptestglideA"
+	"github.com/ChinmayR/deptestglideB"
+)
+
+type PointToDepTestGlideCv010 deptestglideA.Cversion1
+type PointToDepTestGlideCv020 deptestglideB.Cversion2

cmd/dep/testdata/harness_tests/init/glide/trans-trans-conflict/testcase.json.ignore

@@ -0,0 +1,6 @@
+{
+  "commands": [
+    ["init", "-no-examples", "-v"]
+  ],
+  "error-expected": "No versions of github.com/ChinmayR/deptestglideB met constraints"
+}

cmd/dep/testdata/harness_tests/init/glide/trans-trans-trans/README.md

@@ -0,0 +1 @@
+Test if a transitive glide manifest is read.

cmd/dep/testdata/harness_tests/init/glide/trans-trans-trans/final/Gopkg.toml

@@ -0,0 +1,4 @@
+
+[[constraint]]
+  name = "github.com/ChinmayR/deptestglideA"
+  version = "0.6.0"

cmd/dep/testdata/harness_tests/init/glide/trans-trans-trans/initial/glide.yaml

@@ -0,0 +1,10 @@
+package: github.com/golang/notexist
+homepage: http://example.com
+license: MIT
+owners:
+- name: Sam Boyer
+  email: [email protected]
+  homepage: http://sdboyer.io
+import:
+- package: github.com/ChinmayR/deptestglideA
+  version: v0.6.0

cmd/dep/testdata/harness_tests/init/glide/trans-trans-trans/initial/main.go

@@ -0,0 +1,11 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"github.com/ChinmayR/deptestglideA"
+)
+
+type PointToDepTestGlideAv010 deptestglideA.PointToDepTestGlideBv050

cmd/dep/testdata/harness_tests/init/glide/trans-trans-trans/testcase.json

@@ -0,0 +1,10 @@
+{
+  "commands": [
+    ["init", "-no-examples", "-v"]
+  ],
+  "vendor-final": [
+    "github.com/ChinmayR/deptestglideA",
+    "github.com/ChinmayR/deptestglideB",
+    "github.com/ChinmayR/deptestglideC"
+  ]
+}

cmd/dep/testdata/harness_tests/init/glide/trans-trans-unspecified/README.md

@@ -0,0 +1,2 @@
+Have two direct dependencies where one specifies a direct transient version,
+and the other can take any transient but overlapping version. Resolving should pass.

cmd/dep/testdata/harness_tests/init/glide/trans-trans-unspecified/final/Gopkg.toml

@@ -0,0 +1,8 @@
+
+[[constraint]]
+  name = "github.com/ChinmayR/deptestglideA"
+  version = "0.4.0"
+
+[[constraint]]
+  name = "github.com/ChinmayR/deptestglideB"
+  version = "0.4.0"

cmd/dep/testdata/harness_tests/init/glide/trans-trans-unspecified/initial/glide.yaml

@@ -0,0 +1,12 @@
+package: github.com/golang/notexist
+homepage: http://example.com
+license: MIT
+owners:
+- name: Sam Boyer
+  email: [email protected]
+  homepage: http://sdboyer.io
+import:
+- package: github.com/ChinmayR/deptestglideA
+  version: v0.4.0
+- package: github.com/ChinmayR/deptestglideB
+  version: v0.4.0