Fixed #20 - replaced cf_user_provided_service_exists with cf_service_exists

Author: patrickcrocker

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 2.4.3 - 2018-02-23
+### Fixed
+- `create-user-provided-service` when checking if a ups already exists, the command now only checks the current space instead of every space the user has access to.
+
 ## 2.4.2 - 2018-02-16
 ### Fixed
 - `delete-service` command's `wait_for_service` now only checks the current space instead of every space the user has access to.

assets/cf-functions.sh

@@ -166,11 +166,6 @@ function cf_service_exists() {
   [ -n "$service_instance_guid" ]
 }
 
-function cf_user_provided_service_exists() {
-  local service_instance="${1:?service_instance not set or empty}"
-  CF_TRACE=false cf curl /v2/user_provided_service_instances | jq -e --arg name "$service_instance" '.resources[] | select(.entity.name == $name) | true' >/dev/null
-}
-
 function cf_create_user_provided_service_credentials() {
   local service_instance="${1:?service_instance not set or empty}"
   local credentials="${2:?credentials json not set or empty}"

assets/out

@@ -127,7 +127,7 @@ echo "$params" | jq -c '.commands[]' | while read -r options; do
     printf '\e[92m[INFO]\e[0m Executing \e[33m%s\e[0m: %s\n' "$command" "$service_instance"
     cf_target "$org" "$space"
 
-    if cf_user_provided_service_exists "$service_instance"; then
+    if cf_service_exists "$service_instance"; then
       printf '\e[92m[INFO]\e[0m \e[95mService %s already exists\e[0m\n' "$service_instance"
     else
       if [ -n "$credentials" ]; then

itest/put.sh

@@ -235,7 +235,7 @@ it_can_create_a_user_provided_service_with_credentials_string() {
     .version | keys == ["timestamp"]
   '
 
-  cf_user_provided_service_exists "$cups_credentials_string_si"
+  cf_service_exists "$cups_credentials_string_si"
 }
 
 it_can_create_a_user_provided_service_with_credentials_file() {
@@ -270,7 +270,7 @@ it_can_create_a_user_provided_service_with_credentials_file() {
     .version | keys == ["timestamp"]
   '
 
-  cf_user_provided_service_exists "$cups_credentials_file_si"
+  cf_service_exists "$cups_credentials_file_si"
 }
 
 it_can_create_a_user_provided_service_with_syslog() {
@@ -295,7 +295,7 @@ it_can_create_a_user_provided_service_with_syslog() {
     .version | keys == ["timestamp"]
   '
 
-  cf_user_provided_service_exists "$cups_syslog_si"
+  cf_service_exists "$cups_syslog_si"
 }
 
 it_can_create_a_user_provided_service_with_route() {
@@ -320,7 +320,7 @@ it_can_create_a_user_provided_service_with_route() {
     .version | keys == ["timestamp"]
   '
 
-  cf_user_provided_service_exists "$cups_route_si"
+  cf_service_exists "$cups_route_si"
 }
 
 it_can_create_a_synchronous_service() {