Updating github-config

Author: paketo-bot

scripts/.util/tools.sh

@@ -17,14 +17,21 @@ function util::tools::path::export() {
 }
 
 function util::tools::jam::install() {
-  local dir
+  local dir token
+  token=""
+
   while [[ "${#}" != 0 ]]; do
     case "${1}" in
       --directory)
         dir="${2}"
         shift 2
         ;;
 
+      --token)
+        token="${2}"
+        shift 2
+        ;;
+
       *)
         util::print::error "unknown argument \"${1}\""
     esac
@@ -49,30 +56,49 @@ function util::tools::jam::install() {
   util::tools::path::export "${dir}"
 
   if [[ ! -f "${dir}/jam" ]]; then
-    local version
+    local version curl_args
+
     version="$(jq -r .jam "$(dirname "${BASH_SOURCE[0]}")/tools.json")"
 
+    curl_args=(
+      "--fail"
+      "--silent"
+      "--location"
+      "--output" "${dir}/jam"
+    )
+
+    if [[ "${token}" != "" ]]; then
+      curl_args+=("--header" "Authorization: Token ${token}")
+    fi
+
+
     util::print::title "Installing jam ${version}"
+
     curl "https://github.com/paketo-buildpacks/jam/releases/download/${version}/jam-${os}" \
-      --fail \
-      --silent \
-      --location \
-      --output "${dir}/jam"
+      "${curl_args[@]}"
+
     chmod +x "${dir}/jam"
   else
     util::print::info "Using $("${dir}"/jam version)"
   fi
 }
 
 function util::tools::pack::install() {
-  local dir
+  local dir token
+  token=""
+
   while [[ "${#}" != 0 ]]; do
     case "${1}" in
       --directory)
         dir="${2}"
         shift 2
         ;;
 
+      --token)
+        token="${2}"
+        shift 2
+        ;;
+
       *)
         util::print::error "unknown argument \"${1}\""
     esac
@@ -97,18 +123,31 @@ function util::tools::pack::install() {
   esac
 
   if [[ ! -f "${dir}/pack" ]]; then
-    local version
+    local version curl_args
+
     version="$(jq -r .pack "$(dirname "${BASH_SOURCE[0]}")/tools.json")"
 
+    tmp_location="/tmp/pack.tgz"
+    curl_args=(
+      "--fail"
+      "--silent"
+      "--location"
+      "--output" "${tmp_location}"
+    )
+
+    if [[ "${token}" != "" ]]; then
+      curl_args+=("--header" "Authorization: Token ${token}")
+    fi
+
     util::print::title "Installing pack ${version}"
+
     curl "https://github.com/buildpacks/pack/releases/download/${version}/pack-${version}-${os}.tgz" \
-      --fail \
-      --silent \
-      --location \
-      --output /tmp/pack.tgz
-    tar xzf /tmp/pack.tgz -C "${dir}"
+      "${curl_args[@]}"
+
+    tar xzf "${tmp_location}" -C "${dir}"
     chmod +x "${dir}/pack"
-    rm /tmp/pack.tgz
+
+    rm "${tmp_location}"
   else
     util::print::info "Using pack $("${dir}"/pack version)"
   fi

scripts/integration.sh

@@ -53,7 +53,7 @@ function main() {
       util::print::warn "** WARNING  No Integration tests **"
   fi
 
-  tools::install
+  tools::install "${GIT_TOKEN:-}"
 
   if [ ${#builderArray[@]} -eq 0 ]; then
     util::print::title "No builders provided. Finding builders in integration.json..."
@@ -97,11 +97,16 @@ USAGE
 }
 
 function tools::install() {
+  local token
+  token="${1}"
+
   util::tools::pack::install \
-    --directory "${BUILDPACKDIR}/.bin"
+    --directory "${BUILDPACKDIR}/.bin" \
+    --token "${token}"
 
   util::tools::jam::install \
-    --directory "${BUILDPACKDIR}/.bin"
+    --directory "${BUILDPACKDIR}/.bin" \
+    --token "${token}"
 
   util::tools::create-package::install \
     --directory "${BUILDPACKDIR}/.bin"

scripts/package.sh

@@ -14,7 +14,8 @@ source "${ROOT_DIR}/scripts/.util/tools.sh"
 source "${ROOT_DIR}/scripts/.util/print.sh"
 
 function main {
-  local version output
+  local version output token
+  token=""
 
   while [[ "${#}" != 0 ]]; do
     case "${1}" in
@@ -28,6 +29,11 @@ function main {
         shift 2
         ;;
 
+      --token|-t)
+        token="${2}"
+        shift 2
+        ;;
+
       --help|-h)
         shift 1
         usage
@@ -55,6 +61,9 @@ function main {
   fi
 
   repo::prepare
+
+  tools::install "${token}"
+
   buildpack::archive "${version}"
   buildpackage::create "${output}"
 }
@@ -69,6 +78,7 @@ OPTIONS
   --help               -h            prints the command usage
   --version <version>  -v <version>  specifies the version number to use when packaging the buildpack
   --output <output>    -o <output>   location to output the packaged buildpackage artifact (default: ${ROOT_DIR}/build/buildpackage.cnb)
+  --token <token>                    Token used to download assets from GitHub (e.g. jam, pack, etc) (optional)
 USAGE
 }
 
@@ -83,23 +93,37 @@ function repo::prepare() {
   export PATH="${BIN_DIR}:${PATH}"
 }
 
+function tools::install() {
+  local token
+  token="${1}"
+
+  util::tools::pack::install \
+    --directory "${BIN_DIR}" \
+    --token "${token}"
+
+  if [[ -f "${ROOT_DIR}/.libbuildpack" ]]; then
+    util::tools::packager::install \
+      --directory "${BIN_DIR}"
+  else
+    util::tools::jam::install \
+      --directory "${BIN_DIR}" \
+      --token "${token}"
+  fi
+}
+
 function buildpack::archive() {
   local version
   version="${1}"
 
   util::print::title "Packaging buildpack into ${BUILD_DIR}/buildpack.tgz..."
 
   if [[ -f "${ROOT_DIR}/.libbuildpack" ]]; then
-    util::tools::packager::install --directory "${BIN_DIR}"
-
     packager \
       --uncached \
       --archive \
       --version "${version}" \
       "${BUILD_DIR}/buildpack"
   else
-    util::tools::jam::install --directory "${BIN_DIR}"
-
     jam pack \
       --buildpack "${ROOT_DIR}/buildpack.toml" \
       --version "${version}" \
@@ -113,8 +137,6 @@ function buildpackage::create() {
 
   util::print::title "Packaging buildpack..."
 
-  util::tools::pack::install --directory "${BIN_DIR}"
-
   pack \
     buildpack package "${output}" \
       --path "${BUILD_DIR}/buildpack.tgz" \