From 1b26cbde7cc7f8488fa5df3c37c9b0163a921631 Mon Sep 17 00:00:00 2001 From: Shulhan Date: Mon, 29 Jan 2024 23:55:38 +0700 Subject: cli: simplify Import Check for valid provider name and parse the imported file before loading private key. --- cli.go | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'cli.go') diff --git a/cli.go b/cli.go index cea70bc..c07dcad 100644 --- a/cli.go +++ b/cli.go @@ -146,11 +146,6 @@ func (cli *Cli) Import(providerName, file string) (n int, err error) { issuer *Issuer ) - err = cli.cfg.loadPrivateKey() - if err != nil { - return 0, fmt.Errorf(`%s: %w`, logp, err) - } - providerName = strings.ToLower(providerName) switch providerName { case providerNameAegis: @@ -163,13 +158,13 @@ func (cli *Cli) Import(providerName, file string) (n int, err error) { return 0, fmt.Errorf(`%s: %w`, logp, err) } - for _, issuer = range issuers { - err = issuer.validate() - if err != nil { - return 0, fmt.Errorf(`%s: %w`, logp, err) - } + err = cli.cfg.loadPrivateKey() + if err != nil { + return 0, fmt.Errorf(`%s: %w`, logp, err) + } - err = cli.cfg.add(issuer) + for _, issuer = range issuers { + err = cli.add(issuer) if err != nil { return 0, fmt.Errorf(`%s: %w`, logp, err) } -- cgit v1.3