From e983d2baeeb98db4cb07160372fca7ed5c437e67 Mon Sep 17 00:00:00 2001 From: Ville Vesilehto Date: Mon, 24 Jul 2023 20:58:31 +0300 Subject: [PATCH] chore: add errcheck for parsing cli flags in plugins --- .../cmd/vault-plugin-auth-mock/main.go | 21 ++++++++++++------- .../vault-plugin-secrets-hashicups/main.go | 21 ++++++++++++------- .../vault-plugin-secrets-hashicups/main.go | 21 ++++++++++++------- .../cmd/vault-plugin-secrets-mock/main.go | 21 ++++++++++++------- 4 files changed, 52 insertions(+), 32 deletions(-) diff --git a/plugins/vault-plugin-auth-mock/cmd/vault-plugin-auth-mock/main.go b/plugins/vault-plugin-auth-mock/cmd/vault-plugin-auth-mock/main.go index a11a7272..dc67013b 100644 --- a/plugins/vault-plugin-auth-mock/cmd/vault-plugin-auth-mock/main.go +++ b/plugins/vault-plugin-auth-mock/cmd/vault-plugin-auth-mock/main.go @@ -12,19 +12,24 @@ import ( func main() { apiClientMeta := &api.PluginAPIClientMeta{} flags := apiClientMeta.FlagSet() - flags.Parse(os.Args[1:]) + + if err := flags.Parse(os.Args[1:]); err != nil { + fatal(err) + } tlsConfig := apiClientMeta.GetTLSConfig() tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) - err := plugin.Serve(&plugin.ServeOpts{ + if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: mock.Factory, TLSProviderFunc: tlsProviderFunc, - }) - if err != nil { - logger := hclog.New(&hclog.LoggerOptions{}) - - logger.Error("plugin shutting down", "error", err) - os.Exit(1) + }); err != nil { + fatal(err) } } + +func fatal(err error) { + logger := hclog.New(&hclog.LoggerOptions{}) + logger.Error("plugin shutting down", "error", err) + os.Exit(1) +} diff --git a/plugins/vault-plugin-secrets-hashicups/cmd/vault-plugin-secrets-hashicups/main.go b/plugins/vault-plugin-secrets-hashicups/cmd/vault-plugin-secrets-hashicups/main.go index 5ed069e1..f55e3a80 100644 --- a/plugins/vault-plugin-secrets-hashicups/cmd/vault-plugin-secrets-hashicups/main.go +++ b/plugins/vault-plugin-secrets-hashicups/cmd/vault-plugin-secrets-hashicups/main.go @@ -12,19 +12,24 @@ import ( func main() { apiClientMeta := &api.PluginAPIClientMeta{} flags := apiClientMeta.FlagSet() - flags.Parse(os.Args[1:]) + + if err := flags.Parse(os.Args[1:]); err != nil { + fatal(err) + } tlsConfig := apiClientMeta.GetTLSConfig() tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) - err := plugin.Serve(&plugin.ServeOpts{ + if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: hashicups.Factory, TLSProviderFunc: tlsProviderFunc, - }) - if err != nil { - logger := hclog.New(&hclog.LoggerOptions{}) - - logger.Error("plugin shutting down", "error", err) - os.Exit(1) + }); err != nil { + fatal(err) } } + +func fatal(err error) { + logger := hclog.New(&hclog.LoggerOptions{}) + logger.Error("plugin shutting down", "error", err) + os.Exit(1) +} diff --git a/plugins/vault-plugin-secrets-hashicups/solution/cmd/vault-plugin-secrets-hashicups/main.go b/plugins/vault-plugin-secrets-hashicups/solution/cmd/vault-plugin-secrets-hashicups/main.go index 5ed069e1..f55e3a80 100644 --- a/plugins/vault-plugin-secrets-hashicups/solution/cmd/vault-plugin-secrets-hashicups/main.go +++ b/plugins/vault-plugin-secrets-hashicups/solution/cmd/vault-plugin-secrets-hashicups/main.go @@ -12,19 +12,24 @@ import ( func main() { apiClientMeta := &api.PluginAPIClientMeta{} flags := apiClientMeta.FlagSet() - flags.Parse(os.Args[1:]) + + if err := flags.Parse(os.Args[1:]); err != nil { + fatal(err) + } tlsConfig := apiClientMeta.GetTLSConfig() tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) - err := plugin.Serve(&plugin.ServeOpts{ + if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: hashicups.Factory, TLSProviderFunc: tlsProviderFunc, - }) - if err != nil { - logger := hclog.New(&hclog.LoggerOptions{}) - - logger.Error("plugin shutting down", "error", err) - os.Exit(1) + }); err != nil { + fatal(err) } } + +func fatal(err error) { + logger := hclog.New(&hclog.LoggerOptions{}) + logger.Error("plugin shutting down", "error", err) + os.Exit(1) +} diff --git a/plugins/vault-plugin-secrets-mock/cmd/vault-plugin-secrets-mock/main.go b/plugins/vault-plugin-secrets-mock/cmd/vault-plugin-secrets-mock/main.go index 6d46d14f..04cd0fc8 100644 --- a/plugins/vault-plugin-secrets-mock/cmd/vault-plugin-secrets-mock/main.go +++ b/plugins/vault-plugin-secrets-mock/cmd/vault-plugin-secrets-mock/main.go @@ -12,19 +12,24 @@ import ( func main() { apiClientMeta := &api.PluginAPIClientMeta{} flags := apiClientMeta.FlagSet() - flags.Parse(os.Args[1:]) + + if err := flags.Parse(os.Args[1:]); err != nil { + fatal(err) + } tlsConfig := apiClientMeta.GetTLSConfig() tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) - err := plugin.Serve(&plugin.ServeOpts{ + if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: mock.Factory, TLSProviderFunc: tlsProviderFunc, - }) - if err != nil { - logger := hclog.New(&hclog.LoggerOptions{}) - - logger.Error("plugin shutting down", "error", err) - os.Exit(1) + }); err != nil { + fatal(err) } } + +func fatal(err error) { + logger := hclog.New(&hclog.LoggerOptions{}) + logger.Error("plugin shutting down", "error", err) + os.Exit(1) +}