linting

metal-toolbox · Sep 25, 2023 · befda1e · befda1e
1 parent 27468e5
commit befda1e
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/internal/app/app.go b/internal/app/app.go
@@ -5,8 +5,6 @@ import (
 	"os"
 
 	"github.com/bmc-toolbox/common"
-	"github.com/sirupsen/logrus"
-	"github.com/spf13/viper"
 	"github.com/metal-toolbox/firmware-syncer/internal/config"
 	"github.com/metal-toolbox/firmware-syncer/internal/vendors"
 	"github.com/metal-toolbox/firmware-syncer/internal/vendors/asrockrack"
@@ -15,6 +13,8 @@ import (
 	"github.com/metal-toolbox/firmware-syncer/internal/vendors/intel"
 	"github.com/metal-toolbox/firmware-syncer/internal/vendors/mellanox"
 	"github.com/metal-toolbox/firmware-syncer/internal/vendors/supermicro"
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/viper"
 )
 
 var (
@@ -51,9 +51,9 @@ func New(configFile string, logLevel int) (*Syncer, error) {
 	v.SetConfigFile("config.yaml")
 	v.AddConfigPath(".")
 	err := v.ReadInConfig()
+
 	if err != nil {
 		logger.Error("Failed to find viper config file")
-		// return nil, err
 	}
 
 	// Load configuration

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -11,9 +11,9 @@ import (
 	"strings"
 	"time"
 
-	"gopkg.in/yaml.v2"
-	"github.com/spf13/viper"
 	"github.com/sirupsen/logrus"
+	"github.com/spf13/viper"
+	"gopkg.in/yaml.v2"
 
 	serverservice "go.hollow.sh/serverservice/pkg/api/v1"
 )
@@ -149,11 +149,11 @@ func ParseRepositoryURL(repositoryURL string) (endpoint, bucket string, err erro
 	return u.Host, bucket, nil
 }
 
-func LoadEnvironmentVariable(v* viper.Viper, logger *logrus.Logger, key string) (string) {
+func LoadEnvironmentVariable(v *viper.Viper, logger *logrus.Logger, key string) string {
 	val := v.Get(key)
 	if val == nil {
 		logger.Warnf("Failed to find %s in config.yaml", key)
 	}
 
 	return val.(string)
-}
+}
diff --git a/internal/inventory/serverservice.go b/internal/inventory/serverservice.go
@@ -10,10 +10,10 @@ import (
 	"github.com/metal-toolbox/firmware-syncer/internal/config"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	"golang.org/x/exp/slices"
-	"golang.org/x/oauth2/clientcredentials"
 	"github.com/spf13/viper"
 	serverservice "go.hollow.sh/serverservice/pkg/api/v1"
+	"golang.org/x/exp/slices"
+	"golang.org/x/oauth2/clientcredentials"
 )
 
 var (
@@ -27,7 +27,7 @@ type ServerService struct {
 	logger       *logrus.Logger
 }
 
-func New(ctx context.Context, serverServiceURL, artifactsURL string, logger *logrus.Logger, v* viper.Viper) (*ServerService, error) {
+func New(ctx context.Context, serverServiceURL, artifactsURL string, logger *logrus.Logger, v *viper.Viper) (*ServerService, error) {
 	if artifactsURL == "" {
 		return nil, errors.New("missing artifacts URL")
 	}

diff --git a/internal/vendors/asrockrack/asrockrack.go b/internal/vendors/asrockrack/asrockrack.go
@@ -6,11 +6,11 @@ import (
 	"github.com/metal-toolbox/firmware-syncer/internal/config"
 	"github.com/metal-toolbox/firmware-syncer/internal/inventory"
 	"github.com/metal-toolbox/firmware-syncer/internal/vendors"
-	"github.com/spf13/viper"
 	"github.com/pkg/errors"
 	rcloneFs "github.com/rclone/rclone/fs"
 	rcloneOperations "github.com/rclone/rclone/fs/operations"
 	"github.com/sirupsen/logrus"
+	"github.com/spf13/viper"
 	serverservice "go.hollow.sh/serverservice/pkg/api/v1"
 )
 
@@ -27,7 +27,7 @@ type ASRockRack struct {
 	tmpFs     rcloneFs.Fs
 }
 
-func New(ctx context.Context, firmwares []*serverservice.ComponentFirmwareVersion, cfgSyncer *config.Syncer, logger *logrus.Logger, v* viper.Viper) (vendors.Vendor, error) {
+func New(ctx context.Context, firmwares []*serverservice.ComponentFirmwareVersion, cfgSyncer *config.Syncer, logger *logrus.Logger, v *viper.Viper) (vendors.Vendor, error) {
 	// RepositoryURL required
 	if cfgSyncer.RepositoryURL == "" {
 		return nil, errors.Wrap(config.ErrProviderAttributes, "RepositoryURL not defined")

diff --git a/internal/vendors/dell/dell.go b/internal/vendors/dell/dell.go
@@ -29,7 +29,7 @@ type DUP struct {
 }
 
 // NewDUP returns a new DUP firmware syncer object
-func NewDUP(ctx context.Context, firmwares []*serverservice.ComponentFirmwareVersion, cfgSyncer *config.Syncer, logger *logrus.Logger, v* viper.Viper) (vendors.Vendor, error) {
+func NewDUP(ctx context.Context, firmwares []*serverservice.ComponentFirmwareVersion, cfgSyncer *config.Syncer, logger *logrus.Logger, v *viper.Viper) (vendors.Vendor, error) {
 	// RepositoryURL required
 	if cfgSyncer.RepositoryURL == "" {
 		return nil, errors.Wrap(config.ErrProviderAttributes, "RepositoryURL not defined")

diff --git a/internal/vendors/equinix/equinix.go b/internal/vendors/equinix/equinix.go
@@ -36,7 +36,7 @@ type Equinix struct {
 	tmpFs     fs.Fs
 }
 
-func New(ctx context.Context, firmwares []*serverservice.ComponentFirmwareVersion, cfgSyncer *config.Syncer, logger *logrus.Logger, v* viper.Viper) (vendors.Vendor, error) {
+func New(ctx context.Context, firmwares []*serverservice.ComponentFirmwareVersion, cfgSyncer *config.Syncer, logger *logrus.Logger, v *viper.Viper) (vendors.Vendor, error) {
 	// RepositoryURL required
 	if cfgSyncer.RepositoryURL == "" {
 		return nil, errors.Wrap(config.ErrProviderAttributes, "RepositoryURL not defined")

diff --git a/internal/vendors/intel/intel.go b/internal/vendors/intel/intel.go
@@ -27,7 +27,7 @@ type Intel struct {
 	tmpFs     fs.Fs
 }
 
-func New(ctx context.Context, firmwares []*serverservice.ComponentFirmwareVersion, cfgSyncer *config.Syncer, logger *logrus.Logger, v* viper.Viper) (vendors.Vendor, error) {
+func New(ctx context.Context, firmwares []*serverservice.ComponentFirmwareVersion, cfgSyncer *config.Syncer, logger *logrus.Logger, v *viper.Viper) (vendors.Vendor, error) {
 	// RepositoryURL required
 	if cfgSyncer.RepositoryURL == "" {
 		return nil, errors.Wrap(config.ErrProviderAttributes, "RepositoryURL not defined")

diff --git a/internal/vendors/mellanox/mellanox.go b/internal/vendors/mellanox/mellanox.go
@@ -28,7 +28,7 @@ type Mellanox struct {
 	inventory *inventory.ServerService
 }
 
-func New(ctx context.Context, firmwares []*serverservice.ComponentFirmwareVersion, cfgSyncer *config.Syncer, logger *logrus.Logger, v* viper.Viper) (vendors.Vendor, error) {
+func New(ctx context.Context, firmwares []*serverservice.ComponentFirmwareVersion, cfgSyncer *config.Syncer, logger *logrus.Logger, v *viper.Viper) (vendors.Vendor, error) {
 	// RepositoryURL required
 	if cfgSyncer.RepositoryURL == "" {
 		return nil, errors.Wrap(config.ErrProviderAttributes, "RepositoryURL not defined")

diff --git a/internal/vendors/supermicro/supermicro.go b/internal/vendors/supermicro/supermicro.go
@@ -33,7 +33,7 @@ type Supermicro struct {
 	tmpFs     fs.Fs
 }
 
-func New(ctx context.Context, firmwares []*serverservice.ComponentFirmwareVersion, cfgSyncer *config.Syncer, logger *logrus.Logger, v* viper.Viper) (vendors.Vendor, error) {
+func New(ctx context.Context, firmwares []*serverservice.ComponentFirmwareVersion, cfgSyncer *config.Syncer, logger *logrus.Logger, v *viper.Viper) (vendors.Vendor, error) {
 	// RepositoryURL required
 	if cfgSyncer.RepositoryURL == "" {
 		return nil, errors.Wrap(config.ErrProviderAttributes, "RepositoryURL not defined")