Revert "remove go version check"

This reverts commit 27df7fb.

integration/build_flags_test.go

@@ -75,6 +75,7 @@ func testBuildFlags(t *testing.T, context spec.G, it spec.S) {
 			Eventually(container).Should(
 				Serve(
 					SatisfyAll(
+						ContainSubstring("go1.21"),
 						ContainSubstring(`variable value: "some-value"`),
 						ContainSubstring("/workspace contents: []"),
 					),
@@ -122,6 +123,7 @@ func testBuildFlags(t *testing.T, context spec.G, it spec.S) {
 			Eventually(container).Should(
 				Serve(
 					SatisfyAll(
+						ContainSubstring("go1.21"),
 						ContainSubstring(`variable value: "env-value"`),
 						ContainSubstring("/workspace contents: []"),
 					),

integration/default_test.go

@@ -82,7 +82,14 @@ func testDefault(t *testing.T, context spec.G, it spec.S) {
 				Execute(image.ID)
 			Expect(err).NotTo(HaveOccurred())
 
-			Eventually(container).Should(Serve(ContainSubstring("/workspace contents: []")).OnPort(8080))
+			Eventually(container).Should(
+				Serve(
+					SatisfyAll(
+						ContainSubstring("go1.21"),
+						ContainSubstring("/workspace contents: []"),
+					),
+				).OnPort(8080),
+			)
 
 			Expect(logs).To(ContainLines(
 				MatchRegexp(fmt.Sprintf(`%s \d+\.\d+\.\d+`, settings.Buildpack.Name)),
@@ -165,8 +172,7 @@ func testDefault(t *testing.T, context spec.G, it spec.S) {
 				Execute(image.ID)
 			Expect(err).NotTo(HaveOccurred())
 
-			Eventually(container).Should(Serve(ContainSubstring("/workspace contents: []")).OnPort(8080))
-
+			Eventually(container).Should(Serve(ContainSubstring("go1.21")).OnPort(8080))
 		})
 	})
 
@@ -214,7 +220,14 @@ func testDefault(t *testing.T, context spec.G, it spec.S) {
 				Execute(image.ID)
 			Expect(err).NotTo(HaveOccurred())
 
-			Eventually(container).Should(Serve(ContainSubstring("/workspace contents: []")).OnPort(8080))
+			Eventually(container).Should(
+				Serve(
+					SatisfyAll(
+						ContainSubstring("go1.21"),
+						ContainSubstring("/workspace contents: []"),
+					),
+				).OnPort(8080),
+			)
 		})
 	})
 
@@ -270,8 +283,7 @@ func testDefault(t *testing.T, context spec.G, it spec.S) {
 				Execute(image.ID)
 			Expect(err).NotTo(HaveOccurred())
 
-			Eventually(container).Should(Serve(ContainSubstring("/workspace contents: []")).OnPort(8080))
-
+			Eventually(container).Should(Serve(ContainSubstring("go1.21")).OnPort(8080))
 
 			Expect(logs).To(ContainLines(
 				"  Assigning launch processes:",
@@ -287,7 +299,7 @@ func testDefault(t *testing.T, context spec.G, it spec.S) {
 				Execute(image.ID)
 			Expect(err).NotTo(HaveOccurred())
 
-			Eventually(noReloadContainer).Should(Serve(ContainSubstring("/workspace contents: []")).OnPort(8080))
+			Eventually(noReloadContainer).Should(Serve(ContainSubstring("go1.21")).OnPort(8080))
 		})
 	})
 }

integration/import_path_test.go

@@ -72,7 +72,14 @@ func testImportPath(t *testing.T, context spec.G, it spec.S) {
 				Execute(image.ID)
 			Expect(err).NotTo(HaveOccurred())
 
-			Eventually(container).Should(Serve(ContainSubstring("/workspace contents: []")).OnPort(8080))
+			Eventually(container).Should(
+				Serve(
+					SatisfyAll(
+						ContainSubstring("go1.21"),
+						ContainSubstring("/workspace contents: []"),
+					),
+				).OnPort(8080),
+			)
 		})
 	})
 }

integration/keep_files_test.go

