add: @butonic recommendations

Co-authored-by: Jörn Friedrich Dreyer <jfd@butonic.de>
Signed-off-by: Mahdi Baghbani <mahdi-baghbani@azadehafzar.io>

Author: MahdiBaghbani

internal/http/services/ocmd/client.go

@@ -68,7 +68,7 @@ func (c *OCMClient) Discover(ctx context.Context, endpoint string) (*wellknown.O
 		if err != nil || len(body) == 0 {
 			log.Warn().Err(err).Str("sender", remoteurl).Str("response", string(body)).
 				Msg("invalid or empty response")
-			return nil, errtypes.BadRequest("Invalid response on OCM discovery")
+			return nil, errtypes.InternalError("Invalid response on OCM discovery")
 		}
 	}
 
@@ -77,7 +77,7 @@ func (c *OCMClient) Discover(ctx context.Context, endpoint string) (*wellknown.O
 	if err != nil {
 		log.Warn().Err(err).Str("sender", remoteurl).Str("response", string(body)).
 			Msg("malformed response")
-		return nil, errtypes.BadRequest("Invalid payload on OCM discovery")
+		return nil, errtypes.InternalError("Invalid payload on OCM discovery")
 	}
 
 	log.Debug().Str("sender", remoteurl).Any("response", disco).Msg("discovery response")
@@ -97,15 +97,15 @@ func (c *OCMClient) discover(ctx context.Context, url string) ([]byte, error) {
 	if err != nil {
 		return nil, errors.Wrap(err, "error doing OCM discovery request")
 	}
-	defer func(Body io.ReadCloser) {
-		err := Body.Close()
+	defer func(body io.ReadCloser) {
+		err := body.Close()
 		if err != nil {
 			log.Warn().Err(err).Msg("error closing response body")
 		}
 	}(resp.Body)
 	if resp.StatusCode != http.StatusOK {
 		log.Warn().Str("sender", url).Int("status", resp.StatusCode).Msg("discovery returned")
-		return nil, errtypes.BadRequest("Remote does not offer a valid OCM discovery endpoint")
+		return nil, errtypes.NewErrtypeFromHTTPStatusCode(resp.StatusCode, "Remote does not offer a valid OCM discovery endpoint")
 	}
 
 	body, err := io.ReadAll(resp.Body)

internal/http/services/sciencemesh/wayf.go

@@ -110,7 +110,7 @@ func (h *wayfHandler) init(c *config) error {
 
 		for _, srv := range fed.Servers {
 			if srv.DisplayName == "" || srv.URL == "" {
-				log.Warn().Str("federation", fed.Federation).
+				log.Debug().Str("federation", fed.Federation).
 					Str("displayName", srv.DisplayName).
 					Str("url", srv.URL).
 					Msg("Skipping server with missing displayName or url")

internal/http/services/wellknown/ocm.go

@@ -134,7 +134,7 @@ func (h *wkocmHandler) init(c *OcmProviderConfig) {
 	h.data = d
 }
 
-// Ocm This handler implements the OCM discovery endpoint specified in
+// Ocm handles the OCM discovery endpoint specified in
 // https://cs3org.github.io/OCM-API/docs.html?repo=OCM-API&user=cs3org#/paths/~1ocm-provider/get
 func (h *wkocmHandler) Ocm(w http.ResponseWriter, r *http.Request) {
 	log := appctx.GetLogger(r.Context())