From 0daeea22f8cf1ea1f227df4a6d4275f63892475b Mon Sep 17 00:00:00 2001 From: Felix Pojtinger Date: Wed, 8 Dec 2021 00:30:47 +0100 Subject: [PATCH] refactor: Pull SQLBoiler debug config up to root `cmd` --- cmd/stbak/cmd/archive.go | 5 ----- cmd/stbak/cmd/delete.go | 5 ----- cmd/stbak/cmd/find.go | 5 ----- cmd/stbak/cmd/list.go | 5 ----- cmd/stbak/cmd/move.go | 5 ----- cmd/stbak/cmd/recovery_index.go | 5 ----- cmd/stbak/cmd/restore.go | 5 ----- cmd/stbak/cmd/root.go | 9 +++++++++ cmd/stbak/cmd/update.go | 5 ----- 9 files changed, 9 insertions(+), 40 deletions(-) diff --git a/cmd/stbak/cmd/archive.go b/cmd/stbak/cmd/archive.go index 5b9081d..735f6f0 100644 --- a/cmd/stbak/cmd/archive.go +++ b/cmd/stbak/cmd/archive.go @@ -13,7 +13,6 @@ import ( "github.com/pojntfx/stfs/pkg/recovery" "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/volatiletech/sqlboiler/v4/boil" ) const ( @@ -46,10 +45,6 @@ var archiveCmd = &cobra.Command{ return keys.CheckKeyAccessible(viper.GetString(signatureFlag), viper.GetString(identityFlag)) }, RunE: func(cmd *cobra.Command, args []string) error { - if viper.GetBool(verboseFlag) { - boil.DebugMode = true - } - metadataPersister := persisters.NewMetadataPersister(viper.GetString(metadataFlag)) if err := metadataPersister.Open(); err != nil { return err diff --git a/cmd/stbak/cmd/delete.go b/cmd/stbak/cmd/delete.go index 90ca702..2de3bde 100644 --- a/cmd/stbak/cmd/delete.go +++ b/cmd/stbak/cmd/delete.go @@ -6,7 +6,6 @@ import ( "github.com/pojntfx/stfs/pkg/operations" "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/volatiletech/sqlboiler/v4/boil" ) const ( @@ -29,10 +28,6 @@ var deleteCmd = &cobra.Command{ return keys.CheckKeyAccessible(viper.GetString(signatureFlag), viper.GetString(identityFlag)) }, RunE: func(cmd *cobra.Command, args []string) error { - if viper.GetBool(verboseFlag) { - boil.DebugMode = true - } - pubkey, err := keys.ReadKey(viper.GetString(encryptionFlag), viper.GetString(recipientFlag)) if err != nil { return err diff --git a/cmd/stbak/cmd/find.go b/cmd/stbak/cmd/find.go index 53029fb..411439a 100644 --- a/cmd/stbak/cmd/find.go +++ b/cmd/stbak/cmd/find.go @@ -4,7 +4,6 @@ import ( "github.com/pojntfx/stfs/pkg/inventory" "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/volatiletech/sqlboiler/v4/boil" ) const ( @@ -20,10 +19,6 @@ var findCmd = &cobra.Command{ return err } - if viper.GetBool(verboseFlag) { - boil.DebugMode = true - } - if _, err := inventory.Find( inventory.MetadataConfig{ Metadata: viper.GetString(metadataFlag), diff --git a/cmd/stbak/cmd/list.go b/cmd/stbak/cmd/list.go index 5e93a80..76ac590 100644 --- a/cmd/stbak/cmd/list.go +++ b/cmd/stbak/cmd/list.go @@ -4,7 +4,6 @@ import ( "github.com/pojntfx/stfs/pkg/inventory" "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/volatiletech/sqlboiler/v4/boil" ) var listCmd = &cobra.Command{ @@ -16,10 +15,6 @@ var listCmd = &cobra.Command{ return err } - if viper.GetBool(verboseFlag) { - boil.DebugMode = true - } - if _, err := inventory.List( inventory.MetadataConfig{ Metadata: viper.GetString(metadataFlag), diff --git a/cmd/stbak/cmd/move.go b/cmd/stbak/cmd/move.go index c55280b..0747ff7 100644 --- a/cmd/stbak/cmd/move.go +++ b/cmd/stbak/cmd/move.go @@ -6,7 +6,6 @@ import ( "github.com/pojntfx/stfs/pkg/operations" "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/volatiletech/sqlboiler/v4/boil" ) var moveCmd = &cobra.Command{ @@ -25,10 +24,6 @@ var moveCmd = &cobra.Command{ return keys.CheckKeyAccessible(viper.GetString(signatureFlag), viper.GetString(identityFlag)) }, RunE: func(cmd *cobra.Command, args []string) error { - if viper.GetBool(verboseFlag) { - boil.DebugMode = true - } - pubkey, err := keys.ReadKey(viper.GetString(encryptionFlag), viper.GetString(recipientFlag)) if err != nil { return err diff --git a/cmd/stbak/cmd/recovery_index.go b/cmd/stbak/cmd/recovery_index.go index 0a92c51..c12a4c7 100644 --- a/cmd/stbak/cmd/recovery_index.go +++ b/cmd/stbak/cmd/recovery_index.go @@ -10,7 +10,6 @@ import ( "github.com/pojntfx/stfs/pkg/recovery" "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/volatiletech/sqlboiler/v4/boil" ) var recoveryIndexCmd = &cobra.Command{ @@ -28,10 +27,6 @@ var recoveryIndexCmd = &cobra.Command{ return keys.CheckKeyAccessible(viper.GetString(signatureFlag), viper.GetString(recipientFlag)) }, RunE: func(cmd *cobra.Command, args []string) error { - if viper.GetBool(verboseFlag) { - boil.DebugMode = true - } - pubkey, err := keys.ReadKey(viper.GetString(signatureFlag), viper.GetString(recipientFlag)) if err != nil { return err diff --git a/cmd/stbak/cmd/restore.go b/cmd/stbak/cmd/restore.go index 806ddce..339bf7b 100644 --- a/cmd/stbak/cmd/restore.go +++ b/cmd/stbak/cmd/restore.go @@ -6,7 +6,6 @@ import ( "github.com/pojntfx/stfs/pkg/operations" "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/volatiletech/sqlboiler/v4/boil" ) const ( @@ -29,10 +28,6 @@ var restoreCmd = &cobra.Command{ return keys.CheckKeyAccessible(viper.GetString(signatureFlag), viper.GetString(recipientFlag)) }, RunE: func(cmd *cobra.Command, args []string) error { - if viper.GetBool(verboseFlag) { - boil.DebugMode = true - } - pubkey, err := keys.ReadKey(viper.GetString(signatureFlag), viper.GetString(recipientFlag)) if err != nil { return err diff --git a/cmd/stbak/cmd/root.go b/cmd/stbak/cmd/root.go index c973b16..0dafea2 100644 --- a/cmd/stbak/cmd/root.go +++ b/cmd/stbak/cmd/root.go @@ -12,6 +12,7 @@ import ( "github.com/pojntfx/stfs/pkg/config" "github.com/spf13/cobra" "github.com/spf13/viper" + "github.com/volatiletech/sqlboiler/v4/boil" ) const ( @@ -34,6 +35,14 @@ https://github.com/pojntfx/stfs`, viper.SetEnvPrefix("stbak") viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_", ".", "_")) + if err := viper.BindPFlags(cmd.PersistentFlags()); err != nil { + return err + } + + if viper.GetBool(verboseFlag) { + boil.DebugMode = true + } + if err := compression.CheckCompressionFormat(viper.GetString(compressionFlag)); err != nil { return err } diff --git a/cmd/stbak/cmd/update.go b/cmd/stbak/cmd/update.go index af48e4a..9826200 100644 --- a/cmd/stbak/cmd/update.go +++ b/cmd/stbak/cmd/update.go @@ -13,7 +13,6 @@ import ( "github.com/pojntfx/stfs/pkg/recovery" "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/volatiletech/sqlboiler/v4/boil" ) var updateCmd = &cobra.Command{ @@ -40,10 +39,6 @@ var updateCmd = &cobra.Command{ return err } - if viper.GetBool(verboseFlag) { - boil.DebugMode = true - } - metadataPersister := persisters.NewMetadataPersister(viper.GetString(metadataFlag)) if err := metadataPersister.Open(); err != nil { return err