github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor: fix linting issues across the codebase (#12152)

pull/11582/merge
Anthony Lapenna 2024-08-28 15:03:15 +02:00 committed by GitHub
parent f59dd34154
commit 0b37b677c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/http/handler/endpointedge/endpointedge_status_inspect_test.go
View File

@ -152,7 +152,7 @@ func TestMissingEdgeIdentifier(t *testing.T) {
handler.ServeHTTP(rec, req) handler.ServeHTTP(rec, req)
if rec.Code != http.StatusForbidden { if rec.Code != http.StatusForbidden {
t.Fatalf(fmt.Sprintf("expected a %d response, found: %d without Edge identifier", http.StatusForbidden, rec.Code)) t.Fatalf("expected a %d response, found: %d without Edge identifier", http.StatusForbidden, rec.Code)
} }
} }
@ -177,7 +177,7 @@ func TestWithEndpoints(t *testing.T) {
handler.ServeHTTP(rec, req) handler.ServeHTTP(rec, req)
if rec.Code != test.expectedStatusCode { if rec.Code != test.expectedStatusCode {
t.Fatalf(fmt.Sprintf("expected a %d response, found: %d for endpoint ID: %d", test.expectedStatusCode, rec.Code, test.endpoint.ID)) t.Fatalf("expected a %d response, found: %d for endpoint ID: %d", test.expectedStatusCode, rec.Code, test.endpoint.ID)
} }
} }
} }
@ -217,7 +217,7 @@ func TestLastCheckInDateIncreases(t *testing.T) {
handler.ServeHTTP(rec, req) handler.ServeHTTP(rec, req)
if rec.Code != http.StatusOK { if rec.Code != http.StatusOK {
t.Fatalf(fmt.Sprintf("expected a %d response, found: %d", http.StatusOK, rec.Code)) t.Fatalf("expected a %d response, found: %d", http.StatusOK, rec.Code)
} }
updatedEndpoint, err := handler.DataStore.Endpoint().Endpoint(endpoint.ID) updatedEndpoint, err := handler.DataStore.Endpoint().Endpoint(endpoint.ID)
@ -260,7 +260,7 @@ func TestEmptyEdgeIdWithAgentPlatformHeader(t *testing.T) {
handler.ServeHTTP(rec, req) handler.ServeHTTP(rec, req)
if rec.Code != http.StatusOK { if rec.Code != http.StatusOK {
t.Fatalf(fmt.Sprintf("expected a %d response, found: %d with empty edge ID", http.StatusOK, rec.Code)) t.Fatalf("expected a %d response, found: %d with empty edge ID", http.StatusOK, rec.Code)
} }
updatedEndpoint, err := handler.DataStore.Endpoint().Endpoint(endpoint.ID) updatedEndpoint, err := handler.DataStore.Endpoint().Endpoint(endpoint.ID)
@ -326,7 +326,7 @@ func TestEdgeStackStatus(t *testing.T) {
handler.ServeHTTP(rec, req) handler.ServeHTTP(rec, req)
if rec.Code != http.StatusOK { if rec.Code != http.StatusOK {
t.Fatalf(fmt.Sprintf("expected a %d response, found: %d", http.StatusOK, rec.Code)) t.Fatalf("expected a %d response, found: %d", http.StatusOK, rec.Code)
} }
var data endpointEdgeStatusInspectResponse var data endpointEdgeStatusInspectResponse
@ -390,7 +390,7 @@ func TestEdgeJobsResponse(t *testing.T) {
handler.ServeHTTP(rec, req) handler.ServeHTTP(rec, req)
if rec.Code != http.StatusOK { if rec.Code != http.StatusOK {
t.Fatalf(fmt.Sprintf("expected a %d response, found: %d", http.StatusOK, rec.Code)) t.Fatalf("expected a %d response, found: %d", http.StatusOK, rec.Code)
} }
var data endpointEdgeStatusInspectResponse var data endpointEdgeStatusInspectResponse

5
api/http/handler/stacks/stack_associate.go
View File

@ -5,6 +5,7 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/pkg/errors"
portainer "github.com/portainer/portainer/api" portainer "github.com/portainer/portainer/api"
"github.com/portainer/portainer/api/http/security" "github.com/portainer/portainer/api/http/security"
"github.com/portainer/portainer/api/stacks/stackutils" "github.com/portainer/portainer/api/stacks/stackutils"
@ -94,8 +95,8 @@ func (handler *Handler) stackAssociate(w http.ResponseWriter, r *http.Request) *
return httperror.InternalServerError("Unable to verify user authorizations to validate stack deletion", err) return httperror.InternalServerError("Unable to verify user authorizations to validate stack deletion", err)
} }
if !canManage { if !canManage {
errMsg := "Stack management is disabled for non-admin users" errMsg := "stack management is disabled for non-admin users"
return httperror.Forbidden(errMsg, fmt.Errorf(errMsg)) return httperror.Forbidden(errMsg, errors.New(errMsg))
} }
stack.EndpointID = portainer.EndpointID(endpointID) stack.EndpointID = portainer.EndpointID(endpointID)

4
api/http/handler/stacks/stack_delete.go
View File

@ -109,7 +109,7 @@ func (handler *Handler) stackDelete(w http.ResponseWriter, r *http.Request) *htt
} }
if !canManage { if !canManage {
errMsg := "stack deletion is disabled for non-admin users" errMsg := "stack deletion is disabled for non-admin users"
return httperror.Forbidden(errMsg, fmt.Errorf(errMsg)) return httperror.Forbidden(errMsg, errors.New(errMsg))
} }
// stop scheduler updates of the stack before removal // stop scheduler updates of the stack before removal
@ -307,7 +307,7 @@ func (handler *Handler) stackDeleteKubernetesByName(w http.ResponseWriter, r *ht
} }
if !canManage { if !canManage {
errMsg := "stack deletion is disabled for non-admin users" errMsg := "stack deletion is disabled for non-admin users"
return httperror.Forbidden(errMsg, fmt.Errorf(errMsg)) return httperror.Forbidden(errMsg, errors.New(errMsg))
} }
stacksToDelete = append(stacksToDelete, stack) stacksToDelete = append(stacksToDelete, stack)