From 27b3e21842f54a88c1dcd1917855f78aec58397d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Mon, 9 Dec 2019 18:39:20 +0100 Subject: [PATCH] Add context to --encryption-key / --decryption-key processing failures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... to avoid context-less errors like > $ skopeo copy --decryption-key foo dir:x dir:y > FATA[0000] open foo: no such file or directory > $ skopeo copy --encryption-key /dev/null dir:x dir:y > FATA[0000] Invalid recipient format Signed-off-by: Miloslav Trmač --- cmd/skopeo/copy.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/skopeo/copy.go b/cmd/skopeo/copy.go index a361535d..9b5d4125 100644 --- a/cmd/skopeo/copy.go +++ b/cmd/skopeo/copy.go @@ -186,7 +186,7 @@ func (opts *copyOptions) run(args []string, stdout io.Writer) error { encryptionKeys := opts.encryptionKeys.Value() ecc, err := enchelpers.CreateCryptoConfig(encryptionKeys, []string{}) if err != nil { - return err + return fmt.Errorf("Invalid encryption keys: %v", err) } cc := encconfig.CombineCryptoConfigs([]encconfig.CryptoConfig{ecc}) encConfig = cc.EncryptConfig @@ -197,7 +197,7 @@ func (opts *copyOptions) run(args []string, stdout io.Writer) error { decryptionKeys := opts.decryptionKeys.Value() dcc, err := enchelpers.CreateCryptoConfig([]string{}, decryptionKeys) if err != nil { - return err + return fmt.Errorf("Invalid decryption keys: %v", err) } cc := encconfig.CombineCryptoConfigs([]encconfig.CryptoConfig{dcc}) decConfig = cc.DecryptConfig