@@ -75,6 +75,7 @@ func testKeepFiles(t *testing.T, context spec.G, it spec.S) {
 			Eventually(container).Should(
 				Serve(
 					SatisfyAll(
+						ContainSubstring("go1.21"),
 						ContainSubstring("/workspace contents: [/workspace/assets /workspace/static-file]"),
 						ContainSubstring("file contents: Hello world!"),
 					),

integration/mod_test.go

@@ -82,7 +82,7 @@ func testMod(t *testing.T, context spec.G, it spec.S) {
 				Execute(image.ID)
 			Expect(err).NotTo(HaveOccurred())
 
-			Eventually(container).Should(Serve(ContainSubstring("/workspace contents: []")).OnPort(8080))
+			Eventually(container).Should(Serve(ContainSubstring("go1.21")).OnPort(8080))
 
 			// check that all required SBOM files are present
 			Expect(filepath.Join(sbomDir, "sbom", "launch", strings.ReplaceAll(settings.Buildpack.ID, "/", "_"), "targets", "sbom.cdx.json")).To(BeARegularFile())
@@ -119,7 +119,7 @@ func testMod(t *testing.T, context spec.G, it spec.S) {
 					Execute(image.ID)
 				Expect(err).NotTo(HaveOccurred())
 
-				Eventually(container).Should(Serve(ContainSubstring("/workspace contents: []")).OnPort(8080))
+				Eventually(container).Should(Serve(ContainSubstring("go1.21")).OnPort(8080))
 
 				// check that all required SBOM files are present
 				Expect(filepath.Join(sbomDir, "sbom", "launch", strings.ReplaceAll(settings.Buildpack.ID, "/", "_"), "targets", "sbom.cdx.json")).To(BeARegularFile())

integration/targets_test.go

@@ -86,7 +86,7 @@ func testTargets(t *testing.T, context spec.G, it spec.S) {
 			Expect(err).NotTo(HaveOccurred())
 			containerIDs[container.ID] = struct{}{}
 
-			Eventually(container).Should(Serve(ContainSubstring("first: go")).OnPort(8080))
+			Eventually(container).Should(Serve(ContainSubstring("first: go1.21")).OnPort(8080))
 
 			Expect(logs).To(ContainLines(
 				"  Assigning launch processes:",
@@ -104,7 +104,7 @@ func testTargets(t *testing.T, context spec.G, it spec.S) {
 			Expect(err).NotTo(HaveOccurred())
 			containerIDs[container.ID] = struct{}{}
 
-			Eventually(container).Should(Serve(ContainSubstring("second: go")).OnPort(8080))
+			Eventually(container).Should(Serve(ContainSubstring("second: go1.21")).OnPort(8080))
 
 			// check that all required SBOM files are present
 			Expect(filepath.Join(sbomDir, "sbom", "launch", strings.ReplaceAll(settings.Buildpack.ID, "/", "_"), "targets", "sbom.cdx.json")).To(BeARegularFile())

integration/testdata/mod/main.go

@@ -5,7 +5,6 @@ import (
 	"log"
 	"net/http"
 	"os"
-	"path/filepath"
 	"runtime"
 
 	"github.com/gorilla/mux"
@@ -15,9 +14,6 @@ func main() {
 	router := mux.NewRouter()
 	router.HandleFunc("/", func(w http.ResponseWriter, req *http.Request) {
 		fmt.Fprintln(w, runtime.Version())
-
-		paths, _ := filepath.Glob("/workspace/*")
-		fmt.Fprintf(w, "/workspace contents: %v\n", paths)
 	})
 
 	log.Fatal(http.ListenAndServe(":"+os.Getenv("PORT"), router))

integration/testdata/vendor/main.go

@@ -6,7 +6,6 @@ import (
 	"log"
 	"net/http"
 	"os"
-	"path/filepath"
 	"runtime"
 
 	"github.com/gorilla/mux"
@@ -19,9 +18,6 @@ func main() {
 	router := mux.NewRouter()
 	router.HandleFunc("/", func(w http.ResponseWriter, req *http.Request) {
 		fmt.Fprintln(w, runtime.Version())
-
-		paths, _ := filepath.Glob("/workspace/*")
-		fmt.Fprintf(w, "/workspace contents: %v\n", paths)
 	})
 
 	log.Fatal(http.ListenAndServe(":"+os.Getenv("PORT"), router))

integration/vendor_test.go

@@ -71,7 +71,7 @@ func testVendor(t *testing.T, context spec.G, it spec.S) {
 				Execute(image.ID)
 			Expect(err).NotTo(HaveOccurred())
 
-			Eventually(container).Should(Serve(ContainSubstring("/workspace contents: []")).OnPort(8080))
+			Eventually(container).Should(Serve(ContainSubstring("go1.21")).OnPort(8080))
 		})
 	})
 
@@ -120,7 +120,7 @@ func testVendor(t *testing.T, context spec.G, it spec.S) {
 				Execute(image.ID)
 			Expect(err).NotTo(HaveOccurred())
 
-			Eventually(container).Should(Serve(ContainSubstring("/workspace contents: []")).OnPort(8080))
+			Eventually(container).Should(Serve(ContainSubstring("go1.21")).OnPort(8080))
 		})
 	})
 }