From f825ac0204990825af2cdb76d42496888f2a3182 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 12 Feb 2018 23:25:51 +0100 Subject: [PATCH] Update integration test to account for SwarmKit change 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 Upstream-commit: ed7d7b9b0577895e8305e87816cb52fc4e2a0b92 Component: engine --- components/engine/integration-cli/docker_cli_swarm_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_swarm_test.go b/components/engine/integration-cli/docker_cli_swarm_test.go index 283f576f57..4a5ec9a566 100644 --- a/components/engine/integration-cli/docker_cli_swarm_test.go +++ b/components/engine/integration-cli/docker_cli_swarm_test.go @@ -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 } }