From 044d7566269ffeaa79ace504f60e1d7d573c5259 Mon Sep 17 00:00:00 2001 From: deviantony Date: Wed, 4 May 2022 18:28:31 +0000 Subject: [PATCH] feat(edge): remove logrus calls --- api/go.mod | 1 - api/go.sum | 2 -- .../endpoint_edgestatus_inspect.go | 17 +------------- api/http/handler/endpoints/endpoint_create.go | 23 ------------------- 4 files changed, 1 insertion(+), 42 deletions(-) diff --git a/api/go.mod b/api/go.mod index 42cb0faa2..ab2e7168b 100644 --- a/api/go.mod +++ b/api/go.mod @@ -4,7 +4,6 @@ go 1.17 require ( github.com/Microsoft/go-winio v0.5.1 - github.com/Sirupsen/logrus v1.0.6 github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 github.com/aws/aws-sdk-go-v2 v1.11.1 github.com/aws/aws-sdk-go-v2/credentials v1.6.2 diff --git a/api/go.sum b/api/go.sum index 63c7f9df6..ce36b6bbc 100644 --- a/api/go.sum +++ b/api/go.sum @@ -91,8 +91,6 @@ github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= -github.com/Sirupsen/logrus v1.0.6 h1:HCAGQRk48dRVPA5Y+Yh0qdCSTzPOyU1tBJ7Q9YzotII= -github.com/Sirupsen/logrus v1.0.6/go.mod h1:rmk17hk6i8ZSAJkSDa7nOxamrG+SP4P0mm+DAvExv4U= github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs= github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= diff --git a/api/http/handler/endpointedge/endpoint_edgestatus_inspect.go b/api/http/handler/endpointedge/endpoint_edgestatus_inspect.go index 6fec313af..ea75598f0 100644 --- a/api/http/handler/endpointedge/endpoint_edgestatus_inspect.go +++ b/api/http/handler/endpointedge/endpoint_edgestatus_inspect.go @@ -12,7 +12,6 @@ import ( "github.com/portainer/libhttp/response" portainer "github.com/portainer/portainer/api" "github.com/portainer/portainer/api/http/middlewares" - "github.com/sirupsen/logrus" ) type stackStatusResponse struct { @@ -65,22 +64,16 @@ type endpointEdgeStatusInspectResponse struct { // @failure 500 "Server error" // @router /endpoints/{id}/edge/status [get] func (handler *Handler) endpointEdgeStatusInspect(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { - logrus.Debug("[http,handler,endpointedge] [message: received request to get endpoint edge status]") - endpoint, err := middlewares.FetchEndpoint(r) if err != nil { return httperror.BadRequest("Unable to find an environment on request context", err) } - logrus.Debugf("[http,handler,endpointedge] [message: retrieved endpoint information from context] [endpoint: %s] [endpoint_id: %d]", endpoint.Name, endpoint.ID) - err = handler.requestBouncer.AuthorizedEdgeEndpointOperation(r, endpoint) if err != nil { return &httperror.HandlerError{http.StatusForbidden, "Permission denied to access environment", err} } - logrus.Debugf("[http,handler,endpointedge] [message: authorized endpoint operation] [endpoint: %s] [endpoint_id: %d]", endpoint.Name, endpoint.ID) - if endpoint.EdgeID == "" { edgeIdentifier := r.Header.Get(portainer.PortainerAgentEdgeIDHeader) endpoint.EdgeID = edgeIdentifier @@ -96,11 +89,9 @@ func (handler *Handler) endpointEdgeStatusInspect(w http.ResponseWriter, r *http err = handler.DataStore.Endpoint().UpdateEndpoint(endpoint.ID, endpoint) if err != nil { - logrus.Errorf("Unable to persist environment changes inside the database: %s", err) + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist endpoint changes in the database", err} } - logrus.Debugf("[http,handler,endpointedge] [message: updated endpoint information in database] [edge_id: %s] [checkin_time: %d]", endpoint.EdgeID, endpoint.LastCheckInDate) - checkinInterval := endpoint.EdgeCheckinInterval if endpoint.EdgeCheckinInterval == 0 { settings, err := handler.DataStore.Settings().Settings() @@ -119,16 +110,12 @@ func (handler *Handler) endpointEdgeStatusInspect(w http.ResponseWriter, r *http Credentials: tunnel.Credentials, } - logrus.Debugf("[http,handler,endpointedge] [message: retrieved tunnel information from mem] [status: %s]", tunnel.Status) - schedules, handlerErr := handler.buildSchedules(endpoint.ID, tunnel) if handlerErr != nil { return handlerErr } statusResponse.Schedules = schedules - logrus.Debugf("[http,handler,endpointedge] [message: built schedules] [schedule_count: %d]", len(schedules)) - if tunnel.Status == portainer.EdgeAgentManagementRequired { handler.ReverseTunnelService.SetTunnelStatusToActive(endpoint.ID) } @@ -139,8 +126,6 @@ func (handler *Handler) endpointEdgeStatusInspect(w http.ResponseWriter, r *http } statusResponse.Stacks = edgeStacksStatus - logrus.Debugf("[http,handler,endpointedge] [message: built stacks] [stack_count: %d]", len(edgeStacksStatus)) - return response.JSON(w, statusResponse) } diff --git a/api/http/handler/endpoints/endpoint_create.go b/api/http/handler/endpoints/endpoint_create.go index 0d92a3f54..90bcf3cc6 100644 --- a/api/http/handler/endpoints/endpoint_create.go +++ b/api/http/handler/endpoints/endpoint_create.go @@ -18,7 +18,6 @@ import ( "github.com/portainer/portainer/api/crypto" "github.com/portainer/portainer/api/http/client" "github.com/portainer/portainer/api/internal/edge" - "github.com/sirupsen/logrus" ) type endpointCreatePayload struct { @@ -182,44 +181,32 @@ func (payload *endpointCreatePayload) Validate(r *http.Request) error { // @failure 500 "Server error" // @router /endpoints [post] func (handler *Handler) endpointCreate(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { - logrus.Debug("[http,handler,endpoints] [message: received request to create endpoint]") - payload := &endpointCreatePayload{} err := payload.Validate(r) if err != nil { return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err} } - logrus.Debug("[http,handler,endpoints] [message: successfully validated payload]") - endpoint, endpointCreationError := handler.createEndpoint(payload) if endpointCreationError != nil { return endpointCreationError } - logrus.Debugf("[http,handler,endpoints] [message: successfully created endpoint] [endpoint: %s] [endpoint_id: %d]", endpoint.Name, endpoint.ID) - endpointGroup, err := handler.DataStore.EndpointGroup().EndpointGroup(endpoint.GroupID) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to find an environment group inside the database", err} } - logrus.Debugf("[http,handler,endpoints] [message: fetched endpoint group] [group: %s]", endpointGroup.Name) - edgeGroups, err := handler.DataStore.EdgeGroup().EdgeGroups() if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve edge groups from the database", err} } - logrus.Debug("[http,handler,endpoints] [message: successfully fetched edge groups]") - edgeStacks, err := handler.DataStore.EdgeStack().EdgeStacks() if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve edge stacks from the database", err} } - logrus.Debug("[http,handler,endpoints] [message: successfully fetched edge stacks]") - relationObject := &portainer.EndpointRelation{ EndpointID: endpoint.ID, EdgeStacks: map[portainer.EdgeStackID]bool{}, @@ -230,8 +217,6 @@ func (handler *Handler) endpointCreate(w http.ResponseWriter, r *http.Request) * for _, stackID := range relatedEdgeStacks { relationObject.EdgeStacks[stackID] = true } - - logrus.Debugf("[http,handler,endpoints] [message: computed edge stacks relationships] [stack_count: %d]", len(relatedEdgeStacks)) } err = handler.DataStore.EndpointRelation().Create(relationObject) @@ -239,8 +224,6 @@ func (handler *Handler) endpointCreate(w http.ResponseWriter, r *http.Request) * return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist the relation object inside the database", err} } - logrus.Debug("[http,handler,endpoints] [message: created database relation object]") - return response.JSON(w, endpoint) } @@ -325,8 +308,6 @@ func (handler *Handler) createEdgeAgentEndpoint(payload *endpointCreatePayload) edgeKey := handler.ReverseTunnelService.GenerateEdgeKey(payload.URL, portainerHost, endpointID) - logrus.Debugf("[http,handler,endpoints] [message: successfully generated Edge key] [key: %s]", edgeKey) - endpoint := &portainer.Endpoint{ ID: portainer.EndpointID(endpointID), Name: payload.Name, @@ -353,8 +334,6 @@ func (handler *Handler) createEdgeAgentEndpoint(payload *endpointCreatePayload) return nil, &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve the settings from the database", err} } - logrus.Debug("[http,handler,endpoints] [message: successfully fetched settings]") - if settings.EnforceEdgeID { edgeID, err := uuid.NewV4() if err != nil { @@ -369,8 +348,6 @@ func (handler *Handler) createEdgeAgentEndpoint(payload *endpointCreatePayload) return nil, &httperror.HandlerError{http.StatusInternalServerError, "An error occured while trying to create the environment", err} } - logrus.Debug("[http,handler,endpoints] [message: successfully updated endpoint authorizations]") - return endpoint, nil }