Update instance loop support for namespaced classes and plans

.gitignore

@@ -25,3 +25,4 @@ contrib/examples/consumer/Gopkg.lock
 contrib/examples/consumer
 contrib/examples/vendor/*
 integration.test*
+debug.test*

pkg/apis/servicecatalog/plan_reference.go

@@ -90,26 +90,6 @@ func (pr PlanReference) GetSpecifiedServiceClass() string {
 	return ""
 }
 
-// GetSpecifiedServicePlan returns the user-specified class value from either:
-// * ServicePlanExternalName
-// * ServicePlanExternalID
-// * ServicePlanName
-func (pr PlanReference) GetSpecifiedServicePlan() string {
-	if pr.ServicePlanExternalName != "" {
-		return pr.ServicePlanExternalName
-	}
-
-	if pr.ServicePlanExternalID != "" {
-		return pr.ServicePlanExternalID
-	}
-
-	if pr.ServicePlanName != "" {
-		return pr.ServicePlanName
-	}
-
-	return ""
-}
-
 // GetSpecifiedClusterServicePlan returns the user-specified plan value from one of:
 // * ClusterServicePlanExternalName
 // * ClusterServicePlanExternalID
@@ -131,6 +111,26 @@ func (pr PlanReference) GetSpecifiedClusterServicePlan() string {
 	return ""
 }
 
+// GetSpecifiedServicePlan returns the user-specified plan value from either:
+// * ServicePlanExternalName
+// * ServicePlanExternalID
+// * ServicePlanName
+func (pr PlanReference) GetSpecifiedServicePlan() string {
+	if pr.ServicePlanExternalName != "" {
+		return pr.ServicePlanExternalName
+	}
+
+	if pr.ServicePlanExternalID != "" {
+		return pr.ServicePlanExternalID
+	}
+
+	if pr.ServicePlanName != "" {
+		return pr.ServicePlanName
+	}
+
+	return ""
+}
+
 // GetClusterServiceClassFilterFieldName returns the appropriate field name for filtering
 // a list of service catalog classes by the PlanReference.
 func (pr PlanReference) GetClusterServiceClassFilterFieldName() string {

pkg/apis/servicecatalog/v1beta1/plan_reference.go

@@ -111,7 +111,7 @@ func (pr PlanReference) GetSpecifiedClusterServicePlan() string {
 	return ""
 }
 
-// GetSpecifiedServicePlan returns the user-specified class value from either:
+// GetSpecifiedServicePlan returns the user-specified plan value from either:
 // * ServicePlanExternalName
 // * ServicePlanExternalID
 // * ServicePlanName
@@ -159,6 +159,34 @@ func (pr PlanReference) GetClusterServicePlanFilterFieldName() string {
 	return ""
 }
 
+// GetServiceClassFilterFieldName returns the appropriate field name for filtering
+// a list of service catalog classes by the PlanReference.
+func (pr PlanReference) GetServiceClassFilterFieldName() string {
+	if pr.ServiceClassExternalName != "" {
+		return "spec.externalName"
+	}
+
+	if pr.ServiceClassExternalID != "" {
+		return "spec.externalID"
+	}
+
+	return ""
+}
+
+// GetServicePlanFilterFieldName returns the appropriate field name for filtering
+// a list of service catalog plans by the PlanReference.
+func (pr PlanReference) GetServicePlanFilterFieldName() string {
+	if pr.ServicePlanExternalName != "" {
+		return "spec.externalName"
+	}
+
+	if pr.ServicePlanExternalID != "" {
+		return "spec.externalID"
+	}
+
+	return ""
+}
+
 // String representation of a PlanReference
 // Example: class_name/plan_name, class_id/plan_id
 func (pr PlanReference) String() string {

pkg/controller/controller.go

@@ -415,6 +415,29 @@ func (c *controller) getClusterServiceClassPlanAndClusterServiceBroker(instance
 	return serviceClass, servicePlan, brokerName, brokerClient, nil
 }
 
+func (c *controller) getServiceClassPlanAndServiceBroker(instance *v1beta1.ServiceInstance) (*v1beta1.ServiceClass, *v1beta1.ServicePlan, string, osb.Client, error) {
+	serviceClass, brokerName, brokerClient, err := c.getServiceClassAndServiceBroker(instance)
+	if err != nil {
+		return nil, nil, "", nil, err
+	}
+
+	var servicePlan *v1beta1.ServicePlan
+	if instance.Spec.ServicePlanRef != nil {
+		var err error
+		servicePlan, err = c.servicePlanLister.ServicePlans(instance.Namespace).Get(instance.Spec.ServicePlanRef.Name)
+		if nil != err {
+			return nil, nil, "", nil, &operationError{
+				reason: errorNonexistentServicePlanReason,
+				message: fmt.Sprintf(
+					"The instance references a non-existent ServicePlan %q - %v",
+					instance.Spec.ServicePlanRef.Name, instance.Spec.PlanReference,
+				),
+			}
+		}
+	}
+	return serviceClass, servicePlan, brokerName, brokerClient, nil
+}
+
 // getClusterServiceClassAndClusterServiceBroker is a sequence of operations that's done in couple of
 // places so this method fetches the Service Class and creates
 // a brokerClient to use for that method given an ServiceInstance.
@@ -464,6 +487,55 @@ func (c *controller) getClusterServiceClassAndClusterServiceBroker(instance *v1b
 	return serviceClass, broker.Name, brokerClient, nil
 }
 
+// getServiceClassAndServiceBroker is a sequence of operations that's done in couple of
+// places so this method fetches the Service Class and creates
+// a brokerClient to use for that method given a ServiceInstance.
+func (c *controller) getServiceClassAndServiceBroker(instance *v1beta1.ServiceInstance) (*v1beta1.ServiceClass, string, osb.Client, error) {
+	pcb := pretty.NewContextBuilder(pretty.ServiceInstance, instance.Namespace, instance.Name, "")
+	serviceClass, err := c.serviceClassLister.ServiceClasses(instance.Namespace).Get(instance.Spec.ServiceClassRef.Name)
+	if err != nil {
+		return nil, "", nil, &operationError{
+			reason: errorNonexistentServiceClassReason,
+			message: fmt.Sprintf(
+				"The instance references a non-existent ServiceClass (K8S: %q ExternalName: %q)",
+				instance.Spec.ServiceClassRef.Name, instance.Spec.ServiceClassExternalName,
+			),
+		}
+	}
+
+	broker, err := c.serviceBrokerLister.ServiceBrokers(instance.Namespace).Get(serviceClass.Spec.ServiceBrokerName)
+	if err != nil {
+		return nil, "", nil, &operationError{
+			reason: errorNonexistentServiceBrokerReason,
+			message: fmt.Sprintf(
+				"The instance references a non-existent broker %q",
+				serviceClass.Spec.ServiceBrokerName,
+			),
+		}
+
+	}
+
+	authConfig, err := getAuthCredentialsFromServiceBroker(c.kubeClient, broker)
+	if err != nil {
+		return nil, "", nil, &operationError{
+			reason: errorAuthCredentialsReason,
+			message: fmt.Sprintf(
+				"Error getting broker auth credentials for broker %q: %s",
+				broker.Name, err,
+			),
+		}
+	}
+
+	clientConfig := NewClientConfigurationForBroker(broker.ObjectMeta, &broker.Spec.CommonServiceBrokerSpec, authConfig)
+	glog.V(4).Info(pcb.Messagef("Creating client for ServiceBroker %v, URL: %v", broker.Name, broker.Spec.URL))
+	brokerClient, err := c.brokerClientCreateFunc(clientConfig)
+	if err != nil {
+		return nil, "", nil, err
+	}
+
+	return serviceClass, broker.Name, brokerClient, nil
+}
+
 // getClusterServiceClassPlanAndClusterServiceBrokerForServiceBinding is a sequence of operations that's
 // done to validate service plan, service class exist, and handles creating
 // a brokerclient to use for a given ServiceInstance.
@@ -637,8 +709,6 @@ func getAuthCredentialsFromClusterServiceBroker(client kubernetes.Interface, bro
 // returns an error. If the AuthInfo field is nil, empty values are
 // returned.
 func getAuthCredentialsFromServiceBroker(client kubernetes.Interface, broker *v1beta1.ServiceBroker) (*osb.AuthConfig, error) {
-	// ERIK TODO: This method is mostly error handling boilerplate, is it worth consolidating with common elements?
-	// Main difference are just using the broker's namespace instead of the same namespace as the broker.
 	if broker.Spec.AuthInfo == nil {
 		return nil, nil
 	}