Moved Unbind handler

[#165346660] Signed-off-by: Felisia Martini <[email protected]> Co-authored-by: Felisia Martini <[email protected]>
pivotal-cf · Apr 29, 2019 · 12d7dcf · 12d7dcf
1 parent 0113983
commit 12d7dcf
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 68 deletions.
diff --git a/api.go b/api.go
@@ -96,7 +96,7 @@ func AttachRoutes(router *mux.Router, serviceBroker ServiceBroker, logger lager.
 
  router.HandleFunc("/v2/service_instances/{instance_id}/service_bindings/{binding_id}", apiHandler.GetBinding).Methods("GET")
  router.HandleFunc("/v2/service_instances/{instance_id}/service_bindings/{binding_id}", apiHandler.Bind).Methods("PUT")
- router.HandleFunc("/v2/service_instances/{instance_id}/service_bindings/{binding_id}", handler.unbind).Methods("DELETE")
+ router.HandleFunc("/v2/service_instances/{instance_id}/service_bindings/{binding_id}", apiHandler.Unbind).Methods("DELETE")
 
  router.HandleFunc("/v2/service_instances/{instance_id}/service_bindings/{binding_id}/last_operation", handler.lastBindingOperation).Methods("GET")
 }
@@ -106,72 +106,6 @@ type serviceBrokerHandler struct {
  logger lager.Logger
 }
 
-func (h serviceBrokerHandler) unbind(w http.ResponseWriter, req *http.Request) {
- vars := mux.Vars(req)
- instanceID := vars["instance_id"]
- bindingID := vars["binding_id"]
-
- logger := h.logger.Session(unbindLogKey, lager.Data{
- instanceIDLogKey: instanceID,
- bindingIDLogKey: bindingID,
- })
-
- version := getAPIVersion(req)
- asyncAllowed := req.FormValue("accepts_incomplete") == "true"
- if asyncAllowed && version.Minor < 14 {
- err := errors.New("async unbinding only supported from OSB version 2.14 and up")
- h.respond(w, http.StatusUnprocessableEntity, apiresponses.ErrorResponse{
- Description: err.Error(),
- })
- logger.Error(apiVersionInvalidKey, err)
- return
- }
- details := domain.UnbindDetails{
- PlanID: req.FormValue("plan_id"),
- ServiceID: req.FormValue("service_id"),
- }
-
- if details.ServiceID == "" {
- h.respond(w, http.StatusBadRequest, apiresponses.ErrorResponse{
- Description: serviceIdError.Error(),
- })
- logger.Error(serviceIdMissingKey, serviceIdError)
- return
- }
-
- if details.PlanID == "" {
- h.respond(w, http.StatusBadRequest, apiresponses.ErrorResponse{
- Description: planIdError.Error(),
- })
- logger.Error(planIdMissingKey, planIdError)
- return
- }
-
- unbindResponse, err := h.serviceBroker.Unbind(req.Context(), instanceID, bindingID, details, asyncAllowed)
- if err != nil {
- switch err := err.(type) {
- case *apiresponses.FailureResponse:
- logger.Error(err.LoggerAction(), err)
- h.respond(w, err.ValidatedStatusCode(logger), err.ErrorResponse())
- default:
- logger.Error(unknownErrorKey, err)
- h.respond(w, http.StatusInternalServerError, apiresponses.ErrorResponse{
- Description: err.Error(),
- })
- }
- return
- }
-
- if unbindResponse.IsAsync {
- h.respond(w, http.StatusAccepted, apiresponses.UnbindResponse{
- OperationData: unbindResponse.OperationData,
- })
- } else {
- h.respond(w, http.StatusOK, apiresponses.EmptyResponse{})
- }
-
-}
-
 func (h serviceBrokerHandler) lastBindingOperation(w http.ResponseWriter, req *http.Request) {
  vars := mux.Vars(req)
  instanceID := vars["instance_id"]

diff --git a/handlers/api_handler.go b/handlers/api_handler.go
@@ -20,7 +20,6 @@ const (
 
  bindingIDLogKey = "binding-id"
 
- unbindLogKey = "unbind"
  lastOperationLogKey = "lastOperation"
  lastBindingOperationLogKey = "lastBindingOperation"
 )

diff --git a/handlers/unbind.go b/handlers/unbind.go
@@ -0,0 +1,79 @@
+package handlers
+
+import (
+ "errors"
+ "net/http"
+
+ "code.cloudfoundry.org/lager"
+ "github.com/gorilla/mux"
+ "github.com/pivotal-cf/brokerapi/domain"
+ "github.com/pivotal-cf/brokerapi/domain/apiresponses"
+)
+
+const unbindLogKey = "unbind"
+
+func (h APIHandler) Unbind(w http.ResponseWriter, req *http.Request) {
+ vars := mux.Vars(req)
+ instanceID := vars["instance_id"]
+ bindingID := vars["binding_id"]
+
+ logger := h.Logger.Session(unbindLogKey, lager.Data{
+ instanceIDLogKey: instanceID,
+ bindingIDLogKey: bindingID,
+ })
+
+ version := getAPIVersion(req)
+ asyncAllowed := req.FormValue("accepts_incomplete") == "true"
+ if asyncAllowed && version.Minor < 14 {
+ err := errors.New("async unbinding only supported from OSB version 2.14 and up")
+ h.respond(w, http.StatusUnprocessableEntity, apiresponses.ErrorResponse{
+ Description: err.Error(),
+ })
+ logger.Error(apiVersionInvalidKey, err)
+ return
+ }
+ details := domain.UnbindDetails{
+ PlanID: req.FormValue("plan_id"),
+ ServiceID: req.FormValue("service_id"),
+ }
+
+ if details.ServiceID == "" {
+ h.respond(w, http.StatusBadRequest, apiresponses.ErrorResponse{
+ Description: serviceIdError.Error(),
+ })
+ logger.Error(serviceIdMissingKey, serviceIdError)
+ return
+ }
+
+ if details.PlanID == "" {
+ h.respond(w, http.StatusBadRequest, apiresponses.ErrorResponse{
+ Description: planIdError.Error(),
+ })
+ logger.Error(planIdMissingKey, planIdError)
+ return
+ }
+
+ unbindResponse, err := h.ServiceBroker.Unbind(req.Context(), instanceID, bindingID, details, asyncAllowed)
+ if err != nil {
+ switch err := err.(type) {
+ case *apiresponses.FailureResponse:
+ logger.Error(err.LoggerAction(), err)
+ h.respond(w, err.ValidatedStatusCode(logger), err.ErrorResponse())
+ default:
+ logger.Error(unknownErrorKey, err)
+ h.respond(w, http.StatusInternalServerError, apiresponses.ErrorResponse{
+ Description: err.Error(),
+ })
+ }
+ return
+ }
+
+ if unbindResponse.IsAsync {
+ h.respond(w, http.StatusAccepted, apiresponses.UnbindResponse{
+ OperationData: unbindResponse.OperationData,
+ })
+ } else {
+ h.respond(w, http.StatusOK, apiresponses.EmptyResponse{})
+ }
+
+}