Use pebble-challtestrv cmd, letsencrypt/challtestsrv package. (#3980)

Now that Pebble has a `pebble-challtestsrv` we can remove the `challtestrv` package and associated command from Boulder. I switched CI to use `pebble-challtestsrv`. Notably this means that we have to add our expected mock data using the HTTP management interface. The Boulder-tools images are regenerated to include the `pebble-challtestsrv` command. Using this approach also allows separating the TLS-ALPN-01 and HTTPS HTTP-01 challenges by binding each challenge type in the `pebble-challtestsrv` to different interfaces both using the same VA HTTPS port. Mock DNS directs the VA to the correct interface. The load-generator command that was previously using the `challtestsrv` package from Boulder is updated to use a vendored copy of the new `github.org/letsencrypt/challtestsrv` package. Vendored dependencies change in two ways: 1) Gomock is updated to the latest release (matching what the Bouldertools image provides) 2) A couple of new subpackages in `golang.org/x/net/` are added by way of transitive dependency through the challtestsrv package. Unit tests are confirmed to pass for `gomock`: ``` ~/go/src/github.com/golang/mock/gomock$ git log --pretty=format:'%h' -n 1 51421b9 ~/go/src/github.com/golang/mock/gomock$ go test ./... ok github.com/golang/mock/gomock 0.002s ? github.com/golang/mock/gomock/internal/mock_matcher [no test files] ``` For `/x/net` all tests pass except two `/x/net/icmp` `TestDiag.go` test cases that we have agreed are OK to ignore. Resolves #3962 and #3951
letsencrypt · Dec 12, 2018 · 893e845 · 893e845
1 parent 38684ef
commit 893e845
Show file tree

Hide file tree

Showing 270 changed files with 19,646 additions and 845 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
     boulder:
         # To minimize fetching this should be the same version used below
-        image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.11.2}:2018-11-19
+        image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.11.2}:2018-12-11
         environment:
             FAKE_DNS: 127.0.0.1
             PKCS11_PROXY_SOCKET: tcp://boulder-hsm:5657
@@ -51,7 +51,7 @@ services:
         working_dir: /go/src/github.com/letsencrypt/boulder
     bhsm:
         # To minimize fetching this should be the same version used above
-        image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.11.2}:2018-11-19
+        image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.11.2}:2018-12-11
         environment:
             PKCS11_DAEMON_SOCKET: tcp://0.0.0.0:5657
         command: /usr/local/bin/pkcs11-daemon /usr/lib/softhsm/libsofthsm2.so
@@ -73,7 +73,7 @@ services:
         logging:
             driver: none
     netaccess:
-        image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.11.2}:2018-11-19
+        image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.11.2}:2018-12-11
         networks:
           - bluenet
         volumes:

diff --git a/metrics/mock_metrics/mock_scope.go b/metrics/mock_metrics/mock_scope.go
diff --git a/publisher/mock_publisher/mock_publisher.go b/publisher/mock_publisher/mock_publisher.go
diff --git a/test/boulder-tools/build.sh b/test/boulder-tools/build.sh
@@ -23,6 +23,7 @@ export GOBIN=/usr/local/bin GOPATH=/tmp/gopath
 
 # Job %2 - Install protobuf and testing/dev tools.
 go get \
+  github.com/letsencrypt/pebble/cmd/pebble-challtestsrv \
   bitbucket.org/liamstask/goose/cmd/goose \
   golang.org/x/lint/golint \
   github.com/golang/mock/mockgen \

diff --git a/test/challtestsrv/README.md b/test/challtestsrv/README.md