Merge branch 'logging' of https://github.com/Peripli/service-broker-p…

…roxy-k8s into logging
Peripli · Sep 17, 2018 · 354851f · 354851f
2 parents d09aeb1 + 7e95b39
commit 354851f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/k8s/client.go b/k8s/client.go
@@ -1,6 +1,7 @@
 package k8s
 
 import (
+ "context"
  "github.com/Peripli/service-broker-proxy/pkg/platform"
  "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1beta1"
  "github.com/kubernetes-incubator/service-catalog/pkg/svcat/service-catalog"
@@ -60,7 +61,7 @@ func NewClient(config *ClientConfiguration) (*PlatformClient, error) {
 }
 
 // GetBrokers returns all service-brokers currently registered in kubernetes service-catalog.
-func (b PlatformClient) GetBrokers() ([]platform.ServiceBroker, error) {
+func (b PlatformClient) GetBrokers(ctx context.Context) ([]platform.ServiceBroker, error) {
  brokers, err := retrieveClusterServiceBrokers(b.cli)
  if err != nil {
  return nil, err
@@ -78,7 +79,7 @@ func (b PlatformClient) GetBrokers() ([]platform.ServiceBroker, error) {
 }
 
 // CreateBroker registers a new broker in kubernetes service-catalog.
-func (b PlatformClient) CreateBroker(r *platform.CreateServiceBrokerRequest) (*platform.ServiceBroker, error) {
+func (b PlatformClient) CreateBroker(ctx context.Context, r *platform.CreateServiceBrokerRequest) (*platform.ServiceBroker, error) {
  broker := newServiceBroker(r.Name, r.BrokerURL, b.regSecretRef)
  broker.Spec.CommonServiceBrokerSpec.RelistBehavior = "Manual"
 
@@ -94,12 +95,12 @@ func (b PlatformClient) CreateBroker(r *platform.CreateServiceBrokerRequest) (*p
 }
 
 // DeleteBroker deletes an existing broker in from kubernetes service-catalog.
-func (b PlatformClient) DeleteBroker(r *platform.DeleteServiceBrokerRequest) error {
+func (b PlatformClient) DeleteBroker(ctx context.Context, r *platform.DeleteServiceBrokerRequest) error {
  return deleteClusterServiceBroker(b.cli, r.Name, &v1.DeleteOptions{})
 }
 
 // UpdateBroker updates a service broker in the kubernetes service-catalog.
-func (b PlatformClient) UpdateBroker(r *platform.UpdateServiceBrokerRequest) (*platform.ServiceBroker, error) {
+func (b PlatformClient) UpdateBroker(ctx context.Context, r *platform.UpdateServiceBrokerRequest) (*platform.ServiceBroker, error) {
  // Name and broker url are updateable
  broker := newServiceBroker(r.Name, r.BrokerURL, b.regSecretRef)
 
@@ -116,7 +117,7 @@ func (b PlatformClient) UpdateBroker(r *platform.UpdateServiceBrokerRequest) (*p
 
 // Fetch the new catalog information from reach service-broker registered in kubernetes,
 // so that it is visible in the kubernetes service-catalog.
-func (b PlatformClient) Fetch(serviceBroker *platform.ServiceBroker) error {
+func (b PlatformClient) Fetch(ctx context.Context, serviceBroker *platform.ServiceBroker) error {
  return syncClusterServiceBroker(b.cli, serviceBroker.Name, 3)
 }
 

diff --git a/k8s/client_test.go b/k8s/client_test.go
@@ -1,6 +1,7 @@
 package k8s
 
 import (
+ "context"
  "errors"
 
  "github.com/Peripli/service-broker-proxy/pkg/platform"
@@ -19,7 +20,7 @@ import (
 
 var _ = Describe("Kubernetes Broker Proxy", func() {
  var clientConfig *ClientConfiguration
-
+ var ctx context.Context
  BeforeSuite(func() {
  os.Setenv("KUBERNETES_SERVICE_HOST", "test")
  os.Setenv("KUBERNETES_SERVICE_PORT", "1234")
@@ -36,6 +37,7 @@ var _ = Describe("Kubernetes Broker Proxy", func() {
  clientConfig.Reg.Secret.Name = "secretName"
  clientConfig.Reg.Secret.Namespace = "secretNamespace"
  clientConfig.K8sClientCreateFunc = newSvcatSDK
+ ctx = context.TODO()
  })
 
  Describe("New Client", func() {
@@ -85,7 +87,7 @@ var _ = Describe("Kubernetes Broker Proxy", func() {
  Name: "fake-broker",
  BrokerURL: "http://fake.broker.url",
  }
- createdBroker, err := platformClient.CreateBroker(requestBroker)
+ createdBroker, err := platformClient.CreateBroker(ctx, requestBroker)
 
  Expect(createdBroker.GUID).To(Equal("1234"))
  Expect(createdBroker.Name).To(Equal("fake-broker"))
@@ -104,7 +106,7 @@ var _ = Describe("Kubernetes Broker Proxy", func() {
  }
 
  requestBroker := &platform.CreateServiceBrokerRequest{}
- createdBroker, err := platformClient.CreateBroker(requestBroker)
+ createdBroker, err := platformClient.CreateBroker(ctx, requestBroker)
 
  Expect(createdBroker).To(BeNil())
  Expect(err).To(Equal(errors.New("Error from service-catalog")))
@@ -127,7 +129,7 @@ var _ = Describe("Kubernetes Broker Proxy", func() {
  Name: "fake-broker",
  }
 
- err = platformClient.DeleteBroker(requestBroker)
+ err = platformClient.DeleteBroker(ctx, requestBroker)
 
  Expect(err).To(BeNil())
  })
@@ -144,7 +146,7 @@ var _ = Describe("Kubernetes Broker Proxy", func() {
 
  requestBroker := &platform.DeleteServiceBrokerRequest{}
 
- err = platformClient.DeleteBroker(requestBroker)
+ err = platformClient.DeleteBroker(ctx, requestBroker)
 
  Expect(err).To(Equal(errors.New("Error deleting clusterservicebroker")))
  })
@@ -173,7 +175,7 @@ var _ = Describe("Kubernetes Broker Proxy", func() {
  return brokers, nil
  }
 
- brokers, err := platformClient.GetBrokers()
+ brokers, err := platformClient.GetBrokers(ctx)
 
  Expect(err).To(BeNil())
  Expect(brokers).ToNot(BeNil())
@@ -194,7 +196,7 @@ var _ = Describe("Kubernetes Broker Proxy", func() {
  return brokers, nil
  }
 
- brokers, err := platformClient.GetBrokers()
+ brokers, err := platformClient.GetBrokers(ctx)
 
  Expect(err).To(BeNil())
  Expect(brokers).ToNot(BeNil())
@@ -211,7 +213,7 @@ var _ = Describe("Kubernetes Broker Proxy", func() {
  return nil, errors.New("Error getting clusterservicebrokers")
  }
 
- brokers, err := platformClient.GetBrokers()
+ brokers, err := platformClient.GetBrokers(ctx)
 
  Expect(brokers).To(BeNil())
  Expect(err).To(Equal(errors.New("Error getting clusterservicebrokers")))
@@ -247,7 +249,7 @@ var _ = Describe("Kubernetes Broker Proxy", func() {
  BrokerURL: "http://fake.broker.url",
  }
 
- broker, err := platformClient.UpdateBroker(requestBroker)
+ broker, err := platformClient.UpdateBroker(ctx, requestBroker)
 
  Expect(err).To(BeNil())
  Expect(broker.GUID).To(Equal("1234"))
@@ -267,7 +269,7 @@ var _ = Describe("Kubernetes Broker Proxy", func() {
 
  requestBroker := &platform.UpdateServiceBrokerRequest{}
 
- broker, err := platformClient.UpdateBroker(requestBroker)
+ broker, err := platformClient.UpdateBroker(ctx, requestBroker)
 
  Expect(broker).To(BeNil())
  Expect(err).To(Equal(errors.New("Error updating clusterservicebroker")))
@@ -291,7 +293,7 @@ var _ = Describe("Kubernetes Broker Proxy", func() {
  return nil
  }
 
- err = platformClient.Fetch(requestBroker)
+ err = platformClient.Fetch(ctx, requestBroker)
 
  Expect(err).To(BeNil())
  })
@@ -307,7 +309,7 @@ var _ = Describe("Kubernetes Broker Proxy", func() {
  return errors.New("Error syncing service broker")
  }
 
- err = platformClient.Fetch(requestBroker)
+ err = platformClient.Fetch(ctx, requestBroker)
 
  Expect(err).To(Equal(errors.New("Error syncing service broker")))
  })