Allow create-builder on Windows (buildpacks#211)

* Allow create-builder on Windows - Also allow tgz buildpacks on build command - Still disallowing directory buildpacks on Windows Resolves buildpacks#181 Signed-off-by: Andrew Meyer <[email protected]> Signed-off-by: Javier Romero <[email protected]>
kvedurmu · Jun 17, 2019 · 90ed107 · 90ed107
1 parent b914032
commit 90ed107
Show file tree

Hide file tree

Showing 55 changed files with 1,263 additions and 550 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.pack/
 /pack
 out/
 
@@ -9,7 +10,4 @@ artifacts/
 .DS_Store
 
 # Travis unencrypted file
-.travis/key.pem
-
-# Appveyor tools
-/appveyor-tools/
+.travis/key.pem
diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go
@@ -149,7 +149,7 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S) {
 				t.Log("no previous image exists")
 				cmd := packCmd(
 					"build", repoName,
-					"-p", "testdata/mock_app/.",
+					"-p", filepath.Join("testdata", "mock_app"),
 				)
 				output := h.Run(t, cmd)
 				h.AssertContains(t, output, fmt.Sprintf("Successfully built image '%s'", repoName))
@@ -183,7 +183,7 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S) {
 				}
 
 				t.Log("rebuild")
-				cmd = packCmd("build", repoName, "-p", "testdata/mock_app/.")
+				cmd = packCmd("build", repoName, "-p", filepath.Join("testdata", "mock_app"))
 				output = h.Run(t, cmd)
 				h.AssertContains(t, output, fmt.Sprintf("Successfully built image '%s'", repoName))
 				sha, err = imgSHAFromOutput(output, repoName)
