From e953aabcfeca8162aee2609ea0dc38bc920de321 Mon Sep 17 00:00:00 2001
From: Marek Michali <marek.michali@sap.com>
Date: Tue, 27 Aug 2024 08:03:05 +0200
Subject: [PATCH] Limit methods scope

---
 internal/api/api.go      | 19 +++++++++----------
 internal/api/api_test.go |  4 ++--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/internal/api/api.go b/internal/api/api.go
index cba2188ae..3dead9ed3 100644
--- a/internal/api/api.go
+++ b/internal/api/api.go
@@ -138,7 +138,7 @@ func (a *API) CreateServiceInstance(writer http.ResponseWriter, request *http.Re
 	a.sendResponse(writer, response, http.StatusCreated)
 }
 
-func (a *API) GetServiceOffering(writer http.ResponseWriter, request *http.Request, id string) {
+func (a *API) getServiceOffering(writer http.ResponseWriter, id string) {
 	details, err := a.smClient.ServiceOfferingDetails(id)
 	if err != nil {
 		a.handleError(writer, err)
@@ -152,7 +152,7 @@ func (a *API) GetServiceOffering(writer http.ResponseWriter, request *http.Reque
 	a.sendResponse(writer, response)
 }
 
-func (a *API) ListServiceOfferings(writer http.ResponseWriter, request *http.Request) {
+func (a *API) listServiceOfferings(writer http.ResponseWriter) {
 	offerings, err := a.smClient.ServiceOfferings()
 	if err != nil {
 		a.handleError(writer, err)
@@ -177,10 +177,10 @@ func (a *API) HandleGetServiceOffering(writer http.ResponseWriter, request *http
 	}
 	id := request.URL.Query().Get("id")
 	if id == "" {
-		a.ListServiceOfferings(writer, request)
+		a.listServiceOfferings(writer)
 		return
 	}
-	a.GetServiceOffering(writer, request, id)
+	a.getServiceOffering(writer, id)
 }
 
 func (a *API) ListSecrets(writer http.ResponseWriter, request *http.Request) {
@@ -243,9 +243,7 @@ func (a *API) HandleGetServiceInstances(writer http.ResponseWriter, request *htt
 	a.GetServiceInstance(writer, request, id)
 }
 
-func (a *API) ListServiceBindings(writer http.ResponseWriter, request *http.Request) {
-	queryParams := request.URL.Query()
-	serviceInstanceId := queryParams.Get("service_instance_id")
+func (a *API) listServiceBindings(writer http.ResponseWriter, serviceInstanceId string) {
 	sbs, err := a.smClient.ServiceBindingsFor(serviceInstanceId)
 	if err != nil {
 		a.handleError(writer, err)
@@ -336,7 +334,7 @@ func (a *API) CreateServiceBinding(writer http.ResponseWriter, request *http.Req
 	a.sendResponse(writer, response, http.StatusCreated)
 }
 
-func (a *API) GetServiceBinding(writer http.ResponseWriter, request *http.Request, id string) {
+func (a *API) getServiceBinding(writer http.ResponseWriter, id string) {
 	sb, err := a.smClient.ServiceBinding(id)
 	if err != nil {
 		a.handleError(writer, err)
@@ -375,10 +373,11 @@ func (a *API) HandleGetServiceBinding(writer http.ResponseWriter, request *http.
 	}
 	id := request.URL.Query().Get("id")
 	if id == "" {
-		a.ListServiceBindings(writer, request)
+		serviceInstanceId := request.URL.Query().Get("service_instance_id")
+		a.listServiceBindings(writer, serviceInstanceId)
 		return
 	}
-	a.GetServiceBinding(writer, request, id)
+	a.getServiceBinding(writer, id)
 }
 
 func (a *API) DeleteServiceBinding(writer http.ResponseWriter, request *http.Request) {
diff --git a/internal/api/api_test.go b/internal/api/api_test.go
index 1eea142c6..f394ae439 100644
--- a/internal/api/api_test.go
+++ b/internal/api/api_test.go
@@ -705,7 +705,7 @@ func TestAPI(t *testing.T) {
 		sbID := "318a16c3-7c80-485f-b55c-918629012c9a"
 
 		fakeSM.RespondWithErrors()
-		req, err := http.NewRequest(http.MethodDelete, apiAddr+"/api/service-bindings?sm_secret_name=sap-btp-service-operator&sm_set_namespace=kyma-system&id="+sbID, nil)
+		req, err := http.NewRequest(http.MethodDelete, apiAddr+"/api/service-bindings?sm_secret_name=sap-btp-service-operator&sm_secret_namespace=kyma-system&id="+sbID, nil)
 		require.NoError(t, err)
 		resp, err := apiClient.Do(req)
 		require.NoError(t, err)
@@ -779,7 +779,7 @@ func TestAPI(t *testing.T) {
 		require.NoError(t, err)
 
 		// when
-		req, err := http.NewRequest(http.MethodPut, apiAddr+"/api/service-bindings?id="+sbID, bytes.NewBuffer(sbCreateRequestJSON))
+		req, err := http.NewRequest(http.MethodPut, apiAddr+"/api/service-bindings?sm_secret_name=sap-btp-service-operator&sm_secret_namespace=kyma-system&id="+sbID, bytes.NewBuffer(sbCreateRequestJSON))
 		require.NoError(t, err)
 		resp, err := apiClient.Do(req)
 		require.NoError(t, err)