added tests for unbind-route-service

Author: patrickcrocker

CHANGELOG.md

@@ -10,10 +10,11 @@ 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 on to something better. Over the upcoming releases, we'll slowly start converting more of the `itest` tests to the newer `spec` tests.
-- `push` command now supports specifying multiple `buildpacks`, thanks to a PR by [tenjaa](https://github.com/tenjaa). The original `buildpack` option is now deprecated and superceded by `buildpacks`.
+- `unbind-route-service` - Unbind a service instance from an HTTP route, thanks to a PR by [JHjava](https://github.com/JHjava)
 
 ### Changed
 
+- `push` command now supports specifying multiple `buildpacks`, thanks to a PR by [tenjaa](https://github.com/tenjaa). The original `buildpack` option is now deprecated and superceded by `buildpacks`.
 - Resource and test executions are now isolated from each other thanks to setting their own unique `CF_HOME` locations.
 
 ### Packaged Dependencies

README.md

@@ -755,6 +755,28 @@ Bind a service instance to an HTTP route
     path: foo
 ```
 
+#### unbind-route-service
+
+Unbind a service instance from an HTTP route
+
+- `org`: _Optional._ The organization to target (required if not set in the source config)
+- `space`: _Optional._ The space to target (required if not set in the source config)
+- `domain`: _Required._ The domain to unbind the route from
+- `service_instance`: _Required._ The service instance to unbind the route from
+- `hostname`: _Optional._ Hostname used in combination with DOMAIN to specify the route to unbind
+- `path`: _Optional._ Path used in combination with HOSTNAME and DOMAIN to specify the route to unbind
+
+```yml
+- put: cf-unbind-route-service
+  resource: cf-env
+  params:
+    command: unbind-route-service
+    domain: example.com
+    service_instance: mylogger
+    hostname: myhost
+    path: foo
+```
+
 #### enable-feature-flag
 
 Allow use of a feature

itest/run-route-service-tests

@@ -106,6 +106,40 @@ it_can_bind_logger_route_service_to_logged_app() {
   fi
 }
 
+it_can_unbind_logger_route_service_from_logged_app() {
+  local org=${1:?org null or not set}
+  local space=${2:?space null or not set}
+  local domain=${3:?domain null or not set}
+  local service_instance=${4:?service_instance null or not set}
+  local app_name=${5:?app_name null or not set}
+  local path=${6:-}
+
+  local params=$(jq -n \
+  --arg org "$org" \
+  --arg space "$space" \
+  --arg domain "$domain" \
+  --arg service_instance "$service_instance" \
+  --arg hostname "$(app_to_hostname "$app_name")" \
+  '{
+    command: "unbind-route-service",
+    org: $org,
+    space: $space,
+    domain: $domain,
+    service_instance: $service_instance,
+    hostname: $hostname
+  }')
+
+  [ -n "$path" ] && params=$(echo $params | jq --arg value "$path" '.path = $value')
+
+  put_with_params "$CCR_SOURCE" "$params" | jq -e '.version | keys == ["timestamp"]'
+
+  if [ -n "$path" ]; then
+    assert::failure cf::is_app_bound_to_route_service "$app_name" "$service_instance" "$org" "$space" "/$path"
+  else
+    assert::failure cf::is_app_bound_to_route_service "$app_name" "$service_instance" "$org" "$space"
+  fi
+}
+
 org=$(generate_test_name_with_spaces "Org")
 space=$(generate_test_name_with_spaces "Space")
 logger_app_name=$(generate_test_name_with_spaces "Logger")
@@ -130,4 +164,7 @@ run it_can_push_the_app_to_be_logged \"$org\" \"$space\" \"$logged_app_name\" \"
 run it_can_bind_logger_route_service_to_logged_app \"$org\" \"$space\" \"$domain\" \"$service_instance\" \"$logged_app_name\"
 run it_can_bind_logger_route_service_to_logged_app \"$org\" \"$space\" \"$domain\" \"$service_instance\" \"$logged_app_name\" \"$logged_app_path\"
 
+run it_can_unbind_logger_route_service_from_logged_app \"$org\" \"$space\" \"$domain\" \"$service_instance\" \"$logged_app_name\" \"$logged_app_path\"
+run it_can_unbind_logger_route_service_from_logged_app \"$org\" \"$space\" \"$domain\" \"$service_instance\" \"$logged_app_name\"
+
 teardown_integration_tests "$org" "$space"

resource/commands/unbind-route-service.sh

@@ -12,4 +12,4 @@ args=("$domain" "$service_instance")
 [ -n "$hostname" ] && args+=(--hostname "$hostname")
 [ -n "$path" ] && args+=(--path "$path")
 
-cf::cf unbind-route-service "${args[@]}"
+cf::cf unbind-route-service -f "${args[@]}"