v3(services): Backfilled request tests for sharing service instance (cloudfoundry#1792)

- Creating request tests for SI sharing
- Fix unshare SI request tests
- reorder sharing service instances tests

Author: FelisiaM

app/actions/service_instance_share.rb

@@ -47,31 +47,31 @@ def validate_plan_is_active!(service_instance)
 
     def validate_plan_visibility!(service_instance, space)
       unless service_instance.service_plan.visible_in_space?(space)
-        error_msg = "Access to service #{service_instance.service.label} and plan #{service_instance.service_plan.name} is not enabled in #{space.organization.name}/#{space.name}"
+        error_msg = "Access to service #{service_instance.service.label} and plan #{service_instance.service_plan.name} is not enabled in #{space.organization.name}/#{space.name}."
         error!(error_msg)
       end
     end
 
     def validate_name_uniqueness!(service_instance, space)
       if space.service_instances.map(&:name).include?(service_instance.name)
-        error_msg = "A service instance called #{service_instance.name} already exists in #{space.name}"
+        error_msg = "A service instance called #{service_instance.name} already exists in #{space.name}."
         error!(error_msg)
       end
     end
 
     def validate_not_sharing_to_self!(service_instance, spaces)
       if spaces.include?(service_instance.space)
-        error!('Service instances cannot be shared into the space where they were created')
+        error!('Service instances cannot be shared into the space where they were created.')
       end
     end
 
     def validate_supported_service_type!(service_instance)
       if service_instance.route_service?
-        error!('Route services cannot be shared')
+        error!('Route services cannot be shared.')
       end
 
       unless service_instance.managed_instance?
-        error!('User-provided services cannot be shared')
+        error!('User-provided services cannot be shared.')
       end
     end
 

app/controllers/v3/service_instances_controller.rb

@@ -126,19 +126,18 @@ def destroy
   def share_service_instance
     FeatureFlag.raise_unless_enabled!(:service_instance_sharing)
 
-    service_instance = ServiceInstance.first(guid: hashed_params[:service_instance_guid])
-
+    service_instance = ServiceInstance.first(guid: hashed_params[:guid])
     resource_not_found!(:service_instance) unless service_instance && can_read_service_instance?(service_instance)
     unauthorized! unless can_write_space?(service_instance.space)
 
     message = VCAP::CloudController::ToManyRelationshipMessage.new(hashed_params[:body])
     unprocessable!(message.errors.full_messages) unless message.valid?
 
-    spaces = Space.where(guid: message.guids)
-    check_spaces_exist_and_are_writeable!(service_instance, message.guids, spaces)
+    target_spaces = Space.where(guid: message.guids)
+    check_spaces_exist_and_are_writeable!(service_instance, message.guids, target_spaces)
 
     share = ServiceInstanceShare.new
-    share.create(service_instance, spaces, user_audit_info)
+    share.create(service_instance, target_spaces, user_audit_info)
 
     render status: :ok, json: Presenters::V3::ToManyRelationshipPresenter.new(
       "service_instances/#{service_instance.guid}", service_instance.shared_spaces, 'shared_spaces', build_related: false)
@@ -147,7 +146,7 @@ def share_service_instance
   end
 
   def unshare_service_instance
-    service_instance = ServiceInstance.first(guid: hashed_params[:service_instance_guid])
+    service_instance = ServiceInstance.first(guid: hashed_params[:guid])
 
     resource_not_found!(:service_instance) unless service_instance && can_read_service_instance?(service_instance)
     unauthorized! unless can_write_space?(service_instance.space)
@@ -168,7 +167,7 @@ def unshare_service_instance
   end
 
   def relationships_shared_spaces
-    service_instance = ServiceInstance.first(guid: hashed_params[:service_instance_guid])
+    service_instance = ServiceInstance.first(guid: hashed_params[:guid])
     resource_not_found!(:service_instance) unless service_instance && can_read_space?(service_instance.space)
 
     message = SharedSpacesShowMessage.from_params(query_params)

config/routes.rb

@@ -222,15 +222,15 @@
   # service_instances
   get '/service_instances', to: 'service_instances_v3#index'
   get '/service_instances/:guid', to: 'service_instances_v3#show'
-  get '/service_instances/:service_instance_guid/relationships/shared_spaces', to: 'service_instances_v3#relationships_shared_spaces'
+  get '/service_instances/:guid/relationships/shared_spaces', to: 'service_instances_v3#relationships_shared_spaces'
   get '/service_instances/:guid/relationships/shared_spaces/usage_summary', to: 'service_instances_v3#shared_spaces_usage_summary'
   get '/service_instances/:guid/credentials', to: 'service_instances_v3#credentials'
   get '/service_instances/:guid/parameters', to: 'service_instances_v3#parameters'
   post '/service_instances', to: 'service_instances_v3#create'
-  post '/service_instances/:service_instance_guid/relationships/shared_spaces', to: 'service_instances_v3#share_service_instance'
+  post '/service_instances/:guid/relationships/shared_spaces', to: 'service_instances_v3#share_service_instance'
   patch '/service_instances/:guid', to: 'service_instances_v3#update'
   delete '/service_instances/:guid', to: 'service_instances_v3#destroy'
-  delete '/service_instances/:service_instance_guid/relationships/shared_spaces/:space_guid', to: 'service_instances_v3#unshare_service_instance'
+  delete '/service_instances/:guid/relationships/shared_spaces/:space_guid', to: 'service_instances_v3#unshare_service_instance'
 
   # space_features
   get '/spaces/:guid/features/:name', to: 'space_features#show'