chore(fmt): Enable disabled linters in global scope

== wsl * Fixed everywhere. == lll * Fix everywhere. * Added exception on `https://` links. == gochecknoglobals * Fixed everywhere. == gci * Fixed everywhere (with `golangci-lint run --fix`) == godox No TODO comments should live in the code without filed issues to track them. The reason is simple: if we have a comment with "todo", it has the same value as not having that comment at all, because no one will care about it. * No TODO, BUG, and FIXME comments in the code. * Except if it has a filed github issue reference. == gosec * Removed all nolint comments for gosec. * Added 2 items to the exclude list for gosec.
liquidmetal-dev · Nov 9, 2021 · efe4f5d · efe4f5d
1 parent d60a54e
commit efe4f5d
Show file tree

Hide file tree

Showing 45 changed files with 392 additions and 203 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -28,6 +28,9 @@ issues:
   - text: "local replacement are not allowed: github.com/weaveworks/flintlock/"
     linters:
     - gomoddirectives
+  - source: "https://"
+    linters:
+    - lll
   - path: _test\.go
     linters:
     - goerr113
@@ -45,7 +48,9 @@ issues:
     linters:
     - exhaustivestruct
     - lll
-
+  - source: "// .* #\\d+"
+    linters:
+    - godox
 linters-settings:
   funlen:
     lines: 110
@@ -57,61 +62,70 @@ linters-settings:
   cyclop:
     max-complexity: 12
     skip-tests: true
+  gosec:
+    excludes:
+    - G204   # Subprocess launched with function call as argument or cmd arguments
+    - G404   # Use of weak random number generator (math/rand instead of crypto/rand)
+    exclude-generated: true
+  lll:
+    line-length: 120
+  misspell:
+    locale: GB
 
 linters:
   disable-all: true
   enable:
-  - deadcode
-  - errcheck
-  - gosimple
-  - govet
-  - ineffassign
-  - staticcheck
-  - structcheck
-  - typecheck
-  - unused
-  - varcheck
   - bodyclose
+  - deadcode
   - depguard
   - dogsled
   - dupl
+  - errcheck
   - exhaustive
   - exportloopref
+  - exportloopref
   - funlen
+  - gci
+  - gochecknoglobals
   - gochecknoinits
   - gocognit
   - goconst
   - gocritic
   - gocyclo
   - godot
+  - godox
   - goerr113
   - gofmt
   - gofumpt
   - goheader
   - goimports
-  - revive
   - gomnd
   - gomodguard
   - goprintffuncname
   - gosec
+  - gosimple
+  - govet
+  - ineffassign
+  - lll
   - misspell
   - nakedret
   - nestif
   - nlreturn
   - noctx
   - nolintlint
   - prealloc
+  - revive
   - rowserrcheck
-  - exportloopref
   - sqlclosecheck
+  - staticcheck
+  - structcheck
   - stylecheck
   - testpackage
+  - typecheck
   - unconvert
   - unparam
+  - unused
+  - varcheck
   - whitespace
-  disabled:
-  - gci
-  - godox
-  - gochecknoglobals
-  - lll
   - wsl
+  disabled: []
diff --git a/core/application/commands.go b/core/application/commands.go
@@ -25,10 +25,12 @@ func (a *app) CreateMicroVM(ctx context.Context, mvm *models.MicroVM) (*models.M
 		if err != nil {
 			return nil, fmt.Errorf("generating random name for microvm: %w", err)
 		}
+
 		vmid, err := models.NewVMID(name, defaults.MicroVMNamespace)
 		if err != nil {
 			return nil, fmt.Errorf("creating vmid: %w", err)
 		}
+
 		mvm.ID = *vmid
 	}
 
@@ -49,8 +51,6 @@ func (a *app) CreateMicroVM(ctx context.Context, mvm *models.MicroVM) (*models.M
 		}
 	}
 
-	// TODO: validate the spec
-
 	// Set the timestamp when the VMspec was created.
 	mvm.Spec.CreatedAt = a.ports.Clock().Unix()
 	mvm.Status.State = models.PendingState