@@ -220,13 +220,22 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S) {
 			})
 
 			when("--buildpack", func() {
-				when("the argument is a directory or id", func() {
+				when("the argument is a tgz or id", func() {
+					var notBuilderTgz string
+
+					it.Before(func() {
+						notBuilderTgz = h.CreateTgz(t, filepath.Join("testdata", "mock_buildpacks", "not-in-builder-buildpack"), "./", 0766)
+					})
+
+					it.After(func() {
+						h.AssertNil(t, os.Remove(notBuilderTgz))
+					})
+
 					it("adds the buildpacks to the builder if necessary and runs them", func() {
-						skipOnWindows(t, "buildpack directories not supported on windows")
 						cmd := packCmd(
 							"build", repoName,
 							"-p", filepath.Join("testdata", "mock_app"),
-							"--buildpack", filepath.Join("testdata", "mock_buildpacks", "not-in-builder-buildpack"),
+							"--buildpack", notBuilderTgz,
 							"--buildpack", "simple/layers@simple-layers-version",
 							"--buildpack", "noop.buildpack",
 						)
@@ -241,18 +250,44 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S) {
 						)
 					})
 
-					when("the buildpack stack doesn't match the builder", func() {
-						it("errors", func() {
-							skipOnWindows(t, "buildpack directories not supported on windows")
-							cmd := packCmd(
-								"build", repoName,
-								"-p", filepath.Join("testdata", "mock_app"),
-								"--buildpack", filepath.Join("testdata", "mock_buildpacks", "other-stack"),
-							)
-							txt, err := h.RunE(cmd)
-							h.AssertNotNil(t, err)
-							h.AssertContains(t, txt, "buildpack 'other/stack/bp' version 'other-stack-version' does not support stack 'pack.test.stack'")
-						})
+				})
+
+				when("the argument is directory", func() {
+					it("adds the buildpacks to the builder if necessary and runs them", func() {
+						h.SkipIf(t, runtime.GOOS == "windows", "buildpack directories not supported on windows")
+
+						cmd := packCmd(
+							"build", repoName,
+							"-p", filepath.Join("testdata", "mock_app"),
+							"--buildpack", filepath.Join("testdata", "mock_buildpacks", "not-in-builder-buildpack"),
+						)
+						output := h.Run(t, cmd)
+						h.AssertContains(t, output, fmt.Sprintf("Successfully built image '%s'", repoName))
+						t.Log("app is runnable")
+						assertMockAppRunsWithOutput(t, repoName, "Local Buildpack Dep Contents")
+					})
+				})
+
+				when("the buildpack stack doesn't match the builder", func() {
+					var otherStackBuilderTgz string
+
+					it.Before(func() {
+						otherStackBuilderTgz = h.CreateTgz(t, filepath.Join("testdata", "mock_buildpacks", "other-stack-buildpack"), "./", 0766)
+					})
+
+					it.After(func() {
+						h.AssertNil(t, os.Remove(otherStackBuilderTgz))
+					})
+
+					it("errors", func() {
+						cmd := packCmd(
+							"build", repoName,
+							"-p", filepath.Join("testdata", "mock_app"),
+							"--buildpack", otherStackBuilderTgz,
+						)
+						txt, err := h.RunE(cmd)
+						h.AssertNotNil(t, err)
+						h.AssertContains(t, txt, "buildpack 'other/stack/bp' version 'other-stack-version' does not support stack 'pack.test.stack'")
 					})
 				})
 			})
@@ -261,10 +296,10 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S) {
 				var envPath string
 
 				it.Before(func() {
-					skipOnWindows(t, "directory buildpacks are not implemented on windows")
-
 					envfile, err := ioutil.TempFile("", "envfile")
 					h.AssertNil(t, err)
+					defer envfile.Close()
+
 					err = os.Setenv("ENV2_CONTENTS", "Env2 Layer Contents From Environment")
 					h.AssertNil(t, err)
 					envfile.WriteString(`
@@ -294,7 +329,6 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S) {
 
 			when("--env", func() {
 				it.Before(func() {
-					skipOnWindows(t, "directory buildpacks are not implemented on windows")
 					h.AssertNil(t,
 						os.Setenv("ENV2_CONTENTS", "Env2 Layer Contents From Environment"),
 					)
@@ -450,30 +484,40 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S) {
 
 	when("pack run", func() {
 		it.Before(func() {
-			skipOnWindows(t, "cleaning up from this test is leaving containers on windows")
+			h.SkipIf(t, runtime.GOOS == "windows", "Skipping because windows fails to clean up properly")
 		})
 
 		when("there is a builder", func() {
+			var (
+				listeningPort string
+				err           error
+			)
+
+			it.Before(func() {
+				listeningPort, err = h.GetFreePort()
+				h.AssertNil(t, err)
+			})
+
 			it.After(func() {
 				absPath, err := filepath.Abs(filepath.Join("testdata", "mock_app"))
 				h.AssertNil(t, err)
+
 				sum := sha256.Sum256([]byte(absPath))
 				repoName := fmt.Sprintf("pack.local/run/%x", sum[:8])
 				ref, err := name.ParseReference(repoName, name.WeakValidation)
 				h.AssertNil(t, err)
+
 				h.DockerRmi(dockerCli, repoName)
-				cacheImage := cache.NewImageCache(ref, dockerCli)
-				buildCacheVolume := cache.NewVolumeCache(ref, "build", dockerCli)
-				launchCacheVolume := cache.NewVolumeCache(ref, "launch", dockerCli)
-				cacheImage.Clear(context.TODO())
-				buildCacheVolume.Clear(context.TODO())
-				launchCacheVolume.Clear(context.TODO())
+
+				cache.NewImageCache(ref, dockerCli).Clear(context.TODO())
+				cache.NewVolumeCache(ref, "build", dockerCli).Clear(context.TODO())
+				cache.NewVolumeCache(ref, "launch", dockerCli).Clear(context.TODO())
 			})
 
 			it("starts an image", func() {
 				var buf bytes.Buffer
 				cmd := packCmd("run",
-					"--port", "3000:8080",
+					"--port", listeningPort+":8080",
 					"-p", filepath.Join("testdata", "mock_app"),
 					"--builder", builder,
 				)
@@ -484,7 +528,7 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S) {
 				defer ctrlCProc(cmd)
 
 				h.AssertEq(t, isCommandRunning(cmd), true)
-				assertMockAppResponseContains(t, "3000", 30*time.Second, "Launch Dep Contents", "Cached Dep Contents")
+				assertMockAppResponseContains(t, listeningPort, 30*time.Second, "Launch Dep Contents", "Cached Dep Contents")
 			})
 		})
 
@@ -648,12 +692,14 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S) {
 
 			it.After(func() {
 				h.DockerRmi(dockerCli, origID, builderName, origRunImageID, runImage)
+
 				ref, err := name.ParseReference(repoName, name.WeakValidation)
 				h.AssertNil(t, err)
 				h.AssertNil(t, h.DockerRmi(dockerCli, repoName))
 				cacheImage := cache.NewImageCache(ref, dockerCli)
 				buildCacheVolume := cache.NewVolumeCache(ref, "build", dockerCli)
 				launchCacheVolume := cache.NewVolumeCache(ref, "launch", dockerCli)
+
 				cacheImage.Clear(context.TODO())
 				buildCacheVolume.Clear(context.TODO())
 				launchCacheVolume.Clear(context.TODO())
@@ -724,7 +770,6 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S) {
 }
 
 func createBuilder(t *testing.T, runImageMirror string) string {
-	skipOnWindows(t, "create builder is not implemented on windows")
 	t.Log("create builder image")
 
 	tmpDir, err := ioutil.TempDir("", "create-test-builder")
@@ -733,6 +778,20 @@ func createBuilder(t *testing.T, runImageMirror string) string {
 
 	h.RecursiveCopy(t, filepath.Join("testdata", "mock_buildpacks"), tmpDir)
 
+	buildpacks := []string{
+		"noop-buildpack",
+		"not-in-builder-buildpack",
+		"other-stack-buildpack",
+		"read-env-buildpack",
+		"simple-layers-buildpack",
+	}
+
+	for _, v := range buildpacks {
+		tgz := h.CreateTgz(t, filepath.Join("testdata", "mock_buildpacks", v), "./", 0766)
+		err := os.Rename(tgz, filepath.Join(tmpDir, v+".tgz"))
+		h.AssertNil(t, err)
+	}
+
 	builderConfigFile, err := os.OpenFile(filepath.Join(tmpDir, "builder.toml"), os.O_RDWR|os.O_APPEND, 0666)
 	h.AssertNil(t, err)
 
@@ -747,7 +806,7 @@ func createBuilder(t *testing.T, runImageMirror string) string {
 			t.Fatal("LIFECYCLE_PATH must be an absolute path")
 		}
 		t.Logf("Adding lifecycle path '%s' to builder config", lifecyclePath)
-		_, err = builderConfigFile.Write([]byte(fmt.Sprintf("uri = \"%s\"\n", lifecyclePath)))
+		_, err = builderConfigFile.Write([]byte(fmt.Sprintf("uri = \"%s\"\n", strings.ReplaceAll(lifecyclePath, `\`, `\\`))))
 		h.AssertNil(t, err)
 	}
 	if lcver, ok := os.LookupEnv("LIFECYCLE_VERSION"); ok {
@@ -780,7 +839,7 @@ func createStack(t *testing.T, dockerCli *client.Client) {
 
 func createStackImage(t *testing.T, dockerCli *client.Client, repoName string, dir string) {
 	ctx := context.Background()
-	buildContext, _ := archive.CreateTarReader(dir, "/", 0, 0, false)
+	buildContext, _ := archive.CreateTarReader(dir, "/", 0, 0, -1)
 
 	res, err := dockerCli.ImageBuild(ctx, buildContext, dockertypes.ImageBuildOptions{
 		Tags:        []string{repoName},
@@ -901,20 +960,11 @@ func ctrlCProc(cmd *exec.Cmd) error {
 	return err
 }
 
-func skipOnWindows(t *testing.T, message string) {
-	if runtime.GOOS == "windows" {
-		t.Skip(message)
-	}
-}
-
 func isCommandRunning(cmd *exec.Cmd) bool {
 	_, err := os.FindProcess(cmd.Process.Pid)
 	if err != nil {
 		return false
 	}
-	if runtime.GOOS == "windows" {
-		return true
-	}
 	return true
 }
 

diff --git a/acceptance/testdata/mock_buildpacks/builder.toml b/acceptance/testdata/mock_buildpacks/builder.toml
@@ -1,17 +1,17 @@
 [[buildpacks]]
   id = "simple/layers"
   version = "simple-layers-version"
-  uri = "simple-layers-buildpack"
+  uri = "simple-layers-buildpack.tgz"
 
 [[buildpacks]]
   id = "read/env"
   version = "read-env-version"
-  uri = "read-env-buildpack"
+  uri = "read-env-buildpack.tgz"
 
 [[buildpacks]]
   id = "noop.buildpack"
   version = "noop.buildpack.version"
-  uri = "noop-buildpack"
+  uri = "noop-buildpack.tgz"
   latest = true
 
 [[groups]]
@@ -28,4 +28,4 @@
   build-image = "pack-test/build"
   run-image = "pack-test/run"
 
-# run-image-mirror and lifecycle are appended by accpetance tests
+# run-image-mirror and lifecycle are appended by acceptance tests
diff --git a/...ock_buildpacks/other-stack/buildpack.toml → ...acks/other-stack-buildpack/buildpack.toml b/...ock_buildpacks/other-stack/buildpack.toml → ...acks/other-stack-buildpack/buildpack.toml
diff --git a/app/run_test.go b/app/run_test.go
@@ -6,9 +6,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"math/rand"
-	"net"
 	"net/http"
-	"strconv"
 	"strings"
 	"testing"
 	"time"
@@ -75,7 +73,7 @@ func testApp(t *testing.T, when spec.G, it spec.S) {
 			var containerPort string
 
 			it.Before(func() {
-				containerPort, err = freePort()
+				containerPort, err = h.GetFreePort()
 				h.AssertNil(t, err)
 				h.CreateImageOnLocal(
 					t,
@@ -119,7 +117,7 @@ func testApp(t *testing.T, when spec.G, it spec.S) {
 			)
 
 			it.Before(func() {
-				containerPort, err = freePort()
+				containerPort, err = h.GetFreePort()
 				h.AssertNil(t, err)
 				h.CreateImageOnLocal(
 					t,
@@ -152,7 +150,7 @@ func testApp(t *testing.T, when spec.G, it spec.S) {
 			})
 
 			it("binds each port to the container", func() {
-				hostPort, err := freePort()
+				hostPort, err := h.GetFreePort()
 				h.AssertNil(t, err)
 
 				assertOnRunningContainer(
@@ -215,18 +213,3 @@ loop:
 		t.Fatalf("expected canceled context, failed with a different error: %s", err)
 	}
 }
-
-func freePort() (string, error) {
-	addr, err := net.ResolveTCPAddr("tcp", "localhost:0")
-	if err != nil {
-		return "", err
-	}
-
-	l, err := net.ListenTCP("tcp", addr)
-	if err != nil {
-		return "", err
-	}
-	defer l.Close()
-
-	return strconv.Itoa(l.Addr().(*net.TCPAddr).Port), nil
-}