scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 03:27:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few vet warnings (#5674)

Browse Source
This commit is contained in:
Jim Kalafut
2018-11-02 13:21:44 -07:00
committed by GitHub
parent a4c693014b
commit 5dc74f4af5
3 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
command/operator_migrate.go
View File

@@ -184,6 +184,7 @@ func (c *OperatorMigrateCommand) migrate(config *migratorConfig) error {
select { select {
case err := <-doneCh: case err := <-doneCh:
cancelFunc()
return err return err
case <-c.ShutdownCh: case <-c.ShutdownCh:
c.UI.Output("==> Migration shutdown triggered\n") c.UI.Output("==> Migration shutdown triggered\n")
@@ -191,7 +192,6 @@ func (c *OperatorMigrateCommand) migrate(config *migratorConfig) error {
<-doneCh <-doneCh
return errAbort return errAbort
} }
return nil
} }
// migrateAll copies all keys in lexicographic order. // migrateAll copies all keys in lexicographic order.

1
command/server.go
View File

@@ -1842,7 +1842,6 @@ func (c *ServerCommand) storageMigrationActive(backend physical.Backend) bool {
return true return true
} }
} }
return false
} }
type StorageMigrationStatus struct { type StorageMigrationStatus struct {

2
vault/token_store.go
View File

@@ -905,8 +905,6 @@ func (ts *TokenStore) create(ctx context.Context, entry *logical.TokenEntry) err
default: default:
return fmt.Errorf("cannot create a token of type %d", entry.Type) return fmt.Errorf("cannot create a token of type %d", entry.Type)
} }
return errors.New("unreachable code")
} }
// Store is used to store an updated token entry without writing the // Store is used to store an updated token entry without writing the