diff --git a/core/application/reconcile.go b/core/application/reconcile.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	"github.com/sirupsen/logrus"
-
 	"github.com/weaveworks/flintlock/core/models"
 	"github.com/weaveworks/flintlock/core/plans"
 	"github.com/weaveworks/flintlock/core/ports"
@@ -18,6 +17,7 @@ func (a *app) ReconcileMicroVM(ctx context.Context, id, namespace string) error
 	logger := log.GetLogger(ctx).WithField("action", "reconcile")
 
 	logger.Debugf("Getting spec for %s/%s", namespace, id)
+
 	spec, err := a.ports.Repo.Get(ctx, ports.RepositoryGetOptions{
 		Name:      id,
 		Namespace: namespace,
@@ -35,8 +35,8 @@ func (a *app) ResyncMicroVMs(ctx context.Context, namespace string) error {
 		"namespace": "ns",
 	})
 	logger.Info("Resyncing specs")
-
 	logger.Debug("Getting all specs")
+
 	specs, err := a.ports.Repo.GetAll(ctx, namespace)
 	if err != nil {
 		return fmt.Errorf("getting all microvm specs for resync: %w", err)

diff --git a/core/models/network.go b/core/models/network.go
@@ -5,7 +5,7 @@ type NetworkInterface struct {
 	// GuestDeviceName is the name of the network interface to create in the microvm.
 	GuestDeviceName string `json:"guest_device_name" validate:"required,excludesall=/@,guestDeviceName"`
 	// AllowMetadataRequests indicates that this interface can be used for metadata requests.
-	// TODO: we may hide this within the firecracker plugin.
+	// TODO: we may hide this within the firecracker plugin. #179
 	AllowMetadataRequests bool `json:"allow_mmds,omitempty"`
 	// GuestMAC allows the specifying of a specifi MAC address to use for the interface. If
 	// not supplied a autogenerated MAC address will be used.
@@ -14,8 +14,6 @@ type NetworkInterface struct {
 	Type IfaceType `json:"type" validate:"oneof=tap macvtap unsupported"`
 	// Address is an optional IP address to assign to this interface. If not supplied then DHCP will be used.
 	Address string `json:"address,omitempty" validate:"omitempty,cidr"`
-	// TODO: add rate limiting.
-	// TODO: add CNI.
 }
 
 type NetworkInterfaceStatus struct {

diff --git a/core/models/vmid.go b/core/models/vmid.go
@@ -29,6 +29,7 @@ func NewVMID(name, namespace string) (*VMID, error) {
 	if name == "" {
 		return nil, coreerrs.ErrNameRequired
 	}
+
 	if namespace == "" {
 		return nil, coreerrs.ErrNamespaceRequired
 	}
@@ -98,6 +99,7 @@ func splitVMIDFromString(id string) (namespace string, name string, err error) {
 	if parts[0] == "" {
 		return "", "", coreerrs.ErrNamespaceRequired
 	}
+
 	if parts[1] == "" {
 		return "", "", coreerrs.ErrNameRequired
 	}

diff --git a/core/models/volumes.go b/core/models/volumes.go
@@ -17,7 +17,6 @@ type Volume struct {
 	PartitionID string `json:"partition_id,omitempty"`
 	// Size is the size to resize this volume to.
 	Size int32 `json:"size,omitempty"`
-	// TODO: add rate limiting.
 }
 
 // Volumes represents a collection of volumes.
@@ -38,7 +37,6 @@ func (v Volumes) GetByID(id string) *Volume {
 type VolumeSource struct {
 	// Container is used to specify a source of a volume as a OCI container.
 	Container *ContainerVolumeSource `json:"container,omitempty"`
-	// TODO: add CSI.
 }
 
 // ContainerDriveSource represents the details of a volume coming from a OCI image.

diff --git a/core/plans/microvm_create_update.go b/core/plans/microvm_create_update.go
@@ -107,25 +107,32 @@ func (p *microvmCreateOrUpdatePlan) addStep(ctx context.Context, step planner.Pr
 	return nil
 }
 
-func (p *microvmCreateOrUpdatePlan) addImageSteps(ctx context.Context, vm *models.MicroVM, imageSvc ports.ImageService) error {
+func (p *microvmCreateOrUpdatePlan) addImageSteps(ctx context.Context,
+	vm *models.MicroVM,
+	imageSvc ports.ImageService,
+) error {
 	for i := range vm.Spec.Volumes {
 		vol := vm.Spec.Volumes[i]
+
 		status, ok := vm.Status.Volumes[vol.ID]
 		if !ok {
 			status = &models.VolumeStatus{}
 			vm.Status.Volumes[vol.ID] = status
 		}
+
 		if vol.Source.Container != nil {
 			if err := p.addStep(ctx, runtime.NewVolumeMount(&vm.ID, &vol, status, imageSvc)); err != nil {
 				return fmt.Errorf("adding volume mount step: %w", err)
 			}
 		}
 	}
+
 	if string(vm.Spec.Kernel.Image) != "" {
 		if err := p.addStep(ctx, runtime.NewKernelMount(vm, imageSvc)); err != nil {
 			return fmt.Errorf("adding kernel mount step: %w", err)
 		}
 	}
+
 	if vm.Spec.Initrd != nil {
 		if err := p.addStep(ctx, runtime.NewInitrdMount(vm, imageSvc)); err != nil {
 			return fmt.Errorf("adding initrd mount step: %w", err)
@@ -135,14 +142,19 @@ func (p *microvmCreateOrUpdatePlan) addImageSteps(ctx context.Context, vm *model
 	return nil
 }
 
-func (p *microvmCreateOrUpdatePlan) addNetworkSteps(ctx context.Context, vm *models.MicroVM, networkSvc ports.NetworkService) error {
+func (p *microvmCreateOrUpdatePlan) addNetworkSteps(ctx context.Context,
+	vm *models.MicroVM,
+	networkSvc ports.NetworkService,
+) error {
 	for i := range vm.Spec.NetworkInterfaces {
 		iface := vm.Spec.NetworkInterfaces[i]
+
 		status, ok := vm.Status.NetworkInterfaces[iface.GuestDeviceName]
 		if !ok {
 			status = &models.NetworkInterfaceStatus{}
 			vm.Status.NetworkInterfaces[iface.GuestDeviceName] = status
 		}
+
 		if err := p.addStep(ctx, network.NewNetworkInterface(&vm.ID, &iface, status, networkSvc)); err != nil {
 			return fmt.Errorf("adding create network interface step: %w", err)
 		}

diff --git a/core/plans/microvm_delete.go b/core/plans/microvm_delete.go
@@ -119,7 +119,11 @@ func (p *microvmDeletePlan) addStep(ctx context.Context, step planner.Procedure)
 	return nil
 }
 
-func (p *microvmDeletePlan) addNetworkSteps(ctx context.Context, vm *models.MicroVM, networkSvc ports.NetworkService) error {
+func (p *microvmDeletePlan) addNetworkSteps(
+	ctx context.Context,
+	vm *models.MicroVM,
+	networkSvc ports.NetworkService,
+) error {
 	for i := range vm.Spec.NetworkInterfaces {
 		iface := vm.Spec.NetworkInterfaces[i]
 

diff --git a/core/steps/event/publish.go b/core/steps/event/publish.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	"github.com/sirupsen/logrus"
-
 	"github.com/weaveworks/flintlock/core/ports"
 	"github.com/weaveworks/flintlock/pkg/log"
 	"github.com/weaveworks/flintlock/pkg/planner"

diff --git a/core/steps/microvm/start.go b/core/steps/microvm/start.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	"github.com/sirupsen/logrus"
-
 	"github.com/weaveworks/flintlock/core/errors"
 	"github.com/weaveworks/flintlock/core/models"
 	"github.com/weaveworks/flintlock/core/ports"

diff --git a/core/steps/network/interface_create.go b/core/steps/network/interface_create.go
@@ -12,7 +12,11 @@ import (
 	"github.com/weaveworks/flintlock/pkg/planner"
 )
 
-func NewNetworkInterface(vmid *models.VMID, iface *models.NetworkInterface, status *models.NetworkInterfaceStatus, svc ports.NetworkService) planner.Procedure {
+func NewNetworkInterface(vmid *models.VMID,
+	iface *models.NetworkInterface,
+	status *models.NetworkInterfaceStatus,
+	svc ports.NetworkService,
+) planner.Procedure {
 	return &createInterface{
 		vmid:   vmid,
 		iface:  iface,
@@ -77,6 +81,7 @@ func (s *createInterface) Do(ctx context.Context) ([]planner.Procedure, error) {
 	if err != nil {
 		return nil, fmt.Errorf("checking if networking interface exists: %w", err)
 	}
+
 	if exists {
 		// This whole block is unreachable right now, because
 		// the Do function is called only if ShouldDo returns

diff --git a/core/steps/network/interface_delete.go b/core/steps/network/interface_delete.go
@@ -11,7 +11,11 @@ import (
 	"github.com/weaveworks/flintlock/pkg/planner"
 )
 
-func DeleteNetworkInterface(vmid *models.VMID, iface *models.NetworkInterface, svc ports.NetworkService) planner.Procedure {
+func DeleteNetworkInterface(
+	vmid *models.VMID,
+	iface *models.NetworkInterface,
+	svc ports.NetworkService,
+) planner.Procedure {
 	return deleteInterface{
 		vmid:  vmid,
 		iface: iface,

diff --git a/core/steps/runtime/dir_create.go b/core/steps/runtime/dir_create.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/afero"
-
 	"github.com/weaveworks/flintlock/pkg/log"
 	"github.com/weaveworks/flintlock/pkg/planner"
 )
@@ -38,8 +37,8 @@ func (s *createDirectory) ShouldDo(ctx context.Context) (bool, error) {
 		"mode": s.mode.String(),
 	})
 	logger.Debug("checking if procedure should be run")
-
 	logger.Trace("checking if directory exists")
+
 	exists, err := s.directoryExists()
 	if err != nil {
 		return false, err
@@ -50,6 +49,7 @@ func (s *createDirectory) ShouldDo(ctx context.Context) (bool, error) {
 	}
 
 	logger.Trace("checking directory permissions")
+
 	info, err := s.fs.Stat(s.dir)
 	if err != nil {
 		return false, fmt.Errorf("doing stat on %s: %w", s.dir, err)
@@ -78,14 +78,17 @@ func (s *createDirectory) Do(ctx context.Context) ([]planner.Procedure, error) {
 	if err != nil {
 		return nil, err
 	}
+
 	if !exists {
 		logger.Trace("creating directory")
+
 		if err := s.fs.Mkdir(s.dir, s.mode); err != nil {
 			return nil, fmt.Errorf("creating directory %s: %w", s.dir, err)
 		}
 	}
 
 	logger.Trace("setting permissions for directory")
+
 	if err := s.fs.Chmod(s.dir, s.mode); err != nil {
 		return nil, fmt.Errorf("changing directory permissions for %s: %w", s.dir, err)
 	}

diff --git a/core/steps/runtime/dir_delete.go b/core/steps/runtime/dir_delete.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/afero"
-
 	"github.com/weaveworks/flintlock/pkg/log"
 	"github.com/weaveworks/flintlock/pkg/planner"
 )
@@ -52,8 +51,10 @@ func (s *deleteDirectory) Do(ctx context.Context) ([]planner.Procedure, error) {
 	if err != nil {
 		return nil, err
 	}
+
 	if exists {
 		logger.Trace("deleting directory")
+
 		if err := s.fs.RemoveAll(s.dir); err != nil {
 			return nil, fmt.Errorf("deleting directory %s: %w", s.dir, err)
 		}