Update boulder-tools version. (letsencrypt#3294)

jsha · web-flow · commit af0bd7019622 · 2017-12-21T10:36:04.000-08:00
Also update chisel.py to refer to josepy, and update featureflag_string.go based on latest stringer. Fixes letsencrypt#3289
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # To minimize the fetching of various layers this image and tag should
 # be used as the base of the bhsm container in boulder/docker-compose.yml
-FROM letsencrypt/boulder-tools:2017-10-05
+FROM letsencrypt/boulder-tools:2017-12-18
 
 # Boulder exposes its web application at port TCP 4000 and 4001
 EXPOSE 4000 4001 4002 4003 4430 4431 8053 8055
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -43,7 +43,7 @@ services:
     bhsm:
         # To minimize the fetching of various layers this should match
         # the FROM image and tag in boulder/Dockerfile
-        image: letsencrypt/boulder-tools:2017-10-05
+        image: letsencrypt/boulder-tools:2017-12-18
         environment:
             PKCS11_DAEMON_SOCKET: tcp://0.0.0.0:5657
         command: /usr/local/bin/pkcs11-daemon /usr/lib/softhsm/libsofthsm2.so
diff --git a/features/featureflag_string.go b/features/featureflag_string.go
diff --git a/test/boulder-tools/build.sh b/test/boulder-tools/build.sh
@@ -74,3 +74,6 @@ apt-get autoremove -y build-essential cmake libssl-dev ruby-dev
 apt-get clean -y
 
 rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+# Save mock/mockgen/model because it will be needed later during `go generate`.
+GOPATH=/alt-gopath go get github.com/golang/mock/mockgen/model
diff --git a/test/chisel.py b/test/chisel.py
@@ -19,11 +19,11 @@
 from cryptography.hazmat.primitives.asymmetric import rsa
 
 import OpenSSL
+import josepy
 
 from acme import challenges
 from acme import client as acme_client
 from acme import errors as acme_errors
-from acme import jose
 from acme import messages
 from acme import standalone
 
@@ -35,7 +35,7 @@
 
 def make_client(email=None):
     """Build an acme.Client and register a new account with a random key."""
-    key = jose.JWKRSA(key=rsa.generate_private_key(65537, 2048, default_backend()))
+    key = josepy.JWKRSA(key=rsa.generate_private_key(65537, 2048, default_backend()))
 
     net = acme_client.ClientNetwork(key, verify_ssl=False,
                                     user_agent="Boulder integration tester")
@@ -112,7 +112,7 @@ def issue(client, authzs, cert_output=None):
 
     cert_resource = None
     try:
-        cert_resource, _ = client.poll_and_request_issuance(jose.ComparableX509(csr), authzs)
+        cert_resource, _ = client.poll_and_request_issuance(josepy.ComparableX509(csr), authzs)
     except acme_errors.PollError as error:
         # If we get a PollError, pick the first failed authz and turn it into a more
         # useful ValidationError that contains details we can look for in tests.
