From 9b9b2731ba84f6673ceb3ac9803ec58fabc478e2 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Tue, 23 May 2017 21:01:19 +0200 Subject: [PATCH] refactor(api): fix lint issues --- api/bolt/version_service.go | 10 +++++----- api/cli/cli.go | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/api/bolt/version_service.go b/api/bolt/version_service.go index 2da511437..1f35cfc40 100644 --- a/api/bolt/version_service.go +++ b/api/bolt/version_service.go @@ -8,21 +8,21 @@ import ( "github.com/boltdb/bolt" ) -// EndpointService represents a service for managing users. +// VersionService represents a service to manage stored versions. type VersionService struct { store *Store } const ( - DBVersionKey = "DB_VERSION" + dBVersionKey = "DB_VERSION" ) -// DBVersion the stored database version. +// DBVersion retrieves the stored database version. func (service *VersionService) DBVersion() (int, error) { var data []byte err := service.store.db.View(func(tx *bolt.Tx) error { bucket := tx.Bucket([]byte(versionBucketName)) - value := bucket.Get([]byte(DBVersionKey)) + value := bucket.Get([]byte(dBVersionKey)) if value == nil { return portainer.ErrDBVersionNotFound } @@ -49,7 +49,7 @@ func (service *VersionService) StoreDBVersion(version int) error { bucket := tx.Bucket([]byte(versionBucketName)) data := []byte(strconv.Itoa(version)) - err := bucket.Put([]byte(DBVersionKey), data) + err := bucket.Put([]byte(dBVersionKey), data) if err != nil { return err } diff --git a/api/cli/cli.go b/api/cli/cli.go index 72a4560f8..68a017b1d 100644 --- a/api/cli/cli.go +++ b/api/cli/cli.go @@ -15,12 +15,12 @@ import ( type Service struct{} const ( - errInvalidEndpointProtocol = portainer.Error("Invalid endpoint protocol: Portainer only supports unix:// or tcp://") - errSocketNotFound = portainer.Error("Unable to locate Unix socket") - errEndpointsFileNotFound = portainer.Error("Unable to locate external endpoints file") - errInvalidSyncInterval = portainer.Error("Invalid synchronization interval") - errEndpointExcludeExternal = portainer.Error("Cannot use the -H flag mutually with --external-endpoints") - errNoAuthExcludeAdminPassword = portainer.Error("Cannot use --no-auth with --admin-password") + errInvalidEndpointProtocol = portainer.Error("Invalid endpoint protocol: Portainer only supports unix:// or tcp://") + errSocketNotFound = portainer.Error("Unable to locate Unix socket") + errEndpointsFileNotFound = portainer.Error("Unable to locate external endpoints file") + errInvalidSyncInterval = portainer.Error("Invalid synchronization interval") + errEndpointExcludeExternal = portainer.Error("Cannot use the -H flag mutually with --external-endpoints") + errNoAuthExcludeAdminPassword = portainer.Error("Cannot use --no-auth with --admin-password") ) // ParseFlags parse the CLI flags and return a portainer.Flags struct @@ -75,9 +75,9 @@ func (*Service) ValidateFlags(flags *portainer.CLIFlags) error { return err } - if *flags.NoAuth && (*flags.AdminPassword != "") { - return errNoAuthExcludeAdminPassword - } + if *flags.NoAuth && (*flags.AdminPassword != "") { + return errNoAuthExcludeAdminPassword + } return nil }