From 0689a56bf95377293e632db1ad1432b311ff3962 Mon Sep 17 00:00:00 2001 From: Felisia Martini Date: Mon, 29 Apr 2019 11:27:14 +0100 Subject: [PATCH] APIHandler fields are now private [#165346660] Signed-off-by: Gabriele Cipriano Co-authored-by: Gabriele Cipriano --- api.go | 2 +- handlers/api_handler.go | 10 +++++++--- handlers/bind.go | 4 ++-- handlers/catalog.go | 2 +- handlers/deprovision.go | 4 ++-- handlers/get_binding.go | 4 ++-- handlers/get_instance.go | 4 ++-- handlers/last_binding_operation.go | 4 ++-- handlers/last_operation.go | 4 ++-- handlers/provision.go | 6 +++--- handlers/unbind.go | 4 ++-- handlers/update.go | 12 ++++++------ 12 files changed, 32 insertions(+), 28 deletions(-) diff --git a/api.go b/api.go index d23b83bf..705e4d2a 100644 --- a/api.go +++ b/api.go @@ -46,7 +46,7 @@ func New(serviceBroker ServiceBroker, logger lager.Logger, brokerCredentials Bro } func AttachRoutes(router *mux.Router, serviceBroker ServiceBroker, logger lager.Logger) { - apiHandler := handlers.APIHandler{serviceBroker, logger} + apiHandler := handlers.NewApiHandler(serviceBroker, logger) router.HandleFunc("/v2/catalog", apiHandler.Catalog).Methods("GET") router.HandleFunc("/v2/service_instances/{instance_id}", apiHandler.GetInstance).Methods("GET") diff --git a/handlers/api_handler.go b/handlers/api_handler.go index 2d47ac3a..a0cddb0a 100644 --- a/handlers/api_handler.go +++ b/handlers/api_handler.go @@ -29,8 +29,12 @@ var ( ) type APIHandler struct { - ServiceBroker domain.ServiceBroker - Logger lager.Logger + serviceBroker domain.ServiceBroker + logger lager.Logger +} + +func NewApiHandler(broker domain.ServiceBroker, logger lager.Logger) APIHandler { + return APIHandler{broker, logger} } func (h APIHandler) respond(w http.ResponseWriter, status int, response interface{}) { @@ -40,7 +44,7 @@ func (h APIHandler) respond(w http.ResponseWriter, status int, response interfac encoder := json.NewEncoder(w) err := encoder.Encode(response) if err != nil { - h.Logger.Error("encoding response", err, lager.Data{"status": status, "response": response}) + h.logger.Error("encoding response", err, lager.Data{"status": status, "response": response}) } } diff --git a/handlers/bind.go b/handlers/bind.go index abe742c5..4a03c367 100644 --- a/handlers/bind.go +++ b/handlers/bind.go @@ -20,7 +20,7 @@ func (h APIHandler) Bind(w http.ResponseWriter, req *http.Request) { instanceID := vars["instance_id"] bindingID := vars["binding_id"] - logger := h.Logger.Session(bindLogKey, lager.Data{ + logger := h.logger.Session(bindLogKey, lager.Data{ instanceIDLogKey: instanceID, bindingIDLogKey: bindingID, }) @@ -56,7 +56,7 @@ func (h APIHandler) Bind(w http.ResponseWriter, req *http.Request) { return } - binding, err := h.ServiceBroker.Bind(req.Context(), instanceID, bindingID, details, asyncAllowed) + binding, err := h.serviceBroker.Bind(req.Context(), instanceID, bindingID, details, asyncAllowed) if err != nil { switch err := err.(type) { case *apiresponses.FailureResponse: diff --git a/handlers/catalog.go b/handlers/catalog.go index cf7c95c8..dacfd174 100644 --- a/handlers/catalog.go +++ b/handlers/catalog.go @@ -8,7 +8,7 @@ import ( func (h *APIHandler) Catalog(w http.ResponseWriter, req *http.Request) { - services, err := h.ServiceBroker.Services(req.Context()) + services, err := h.serviceBroker.Services(req.Context()) if err != nil { h.respond(w, http.StatusInternalServerError, apiresponses.ErrorResponse{ Description: err.Error(), diff --git a/handlers/deprovision.go b/handlers/deprovision.go index f6dd9031..56024482 100644 --- a/handlers/deprovision.go +++ b/handlers/deprovision.go @@ -14,7 +14,7 @@ const deprovisionLogKey = "deprovision" func (h APIHandler) Deprovision(w http.ResponseWriter, req *http.Request) { vars := mux.Vars(req) instanceID := vars["instance_id"] - logger := h.Logger.Session(deprovisionLogKey, lager.Data{ + logger := h.logger.Session(deprovisionLogKey, lager.Data{ instanceIDLogKey: instanceID, }) @@ -42,7 +42,7 @@ func (h APIHandler) Deprovision(w http.ResponseWriter, req *http.Request) { asyncAllowed := req.FormValue("accepts_incomplete") == "true" - deprovisionSpec, err := h.ServiceBroker.Deprovision(req.Context(), instanceID, details, asyncAllowed) + deprovisionSpec, err := h.serviceBroker.Deprovision(req.Context(), instanceID, details, asyncAllowed) if err != nil { switch err := err.(type) { case *apiresponses.FailureResponse: diff --git a/handlers/get_binding.go b/handlers/get_binding.go index 75b6c2d2..24912de5 100644 --- a/handlers/get_binding.go +++ b/handlers/get_binding.go @@ -16,7 +16,7 @@ func (h APIHandler) GetBinding(w http.ResponseWriter, req *http.Request) { instanceID := vars["instance_id"] bindingID := vars["binding_id"] - logger := h.Logger.Session(getBindLogKey, lager.Data{ + logger := h.logger.Session(getBindLogKey, lager.Data{ instanceIDLogKey: instanceID, bindingIDLogKey: bindingID, }) @@ -31,7 +31,7 @@ func (h APIHandler) GetBinding(w http.ResponseWriter, req *http.Request) { return } - binding, err := h.ServiceBroker.GetBinding(req.Context(), instanceID, bindingID) + binding, err := h.serviceBroker.GetBinding(req.Context(), instanceID, bindingID) if err != nil { switch err := err.(type) { case *apiresponses.FailureResponse: diff --git a/handlers/get_instance.go b/handlers/get_instance.go index 9b555e12..0271ecd3 100644 --- a/handlers/get_instance.go +++ b/handlers/get_instance.go @@ -15,7 +15,7 @@ func (h APIHandler) GetInstance(w http.ResponseWriter, req *http.Request) { vars := mux.Vars(req) instanceID := vars["instance_id"] - logger := h.Logger.Session(getInstanceLogKey, lager.Data{ + logger := h.logger.Session(getInstanceLogKey, lager.Data{ instanceIDLogKey: instanceID, }) @@ -29,7 +29,7 @@ func (h APIHandler) GetInstance(w http.ResponseWriter, req *http.Request) { return } - instanceDetails, err := h.ServiceBroker.GetInstance(req.Context(), instanceID) + instanceDetails, err := h.serviceBroker.GetInstance(req.Context(), instanceID) if err != nil { switch err := err.(type) { case *apiresponses.FailureResponse: diff --git a/handlers/last_binding_operation.go b/handlers/last_binding_operation.go index 34d6d7b2..e45ac81a 100644 --- a/handlers/last_binding_operation.go +++ b/handlers/last_binding_operation.go @@ -22,7 +22,7 @@ func (h APIHandler) LastBindingOperation(w http.ResponseWriter, req *http.Reques OperationData: req.FormValue("operation"), } - logger := h.Logger.Session(lastBindingOperationLogKey, lager.Data{ + logger := h.logger.Session(lastBindingOperationLogKey, lager.Data{ instanceIDLogKey: instanceID, }) @@ -38,7 +38,7 @@ func (h APIHandler) LastBindingOperation(w http.ResponseWriter, req *http.Reques logger.Info("starting-check-for-binding-operation") - lastOperation, err := h.ServiceBroker.LastBindingOperation(req.Context(), instanceID, bindingID, pollDetails) + lastOperation, err := h.serviceBroker.LastBindingOperation(req.Context(), instanceID, bindingID, pollDetails) if err != nil { switch err := err.(type) { diff --git a/handlers/last_operation.go b/handlers/last_operation.go index 6fcc4b91..27f62f15 100644 --- a/handlers/last_operation.go +++ b/handlers/last_operation.go @@ -20,13 +20,13 @@ func (h APIHandler) LastOperation(w http.ResponseWriter, req *http.Request) { OperationData: req.FormValue("operation"), } - logger := h.Logger.Session(lastOperationLogKey, lager.Data{ + logger := h.logger.Session(lastOperationLogKey, lager.Data{ instanceIDLogKey: instanceID, }) logger.Info("starting-check-for-operation") - lastOperation, err := h.ServiceBroker.LastOperation(req.Context(), instanceID, pollDetails) + lastOperation, err := h.serviceBroker.LastOperation(req.Context(), instanceID, pollDetails) if err != nil { switch err := err.(type) { diff --git a/handlers/provision.go b/handlers/provision.go index 32c3cd67..8b00004e 100644 --- a/handlers/provision.go +++ b/handlers/provision.go @@ -24,7 +24,7 @@ func (h *APIHandler) Provision(w http.ResponseWriter, req *http.Request) { vars := mux.Vars(req) instanceID := vars["instance_id"] - logger := h.Logger.Session(provisionLogKey, lager.Data{ + logger := h.logger.Session(provisionLogKey, lager.Data{ instanceIDLogKey: instanceID, }) @@ -54,7 +54,7 @@ func (h *APIHandler) Provision(w http.ResponseWriter, req *http.Request) { } valid := false - services, _ := h.ServiceBroker.Services(req.Context()) + services, _ := h.serviceBroker.Services(req.Context()) for _, service := range services { if service.ID == details.ServiceID { req = req.WithContext(utils.AddServiceToContext(req.Context(), &service)) @@ -94,7 +94,7 @@ func (h *APIHandler) Provision(w http.ResponseWriter, req *http.Request) { instanceDetailsLogKey: details, }) - provisionResponse, err := h.ServiceBroker.Provision(req.Context(), instanceID, details, asyncAllowed) + provisionResponse, err := h.serviceBroker.Provision(req.Context(), instanceID, details, asyncAllowed) if err != nil { switch err := err.(type) { diff --git a/handlers/unbind.go b/handlers/unbind.go index 7c14c2a6..4c81cc5f 100644 --- a/handlers/unbind.go +++ b/handlers/unbind.go @@ -17,7 +17,7 @@ func (h APIHandler) Unbind(w http.ResponseWriter, req *http.Request) { instanceID := vars["instance_id"] bindingID := vars["binding_id"] - logger := h.Logger.Session(unbindLogKey, lager.Data{ + logger := h.logger.Session(unbindLogKey, lager.Data{ instanceIDLogKey: instanceID, bindingIDLogKey: bindingID, }) @@ -53,7 +53,7 @@ func (h APIHandler) Unbind(w http.ResponseWriter, req *http.Request) { return } - unbindResponse, err := h.ServiceBroker.Unbind(req.Context(), instanceID, bindingID, details, asyncAllowed) + unbindResponse, err := h.serviceBroker.Unbind(req.Context(), instanceID, bindingID, details, asyncAllowed) if err != nil { switch err := err.(type) { case *apiresponses.FailureResponse: diff --git a/handlers/update.go b/handlers/update.go index be55bbe2..b617e46c 100644 --- a/handlers/update.go +++ b/handlers/update.go @@ -17,13 +17,13 @@ func (h APIHandler) Update(w http.ResponseWriter, req *http.Request) { vars := mux.Vars(req) instanceID := vars["instance_id"] - logger := h.Logger.Session(updateLogKey, lager.Data{ + logger := h.logger.Session(updateLogKey, lager.Data{ instanceIDLogKey: instanceID, }) var details domain.UpdateDetails if err := json.NewDecoder(req.Body).Decode(&details); err != nil { - h.Logger.Error(invalidServiceDetailsErrorKey, err) + h.logger.Error(invalidServiceDetailsErrorKey, err) h.respond(w, http.StatusUnprocessableEntity, apiresponses.ErrorResponse{ Description: err.Error(), }) @@ -40,14 +40,14 @@ func (h APIHandler) Update(w http.ResponseWriter, req *http.Request) { acceptsIncompleteFlag, _ := strconv.ParseBool(req.URL.Query().Get("accepts_incomplete")) - updateServiceSpec, err := h.ServiceBroker.Update(req.Context(), instanceID, details, acceptsIncompleteFlag) + updateServiceSpec, err := h.serviceBroker.Update(req.Context(), instanceID, details, acceptsIncompleteFlag) if err != nil { switch err := err.(type) { case *apiresponses.FailureResponse: - h.Logger.Error(err.LoggerAction(), err) - h.respond(w, err.ValidatedStatusCode(h.Logger), err.ErrorResponse()) + h.logger.Error(err.LoggerAction(), err) + h.respond(w, err.ValidatedStatusCode(h.logger), err.ErrorResponse()) default: - h.Logger.Error(unknownErrorKey, err) + h.logger.Error(unknownErrorKey, err) h.respond(w, http.StatusInternalServerError, apiresponses.ErrorResponse{ Description: err.Error(), })