add error message if plan is inactive

Author: kathap

app/controllers/v3/service_instances_controller.rb

@@ -255,6 +255,7 @@ def create_user_provided(message)
   def create_managed(message, space:)
     service_plan = ServicePlan.first(guid: message.service_plan_guid)
     unprocessable_service_plan! unless service_plan_valid?(service_plan)
+    unavailable_service_plan!(service_plan.name) unless service_plan_active?(service_plan)
     service_plan_not_visible_in_space! unless service_plan_exists_in_space?(service_plan, space)
 
     action = V3::ServiceInstanceCreateManaged.new(user_audit_info, message.audit_hash)
@@ -400,6 +401,10 @@ def service_plan_valid?(service_plan)
       visible_to_current_user?(plan: service_plan)
   end
 
+  def service_plan_active?(service_plan)
+    service_plan.active?
+  end
+
   def service_plan_exists_in_space?(service_plan, space)
     service_plan.visible_in_space?(space)
   end
@@ -409,6 +414,7 @@ def raise_if_invalid_service_plan!(service_instance, message)
 
     service_plan = ServicePlan.first(guid: message.service_plan_guid)
     unprocessable_service_plan! unless service_plan_valid?(service_plan)
+    unavailable_service_plan!(service_plan.name) unless service_plan_active?(service_plan)
     service_plan_not_visible_in_space! unless service_plan_exists_in_space?(service_plan, service_instance.space)
     invalid_service_plan_relation! unless service_plan.service == service_instance.service
   end
@@ -429,8 +435,12 @@ def unprocessable_service_plan!
     unprocessable!('Invalid service plan. Ensure that the service plan exists, is available, and you have access to it.')
   end
 
+  def unavailable_service_plan!(service_plan)
+    unprocessable!("Invalid service plan. The service plan #{service_plan} has been removed from the service broker's catalog. It is not possible to create new service instances using this plan.")
+  end
+
   def service_plan_not_visible_in_space!
-    unprocessable!('Invalid service plan. Ensure that the service plan is visible in your current space and still available in the broker\'s catalog.')
+    unprocessable!('Invalid service plan. Ensure that the service plan is visible in your current space.')
   end
 
   def invalid_service_plan_relation!

spec/request/service_instances_spec.rb

@@ -1260,7 +1260,7 @@ def check_filtered_instances(*instances)
             expect(last_response).to have_status_code(422)
             expect(parsed_response['errors']).to include(
               include({
-                        'detail' => 'Invalid service plan. Ensure that the service plan is visible in your current space and still available in the broker\'s catalog.',
+                        'detail' => 'Invalid service plan. Ensure that the service plan is visible in your current space.',
                         'title' => 'CF-UnprocessableEntity',
                         'code' => 10_008
                       })
@@ -1276,7 +1276,7 @@ def check_filtered_instances(*instances)
             expect(last_response).to have_status_code(422)
             expect(parsed_response['errors']).to include(
               include({
-                        'detail' => 'Invalid service plan. Ensure that the service plan is visible in your current space and still available in the broker\'s catalog.',
+                        'detail' => "Invalid service plan. The service plan #{service_plan.name} has been removed from the service broker\'s catalog. It is not possible to create new service instances using this plan.",
                         'title' => 'CF-UnprocessableEntity',
                         'code' => 10_008
                       })
@@ -2413,7 +2413,7 @@ def check_filtered_instances(*instances)
             expect(last_response).to have_status_code(422)
             expect(parsed_response['errors']).to include(
               include({
-                        'detail' => 'Invalid service plan. Ensure that the service plan is visible in your current space and still available in the broker\'s catalog.',
+                        'detail' => "Invalid service plan. The service plan #{service_plan.name} has been removed from the service broker\'s catalog. It is not possible to create new service instances using this plan.",
                         'title' => 'CF-UnprocessableEntity',
                         'code' => 10_008
                       })