beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update integration test to account for SwarmKit change

Browse source 
The PKCS8 changes updated the encryption on the keys so that the
`x509.IsEncryptedPEMBlock` may no longer return true because it cannot
parse the PEM block. The `keyutils` module in SwarmKit can tell whether
it is encrypted either way.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2018-02-12 23:25:51 +01:00
parent 191324b8f1
commit ed7d7b9b05
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
integration-cli/docker_cli_swarm_test.go
View file

@ -4,7 +4,6 @@ package main
import (
"bytes"
"crypto/x509"
"encoding/json"
"encoding/pem"
"fmt"
@ -25,6 +24,7 @@ import (
"github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/ipamapi"
remoteipam "github.com/docker/libnetwork/ipams/remote/api"
"github.com/docker/swarmkit/ca/keyutils"
"github.com/go-check/check"
"github.com/gotestyourself/gotestyourself/fs"
"github.com/gotestyourself/gotestyourself/icmd"
@ -1007,7 +1007,7 @@ func checkKeyIsEncrypted(d *daemon.Swarm) func(*check.C) (interface{}, check.Com
return fmt.Errorf("invalid PEM-encoded private key"), nil
}
return x509.IsEncryptedPEMBlock(keyBlock), nil
return keyutils.IsEncryptedPEMBlock(keyBlock), nil
}
}