Merge pull request #3159 from bacongobbler/3042-lock-buildpack-url-to-revision

lock buildpack url to revision

Author: Matthew Fisher

builder/image/slugbuilder/builder/build.sh

@@ -77,9 +77,32 @@ selected_buildpack=
 if [[ -n "$BUILDPACK_URL" ]]; then
     echo_title "Fetching custom buildpack"
 
+    # FIXME: strip single quotes coming from the builder
+    BUILDPACK_URL=$(echo $BUILDPACK_URL | tr -d "'")
+
     buildpack="$buildpack_root/custom"
     rm -fr "$buildpack"
-    git clone --quiet --depth=1 "$BUILDPACK_URL" "$buildpack"
+
+    url=${BUILDPACK_URL%#*}
+    committish=${BUILDPACK_URL#*#}
+
+    if [ "$committish" == "$url" ]; then
+        committish="master"
+    fi
+
+    set +e
+    git clone --branch "$committish" --depth=1 "$url" "$buildpack" &> /dev/null
+    SHALLOW_CLONED=$?
+    set -e
+    if [ $SHALLOW_CLONED -ne 0 ]; then
+        # if the shallow clone failed partway through, clean up and try a full clone
+        rm -rf "$buildpack"
+        git clone --quiet "$url" "$buildpack"
+        pushd "$buildpack" &>/dev/null
+            git checkout --quiet "$committish"
+        popd &>/dev/null
+    fi
+
     selected_buildpack="$buildpack"
     buildpack_name=$($buildpack/bin/detect "$build_root") && selected_buildpack=$buildpack
 else

docs/using_deis/using-buildpacks.rst

@@ -135,6 +135,14 @@ To use a custom buildpack, set the ``BUILDPACK_URL`` environment variable.
     === humble-autoharp
     BUILDPACK_URL: https://github.com/dpiddy/heroku-buildpack-ruby-minimal
 
+.. note::
+
+    If, however, you're unable to deploy using the latest version of the buildpack,
+    You can set
+    an exact version of a buildpack by using a git revision in your
+    ``BUILDPACK_URL``.
+    For example: ``BUILDPACK_URL=https://github.com/dpiddy/heroku-buildpack-ruby-minimal#v13``
+
 On your next ``git push``, the custom buildpack will be used.
 
 

tests/config_test.go

@@ -9,12 +9,13 @@ import (
 )
 
 var (
-	configListCmd  = "config:list --app={{.AppName}}"
-	configSetCmd   = "config:set FOO=讲台 --app={{.AppName}}"
-	configSet2Cmd  = "config:set FOO=10 --app={{.AppName}}"
-	configSet3Cmd  = "config:set POWERED_BY=\"the Deis team\" --app={{.AppName}}"
-	configSet4Cmd  = "config:set CAR='`star' --app={{.AppName}}"
-	configUnsetCmd = "config:unset FOO --app={{.AppName}}"
+	configListCmd         = "config:list --app={{.AppName}}"
+	configSetCmd          = "config:set FOO=讲台 --app={{.AppName}}"
+	configSet2Cmd         = "config:set FOO=10 --app={{.AppName}}"
+	configSet3Cmd         = "config:set POWERED_BY=\"the Deis team\" --app={{.AppName}}"
+	configSet4Cmd         = "config:set CAR='`star' --app={{.AppName}}"
+	configSetBuildpackCmd = "config:set BUILDPACK_URL=https://github.com/heroku/heroku-buildpack-go#98f37cc --app={{.AppName}}"
+	configUnsetCmd        = "config:unset FOO --app={{.AppName}}"
 )
 
 func TestConfig(t *testing.T) {
@@ -48,6 +49,8 @@ func configSetup(t *testing.T) *utils.DeisTestConfig {
 	// ensure envvars with backticks work too
 	// https://github.com/deis/deis/issues/2980
 	utils.Execute(t, configSet4Cmd, cfg, false, "`star")
+	// ensure custom buildpack URLS are in order
+	utils.Execute(t, configSetBuildpackCmd, cfg, false, "https://github.com/heroku/heroku-buildpack-go#98f37cc")
 	utils.Execute(t, gitPushCmd, cfg, false, "")
 	utils.CurlWithFail(t, cfg, false, "the Deis team")
 	if err := utils.Chdir(".."); err != nil {
@@ -63,13 +66,13 @@ func configListTest(
 
 func configSetTest(t *testing.T, params *utils.DeisTestConfig) {
 	utils.Execute(t, configSetCmd, params, false, "讲台")
-	utils.CheckList(t, appsInfoCmd, params, "(v5)", false)
-	utils.Execute(t, configSet2Cmd, params, false, "10")
 	utils.CheckList(t, appsInfoCmd, params, "(v6)", false)
+	utils.Execute(t, configSet2Cmd, params, false, "10")
+	utils.CheckList(t, appsInfoCmd, params, "(v7)", false)
 }
 
 func configUnsetTest(t *testing.T, params *utils.DeisTestConfig) {
 	utils.Execute(t, configUnsetCmd, params, false, "")
-	utils.CheckList(t, appsInfoCmd, params, "(v7)", false)
+	utils.CheckList(t, appsInfoCmd, params, "(v8)", false)
 	utils.CheckList(t, "run env --app={{.AppName}}", params, "FOO", true)
 }

tests/utils/itutils.go

@@ -251,7 +251,7 @@ func Execute(t *testing.T, cmd string, params interface{}, failFlag bool, expect
 	cmdString := cmdBuf.String()
 	fmt.Println(cmdString)
 	var cmdl *exec.Cmd
-	if strings.Contains(cmd, "git") {
+	if strings.Contains(cmd, "git ") {
 		cmdl = exec.Command("sh", "-c", cmdString)
 	} else {
 		cmdl = exec.Command("sh", "-c", Deis+cmdString)