diff options
author | Martin Polden <mpolden@mpolden.no> | 2023-07-17 14:45:27 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2023-07-17 15:10:53 +0200 |
commit | f48dbf9e3938b938a21a9246dc50b3a19c020d18 (patch) | |
tree | 2719249a06c1e93c9bb05389931b4e4b10ef214c /client/go/internal/cli/cmd/cert.go | |
parent | 96a788f1ec06d341479a603b3819eacfc98316ea (diff) |
Require certificate files specified in environment
Diffstat (limited to 'client/go/internal/cli/cmd/cert.go')
-rw-r--r-- | client/go/internal/cli/cmd/cert.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/client/go/internal/cli/cmd/cert.go b/client/go/internal/cli/cmd/cert.go index ccfce5eb7bb..f7320e37626 100644 --- a/client/go/internal/cli/cmd/cert.go +++ b/client/go/internal/cli/cmd/cert.go @@ -114,11 +114,11 @@ func doCert(cli *CLI, overwriteCertificate, skipApplicationPackage bool, args [] if !overwriteCertificate { hint := "Use -f flag to force overwriting" - if util.PathExists(privateKeyFile) { - return errHint(fmt.Errorf("private key %s already exists", color.CyanString(privateKeyFile)), hint) + if util.PathExists(privateKeyFile.path) { + return errHint(fmt.Errorf("private key %s already exists", color.CyanString(privateKeyFile.path)), hint) } - if util.PathExists(certificateFile) { - return errHint(fmt.Errorf("certificate %s already exists", color.CyanString(certificateFile)), hint) + if util.PathExists(certificateFile.path) { + return errHint(fmt.Errorf("certificate %s already exists", color.CyanString(certificateFile.path)), hint) } } @@ -126,14 +126,14 @@ func doCert(cli *CLI, overwriteCertificate, skipApplicationPackage bool, args [] if err != nil { return err } - if err := keyPair.WriteCertificateFile(certificateFile, overwriteCertificate); err != nil { + if err := keyPair.WriteCertificateFile(certificateFile.path, overwriteCertificate); err != nil { return fmt.Errorf("could not write certificate: %w", err) } - if err := keyPair.WritePrivateKeyFile(privateKeyFile, overwriteCertificate); err != nil { + if err := keyPair.WritePrivateKeyFile(privateKeyFile.path, overwriteCertificate); err != nil { return fmt.Errorf("could not write private key: %w", err) } - cli.printSuccess("Certificate written to ", color.CyanString(certificateFile)) - cli.printSuccess("Private key written to ", color.CyanString(privateKeyFile)) + cli.printSuccess("Certificate written to ", color.CyanString(certificateFile.path)) + cli.printSuccess("Private key written to ", color.CyanString(privateKeyFile.path)) if !skipApplicationPackage { return doCertAdd(cli, overwriteCertificate, args) } |