Fix linter issues. (#592)

metal-stack · Nov 11, 2024 · fe228e8 · fe228e8
1 parent 3f09c81
commit fe228e8
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 15 deletions.
diff --git a/cmd/metal-api/internal/eventbus/nsq.go b/cmd/metal-api/internal/eventbus/nsq.go
@@ -59,7 +59,7 @@ func (n *NSQClient) CreateEndpoints(lookupds ...string) error {
 }
 
 // WaitForTopicsCreated blocks until the topices are created within the given partitions.
-func (n NSQClient) WaitForTopicsCreated(partitions metal.Partitions, topics []metal.NSQTopic) {
+func (n *NSQClient) WaitForTopicsCreated(partitions metal.Partitions, topics []metal.NSQTopic) {
 	for {
 		if err := n.createTopics(partitions, topics); err != nil {
 			n.logger.Error("cannot create topics", "error", err)
@@ -71,7 +71,7 @@ func (n NSQClient) WaitForTopicsCreated(partitions metal.Partitions, topics []me
 }
 
 // CreateTopic creates a topic with given name.
-func (n NSQClient) CreateTopic(name string) error {
+func (n *NSQClient) CreateTopic(name string) error {
 	if err := n.Publisher.CreateTopic(name); err != nil {
 		n.logger.Error("cannot create topic", "topic", name)
 		return err
@@ -80,7 +80,7 @@ func (n NSQClient) CreateTopic(name string) error {
 	return nil
 }
 
-func (n NSQClient) createTopics(partitions metal.Partitions, topics []metal.NSQTopic) error {
+func (n *NSQClient) createTopics(partitions metal.Partitions, topics []metal.NSQTopic) error {
 	for _, topic := range topics {
 		if topic.PartitionAgnostic {
 			continue
@@ -106,6 +106,6 @@ func (n NSQClient) createTopics(partitions metal.Partitions, topics []metal.NSQT
 	return nil
 }
 
-func (n NSQClient) delay() {
+func (n *NSQClient) delay() {
 	time.Sleep(nsqdRetryDelay)
 }
diff --git a/cmd/metal-api/internal/grpc/grpc-server.go b/cmd/metal-api/internal/grpc/grpc-server.go
@@ -106,7 +106,7 @@ func Run(cfg *ServerConfig) error {
 	})
 	grpcPanicRecoveryHandler := func(p any) (err error) {
 		panicsTotal.Inc()
-		log.Error("msg", "recovered from panic", "panic", p, "stack", debug.Stack())
+		log.Error("recovered from panic", "panic", p, "stack", debug.Stack())
 		return status.Errorf(codes.Internal, "%s", p)
 	}
 

diff --git a/cmd/metal-api/internal/metal/filesystem.go b/cmd/metal-api/internal/metal/filesystem.go
@@ -169,7 +169,11 @@ type (
 )
 
 // Validate a existing FilesystemLayout
-func (f FilesystemLayout) Validate() error {
+func (f *FilesystemLayout) Validate() error {
+	if f == nil {
+		return nil
+	}
+
 	// check device existence from disk.partition -> raid.device -> filesystem
 	// collect all provided devices
 	providedDevices := make(map[string]bool)

diff --git a/cmd/metal-api/internal/metal/size_reservation.go b/cmd/metal-api/internal/metal/size_reservation.go
@@ -19,11 +19,16 @@ type SizeReservation struct {
 
 type SizeReservations []SizeReservation
 
-func (rs SizeReservations) BySize() map[string]SizeReservations {
+func (rs *SizeReservations) BySize() map[string]SizeReservations {
 	res := map[string]SizeReservations{}
-	for _, rv := range rs {
+	if rs == nil {
+		return res
+	}
+
+	for _, rv := range *rs {
 		res[rv.SizeID] = append(res[rv.SizeID], rv)
 	}
+
 	return res
 }
 

diff --git a/cmd/metal-api/internal/service/audit-service.go b/cmd/metal-api/internal/service/audit-service.go
@@ -28,7 +28,7 @@ func NewAudit(log *slog.Logger, a auditing.Auditing) *restful.WebService {
 	return ir.webService()
 }
 
-func (r auditResource) webService() *restful.WebService {
+func (r *auditResource) webService() *restful.WebService {
 	ws := new(restful.WebService)
 	ws.
 		Path(BasePath + "v1/audit").

diff --git a/cmd/metal-api/internal/service/firewall-service.go b/cmd/metal-api/internal/service/firewall-service.go
@@ -231,7 +231,7 @@ func (r *firewallResource) allocateFirewall(request *restful.Request, response *
 	r.send(request, response, http.StatusOK, resp)
 }
 
-func (r firewallResource) setVPNConfigInSpec(ctx context.Context, allocationSpec *machineAllocationSpec) error {
+func (r *firewallResource) setVPNConfigInSpec(ctx context.Context, allocationSpec *machineAllocationSpec) error {
 	if r.headscaleClient == nil {
 		return nil
 	}

diff --git a/cmd/metal-api/internal/service/image-service.go b/cmd/metal-api/internal/service/image-service.go
@@ -35,7 +35,7 @@ func NewImage(log *slog.Logger, ds *datastore.RethinkStore) *restful.WebService
 	return ir.webService()
 }
 
-func (ir imageResource) webService() *restful.WebService {
+func (ir *imageResource) webService() *restful.WebService {
 	ws := new(restful.WebService)
 	ws.
 		Path(BasePath + "v1/image").

diff --git a/cmd/metal-api/internal/service/image-service_test.go b/cmd/metal-api/internal/service/image-service_test.go
@@ -6,7 +6,6 @@ import (
 	"log/slog"
 	"net/http"
 	"net/http/httptest"
-	"strings"
 	"testing"
 
 	"github.com/metal-stack/metal-api/cmd/metal-api/internal/datastore"
@@ -183,7 +182,7 @@ func TestCreateImageWithBrokenURL(t *testing.T) {
 	var result httperrors.HTTPErrorResponse
 	err = json.NewDecoder(resp.Body).Decode(&result)
 	require.NoError(t, err)
-	require.True(t, strings.Contains(result.Message, "is not accessible under"))
+	require.Contains(t, result.Message, "is not accessible under")
 
 	createRequest.URL = "http://images.metal-stack.io/this-file-does-not-exist"
 

diff --git a/cmd/metal-api/internal/service/machine-service.go b/cmd/metal-api/internal/service/machine-service.go
@@ -754,7 +754,7 @@ func (r *machineResource) setMachineState(request *restful.Request, response *re
 	r.send(request, response, http.StatusOK, resp)
 }
 
-func (r machineResource) findIPMIMachine(request *restful.Request, response *restful.Response) {
+func (r *machineResource) findIPMIMachine(request *restful.Request, response *restful.Response) {
 	id := request.PathParameter("id")
 
 	m, err := r.ds.FindMachineByID(id)
@@ -1782,7 +1782,7 @@ func uniqueTags(tags []string) []string {
 	return uniqueTags
 }
 
-func (r machineResource) freeMachine(request *restful.Request, response *restful.Response) {
+func (r *machineResource) freeMachine(request *restful.Request, response *restful.Response) {
 	id := request.PathParameter("id")
 	m, err := r.ds.FindMachineByID(id)
 	if err != nil {