fix: golang lint error [BE-11235] (#12215)

pull/12243/head
Oscar Zhou 2 months ago committed by GitHub
parent bdb84617fe
commit 33ac61c600
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -78,7 +78,7 @@ func (handler *Handler) imagesList(w http.ResponseWriter, r *http.Request) *http
imagesList := make([]ImageResponse, len(images)) imagesList := make([]ImageResponse, len(images))
for i, image := range images { for i, image := range images {
if (image.RepoTags == nil || len(image.RepoTags) == 0) && (image.RepoDigests != nil && len(image.RepoDigests) > 0) { if len(image.RepoTags) == 0 && len(image.RepoDigests) > 0 {
for _, repoDigest := range image.RepoDigests { for _, repoDigest := range image.RepoDigests {
image.RepoTags = append(image.RepoTags, repoDigest[0:strings.Index(repoDigest, "@")]+":<none>") image.RepoTags = append(image.RepoTags, repoDigest[0:strings.Index(repoDigest, "@")]+":<none>")
} }

@ -154,7 +154,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)
} }
} }
@ -179,7 +179,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)
} }
} }
} }
@ -219,7 +219,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)
@ -262,7 +262,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
@ -391,7 +391,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

@ -1,6 +1,7 @@
package stacks package stacks
import ( import (
"errors"
"fmt" "fmt"
"net/http" "net/http"
"time" "time"
@ -95,7 +96,7 @@ func (handler *Handler) stackAssociate(w http.ResponseWriter, r *http.Request) *
} }
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)

@ -111,7 +111,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
@ -338,7 +338,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)

Loading…
Cancel
Save