Do not reuse packages layer [#167655092]

dep/dep.go

@@ -57,9 +57,6 @@ type Runner interface {
 }
 
 func NewContributor(context build.Build, runner Runner) (Contributor, bool, error) {
-
-
-
 	dependency, wantDependency, err := context.Plans.GetShallowMerged(Dependency)
 	if err != nil {
 		return Contributor{}, false, nil
@@ -173,9 +170,8 @@ func (c *Contributor) ContributePackages() error {
 			os.Stdout, os.Stderr,
 			depBin, "ensure")
 
-	}, layers.Cache)
+	})
 }
-
 func (c *Contributor) ContributeBinary() error {
 	return c.appBinaryLayer.Contribute(getAppBinaryMetadata(), func(layer layers.Layer) error {
 		layer.Logger.SubsequentLine("Running `go install`")

integration/integration_test.go

@@ -77,43 +77,34 @@ func testIntegration(t *testing.T, when spec.G, it spec.S) {
 		Expect(app.BuildLogs()).To(MatchRegexp("Dep.*: Contributing to layer"))
 	})
 
-	it("uses Gopkg.lock as a lockfile for re-builds", func() {
-		appDir := filepath.Join("testdata", "with_lockfile")
+	it("uses the vendored packages when the app is vendored", func() {
+		appDir := filepath.Join("testdata", "vendored_app")
 		app, err := dagger.PackBuild(appDir, goURI, depURI)
 		Expect(err).ToNot(HaveOccurred())
-		defer app.Destroy()
-
-		depPrefix := "Dep \\d*\\.\\d*\\.\\d*: "
-		depPackagesPrefix := "Dep Packages \\w*: "
-		contributeMsg := "Contributing to layer"
-		Expect(app.BuildLogs()).To(MatchRegexp(depPrefix + contributeMsg))
-		Expect(app.BuildLogs()).To(MatchRegexp(depPackagesPrefix + contributeMsg))
 
-		_, imageID, _, err := app.Info()
-		Expect(err).NotTo(HaveOccurred())
+		Expect(app.BuildLogs()).To(ContainSubstring("Note: skipping `dep ensure` due to non-empty vendor directory."))
 
-		app, err = dagger.PackBuildNamedImage(imageID, appDir, goURI, depURI)
+		Expect(app.Start()).To(Succeed())
+		_, _, err = app.HTTPGet("/")
 		Expect(err).ToNot(HaveOccurred())
+	})
 
-		rebuildLogs := app.BuildLogs()
-		reuseMsg := "Reusing cached layer"
-		Expect(rebuildLogs).To(MatchRegexp(depPrefix + reuseMsg))
-		Expect(rebuildLogs).To(MatchRegexp(depPackagesPrefix + reuseMsg))
-		Expect(app.Start()).To(Succeed())
+	it("uses updated source code on a rebuild", func() {
+		appRoot := filepath.Join("testdata", "with_lockfile")
 
-		_, _, err = app.HTTPGet("/")
+		app, err := dagger.PackBuild(appRoot, goURI, depURI)
 		Expect(err).NotTo(HaveOccurred())
-	})
+		defer app.Destroy()
 
-	it("uses the vendored packages when the app is vendored", func() {
-		appDir := filepath.Join("testdata", "vendored_app")
-		app, err := dagger.PackBuild(appDir, goURI, depURI)
 		Expect(err).ToNot(HaveOccurred())
+		Expect(app.BuildLogs()).To(MatchRegexp("Dep.*: Contributing to layer"))
 
-		Expect(app.BuildLogs()).To(ContainSubstring("Note: skipping `dep ensure` due to non-empty vendor directory."))
-
+		_, imageID, _, err := app.Info()
+		appRoot = filepath.Join("testdata", "with_lockfile_modified")
+		app, err = dagger.PackBuildNamedImage(imageID, appRoot, goURI, depURI)
 		Expect(app.Start()).To(Succeed())
-		_, _, err = app.HTTPGet("/")
-		Expect(err).ToNot(HaveOccurred())
+		body, _, err := app.HTTPGet("/")
+		Expect(err).NotTo(HaveOccurred())
+		Expect(body).To(ContainSubstring("The source changed!"))
 	})
 }

integration/testdata/with_lockfile_modified/Gopkg.toml

@@ -0,0 +1,4 @@
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/ZiCog/shiny-thing"

integration/testdata/with_lockfile_modified/buildpack.yml

@@ -0,0 +1,2 @@
+go:
+  import-path: hubgit.net/user/app

integration/testdata/with_lockfile_modified/site.go

@@ -0,0 +1,27 @@
+package main
+
+import (
+	"fmt"
+	"net/http"
+	"os"
+
+	"github.com/ZiCog/shiny-thing/foo"
+)
+
+func main() {
+	foo.Do()
+	http.HandleFunc("/", hello)
+	port := "8080"
+	if os.Getenv("PORT") != "" {
+		port = os.Getenv("PORT")
+	}
+	fmt.Println(fmt.Sprintf("listening on %s...", port))
+	err := http.ListenAndServe(":"+port, nil)
+	if err != nil {
+		panic(err)
+	}
+}
+
+func hello(res http.ResponseWriter, req *http.Request) {
+	fmt.Fprintln(res, "The source changed!")
+}