Added the service broker guid to the ServiceBroker type (#149)

* Add support for service instance creation with parameters and/or tags

* Fetch all pages of data for ListServicePlansByQuery, not just the first

* Return all pages of results for ListServicesByQuery, not just the first page

* Use next_url when listing all service plans and services

* Add support for the Service Broker management APIs

* Added GetServiceByGuid and unit test for it

* Added Delete, Update, and GetByGuid calls for Service Plan Visibility entities

* *. Added Guid to the ServiceBroker struct
*. Added a convenience method to create a service_plan_visibility object based on the service plan unique id

service_brokers.go

@@ -39,6 +39,7 @@ type CreateServiceBrokerRequest struct {
 }
 
 type ServiceBroker struct {
+	Guid      string `json:"guid"`
 	Name      string `json:"name"`
 	BrokerURL string `json:"broker_url"`
 	Username  string `json:"auth_username"`
@@ -87,7 +88,7 @@ func (c *Client) UpdateServiceBroker(guid string, usb UpdateServiceBrokerRequest
 	if err != nil {
 		return ServiceBroker{}, err
 	}
-
+	serviceBrokerResource.Entity.Guid = serviceBrokerResource.Meta.Guid
 	return serviceBrokerResource.Entity, nil
 }
 
@@ -118,6 +119,7 @@ func (c *Client) CreateServiceBroker(csb CreateServiceBrokerRequest) (ServiceBro
 		return ServiceBroker{}, err
 	}
 
+	serviceBrokerResource.Entity.Guid = serviceBrokerResource.Meta.Guid
 	return serviceBrokerResource.Entity, nil
 }
 
@@ -130,6 +132,7 @@ func (c *Client) ListServiceBrokersByQuery(query url.Values) ([]ServiceBroker, e
 			return []ServiceBroker{}, err
 		}
 		for _, sb := range serviceBrokerResp.Resources {
+			sb.Entity.Guid = sb.Meta.Guid
 			sbs = append(sbs, sb.Entity)
 		}
 		requestUrl = serviceBrokerResp.NextUrl
@@ -160,6 +163,7 @@ func (c *Client) GetServiceBrokerByGuid(guid string) (ServiceBroker, error) {
 	if err != nil {
 		return ServiceBroker{}, err
 	}
+	serviceBrokerRes.Entity.Guid = serviceBrokerRes.Meta.Guid
 	return serviceBrokerRes.Entity, nil
 }
 

service_brokers_test.go

@@ -21,6 +21,7 @@ func TestListServiceBrokers(t *testing.T) {
 		So(err, ShouldBeNil)
 
 		So(len(servicePlans), ShouldEqual, 1)
+		So(servicePlans[0].Guid, ShouldEqual, "90a413fd-a636-4133-8bfb-a94b07839e96")
 		So(servicePlans[0].Name, ShouldEqual, "name-85")
 		So(servicePlans[0].BrokerURL, ShouldEqual, "https://foo.com/url-2")
 		So(servicePlans[0].Username, ShouldEqual, "auth_username-2")

service_plan_visibilities.go

@@ -77,6 +77,17 @@ func (c *Client) GetServicePlanVisibilityByGuid(guid string) (ServicePlanVisibil
 	return respBodyToServicePlanVisibility(resp.Body, c)
 }
 
+//a uniqueID is the id of the service in the catalog and not in cf internal db
+func (c *Client) CreateServicePlanVisibilityByUniqueId(uniqueId string, organizationGuid string) (ServicePlanVisibility, error) {
+	q := url.Values{}
+	q.Set("q", fmt.Sprintf("unique_id:%s", uniqueId))
+	plans, err := c.ListServicePlansByQuery(q)
+	if err != nil {
+		return ServicePlanVisibility{}, errors.Wrap(err, fmt.Sprintf("Couldn't find a service plan with unique_id: %s", uniqueId))
+	}
+	return c.CreateServicePlanVisibility(plans[0].Guid, organizationGuid)
+}
+
 func (c *Client) CreateServicePlanVisibility(servicePlanGuid string, organizationGuid string) (ServicePlanVisibility, error) {
 	req := c.NewRequest("POST", "/v2/service_plan_visibilities")
 	req.obj = map[string]interface{}{