Merge pull request #88 from tenjaa/master

Add multiple buildpacks to push command

Author: patrickcrocker

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 
 - Introduced new tests (see `spec` folder) using the [shellspec](https://shellspec.info/) BDD testing framework. The existing home-grown test framework in the `itest` folder has served this project well, but it's time to move
+- `push` command now supports to specify multiple `buildpacks`
 
 ### Changed
 

README.md

@@ -795,6 +795,7 @@ _NOTE_: A manifest can be used to specify values for required parameters. Any pa
 - `space`: _Optional._ The space to target (required if not set in the source config)
 - `app_name`: _Required._ The name of the application (_Optional_ if using a `manifest` that specifies the application name)
 - `buildpack`: _Optional._ Custom buildpack by name (e.g. my-buildpack) or Git URL (e.g. 'https://github.com/cloudfoundry/java-buildpack.git') or Git URL with a branch or tag (e.g. 'https://github.com/cloudfoundry/java-buildpack.git#v3.3.0' for 'v3.3.0' tag). To use built-in buildpacks only, specify 'default' or 'null'
+- `buildpacks`: _Optional._ Multiple buildpacks as an array
 - `disk_quota`: _Optional._ Disk limit (e.g. 256M, 1024M, 1G)
 - `docker_image`: _Optional._ Docker-image to be used (e.g. user/docker-image-name)
 - `docker_username`: _Optional._ This is used as the username to authenticate against a protected docker registry

itest/run-app-push-tests

@@ -304,6 +304,38 @@ it_can_push_an_app_with_stack() {
   assert::equals "$stack" "$(cf::get_app_stack "$app_name")"
 }
 
+it_can_push_an_app_with_multiple_buildpacks() {
+  local org=${1:?org null or not set}
+  local space=${2:?space null or not set}
+  local app_name=${3:?app_name null or not set}
+
+  local project=$(create_static_app "$app_name")
+
+  local params=$(jq -n \
+  --arg org "$org" \
+  --arg space "$space" \
+  --arg app_name "$app_name" \
+  --arg stack "$stack" \
+  --arg path "$project/content" \
+  --arg manifest "$project/manifest.yml" \
+  '{
+    command: "push",
+    org: $org,
+    space: $space,
+    app_name: $app_name,
+    path: $path,
+    manifest: $manifest,
+    buildpacks:
+    - binary_buildpack
+    - staticfile_buildpack
+  }')
+
+  put_with_params "$CCR_SOURCE" "$params" | jq -e '.version | keys == ["timestamp"]'
+
+  assert::success cf::is_app_started "$app_name"
+  assert::equals "binary_buildpack,staticfile_buildpack" "$(cf::get_app_buildpacks "$app_name")"
+}
+
 org=$(generate_test_name_with_spaces "Org")
 space=$(generate_test_name_with_spaces "Space")
 
@@ -383,4 +415,13 @@ describe "push an app with stack"
   run it_can_delete_an_app \"$org\" \"$space\" \"$app_name\"
 }
 
+describe "push an app with multiple buildpacks"
+{
+  app_name=$(generate_test_name_with_spaces "App")
+  stack=cflinuxfs3
+
+  run it_can_push_an_app_with_stack \"$org\" \"$space\" \"$app_name\"
+  run it_can_delete_an_app \"$org\" \"$space\" \"$app_name\"
+}
+
 teardown_integration_tests "$org" "$space"

resource/commands/push.sh

@@ -1,6 +1,7 @@
 
 app_name=$(get_option '.app_name')
 buildpack=$(get_option '.buildpack')
+buildpacks=$(get_option '.buildpacks')
 startup_command=$(get_option '.startup_command')
 docker_image=$(get_option '.docker_image')
 docker_username=$(get_option '.docker_username')
@@ -56,6 +57,10 @@ for key in $(echo $vars | jq -r 'keys[]'); do
   args+=(--var "$key=$value")
 done
 
+for buildpack in $(echo $buildpacks | jq -r '.[]'); do
+  args+=(-b "$buildpack")
+done
+
 for vars_file in $(echo $vars_files | jq -r '.[]'); do
   args+=(--vars-file "$vars_file")
 done

resource/lib/cf-functions.sh

@@ -824,6 +824,18 @@ function cf::get_app_stack() {
   echo $output | jq -r '.entity.name'
 }
 
+function cf::get_app_buildpacks() {
+  local app_name=${1:?app_name null or not set}
+
+  local output
+  if ! output=$(cf::curl "/v2/apps/$(cf::get_app_guid "$app_name")/droplets/current"); then
+    logger::error "$output"
+    exit 1
+  fi
+
+  echo $output | jq -r '.buildpacks | map(.name) | join(",")'
+}
+
 function cf::scale() {
   local app_name=${1:?app_name null or not set}
   local instances=${2:-}