github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-08-12 11:52:39 +00:00
Code Issues Projects Releases Wiki Activity

Add context to --encryption-key / --decryption-key processing failures

Browse Source 
... 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č <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač 2019-12-09 18:39:20 +01:00
parent 8652b650b6
commit 27b3e21842
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/skopeo/copy.go
View File

@ -186,7 +186,7 @@ func (opts *copyOptions) run(args []string, stdout io.Writer) error {
encryptionKeys := opts.encryptionKeys.Value() encryptionKeys := opts.encryptionKeys.Value()
ecc, err := enchelpers.CreateCryptoConfig(encryptionKeys, []string{}) ecc, err := enchelpers.CreateCryptoConfig(encryptionKeys, []string{})
if err != nil { if err != nil {
return err return fmt.Errorf("Invalid encryption keys: %v", err)
} }
cc := encconfig.CombineCryptoConfigs([]encconfig.CryptoConfig{ecc}) cc := encconfig.CombineCryptoConfigs([]encconfig.CryptoConfig{ecc})
encConfig = cc.EncryptConfig encConfig = cc.EncryptConfig
@ -197,7 +197,7 @@ func (opts *copyOptions) run(args []string, stdout io.Writer) error {
decryptionKeys := opts.decryptionKeys.Value() decryptionKeys := opts.decryptionKeys.Value()
dcc, err := enchelpers.CreateCryptoConfig([]string{}, decryptionKeys) dcc, err := enchelpers.CreateCryptoConfig([]string{}, decryptionKeys)
if err != nil { if err != nil {
return err return fmt.Errorf("Invalid decryption keys: %v", err)
} }
cc := encconfig.CombineCryptoConfigs([]encconfig.CryptoConfig{dcc}) cc := encconfig.CombineCryptoConfigs([]encconfig.CryptoConfig{dcc})
decConfig = cc.DecryptConfig decConfig = cc.DecryptConfig