Skip to content

Commit 4e9ab5f

Browse files
author
Daniel McCarney
authored
deps: update to eggsampler/acme/v3, run tidy, re-enable parallel tests (letsencrypt#4568)
This updates the `github.com/eggsampler/acme` dependency used in our Go-based integration tests to v3. Notably this fixes a data race we encountered in CI. With the data race fixed this branch can also revert 54a798b and resolve letsencrypt#4542 I ran a `go mod tidy` to cleanup the old `v2` copy of the dep and it also removed a few stale cfssl/mysql items from the `go.mod`. Upstream library's tests are confirmed to pass: ``` ~/go/src/github.com/eggsampler/acme$ git log --pretty=format:'%h' -n 1 b581dc6 ~/go/src/github.com/eggsampler/acme$ make pebble mkdir -p /home/daniel/go/src/github.com/letsencrypt/pebble git clone --depth 1 https://github.com/letsencrypt/pebble.git /home/daniel/go/src/github.com/letsencrypt/pebble \ || (cd /home/daniel/go/src/github.com/letsencrypt/pebble; git checkout -f master && git reset --hard HEAD && git pull -q) fatal: destination path '/home/daniel/go/src/github.com/letsencrypt/pebble' already exists and is not an empty directory. Already on 'master' Your branch is up-to-date with 'le/master'. HEAD is now at 6c2d514 wfe: compare Identifier.Type with acme.IndentifierIP (letsencrypt#287) docker-compose -f /home/daniel/go/src/github.com/letsencrypt/pebble/docker-compose.yml up -d Creating network "pebble_acmenet" with driver "bridge" Creating pebble_challtestsrv_1 ... done Creating pebble_pebble_1 ... done while ! wget --delete-after -q --no-check-certificate "https://localhost:14000/dir" ; do sleep 1 ; done go clean -testcache go test -race -coverprofile=coverage_18.txt -covermode=atomic github.com/eggsampler/acme/v3 ok github.com/eggsampler/acme/v3 24.292s coverage: 83.0% of statements docker-compose -f /home/daniel/go/src/github.com/letsencrypt/pebble/docker-compose.yml down Stopping pebble_pebble_1 ... done Stopping pebble_challtestsrv_1 ... done Removing pebble_pebble_1 ... done Removing pebble_challtestsrv_1 ... done Removing network pebble_acmenet ```
1 parent fabfba2 commit 4e9ab5f

File tree

25 files changed

+94
-97
lines changed

25 files changed

+94
-97
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/beeker1121/goque v0.0.0-20170321141813-4044bc29b280
88
github.com/beorn7/perks v0.0.0-20160229213445-3ac7bf7a47d1 // indirect
99
github.com/cloudflare/cfssl v1.4.0
10-
github.com/eggsampler/acme/v2 v2.0.1
10+
github.com/eggsampler/acme/v3 v3.0.0
1111
github.com/go-gorp/gorp v2.0.0+incompatible // indirect
1212
github.com/go-sql-driver/mysql v1.4.1-0.20191114115753-b4242bab7dc5
1313
github.com/golang/mock v1.2.0

‎go.sum‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ github.com/certifi/gocertifi v0.0.0-20180118203423-deb3ae2ef261/go.mod h1:GJKEex
1919
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
2020
github.com/cloudflare/backoff v0.0.0-20161212185259-647f3cdfc87a h1:8d1CEOF1xldesKds5tRG3tExBsMOgWYownMHNCsev54=
2121
github.com/cloudflare/backoff v0.0.0-20161212185259-647f3cdfc87a/go.mod h1:rzgs2ZOiguV6/NpiDgADjRLPNyZlApIWxKpkT+X8SdY=
22-
github.com/cloudflare/cfssl v0.0.0-20190716004220-2185c182e6ba h1:gI0EFi8pFYkjYBA3A78uFXRUzAx1pkYS1lVcsYdSZhE=
23-
github.com/cloudflare/cfssl v0.0.0-20190716004220-2185c182e6ba/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA=
2422
github.com/cloudflare/cfssl v1.4.0 h1:TdyQbj/bDUMUHf2IkcHU2EHUmzCmRLuJ3fFd8EYMg1E=
2523
github.com/cloudflare/cfssl v1.4.0/go.mod h1:KManx/OJPb5QY+y0+o/898AMcM128sF0bURvoVUSjTo=
2624
github.com/cloudflare/go-metrics v0.0.0-20151117154305-6a9aea36fb41 h1:/8sZyuGTAU2+fYv0Sz9lBcipqX0b7i4eUl8pSStk/4g=
@@ -33,21 +31,17 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8
3331
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3432
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
3533
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
36-
github.com/eggsampler/acme/v2 v2.0.1 h1:SfhaHP/6jCWOEMdzWI/9pmNDm2yuCHd4agW7u29fEJY=
37-
github.com/eggsampler/acme/v2 v2.0.1/go.mod h1:kMR4S+ZCJtXb0WCg8MJkUKFQ0pyLEMQ9l5JA+CHvK2Y=
34+
github.com/eggsampler/acme/v3 v3.0.0 h1:Fl1fWD94NcdC7Ensb6Ed/CJZ6S24PpekLo/jZB6Ltg8=
35+
github.com/eggsampler/acme/v3 v3.0.0/go.mod h1:gw64Ckma6iKulWks9BtE/g/9z/Vdz9D1lM7x7M1X1Ag=
3836
github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
3937
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
4038
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
4139
github.com/getsentry/raven-go v0.0.0-20180121060056-563b81fc02b7 h1:ELaJ1cjF2nEJeIlHXahGme22yG7TK+3jB6IGCq0Cdrc=
4240
github.com/getsentry/raven-go v0.0.0-20180121060056-563b81fc02b7/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=
4341
github.com/go-gorp/gorp v2.0.0+incompatible h1:dIQPsBtl6/H1MjVseWuWPXa7ET4p6Dve4j3Hg+UjqYw=
4442
github.com/go-gorp/gorp v2.0.0+incompatible/go.mod h1:7IfkAQnO7jfT/9IQ3R9wL1dFhukN6aQxzKTHnkxzA/E=
45-
github.com/go-sql-driver/mysql v0.0.0-20170715192408-3955978caca4 h1:3DFRjZdCDhzvxDf0U6/1qAryzOqD7Y5iAj0DJRRl1bs=
46-
github.com/go-sql-driver/mysql v0.0.0-20170715192408-3955978caca4/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
4743
github.com/go-sql-driver/mysql v1.3.0 h1:pgwjLi/dvffoP9aabwkT3AKpXQM93QARkjFhDDqC1UE=
4844
github.com/go-sql-driver/mysql v1.3.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
49-
github.com/go-sql-driver/mysql v1.3.1-0.20170715192408-3955978caca4 h1:VR5tBQt9N1t7k1gLi3zDPVMJ7dNwrHewr8cH+r3hRCo=
50-
github.com/go-sql-driver/mysql v1.3.1-0.20170715192408-3955978caca4/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
5145
github.com/go-sql-driver/mysql v1.4.1-0.20191114115753-b4242bab7dc5 h1:TPdJVmaDpKVlxYKc2CTaU6iY51jeQqbRooWdI1ATYG4=
5246
github.com/go-sql-driver/mysql v1.4.1-0.20191114115753-b4242bab7dc5/go.mod h1:XIaZU7xtUgusUqDPXOOPcmC5Dyyw3F1pbh54fHzaehk=
5347
github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
@@ -62,8 +56,6 @@ github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg
6256
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
6357
github.com/golang/snappy v0.0.0-20170215233205-553a64147049 h1:K9KHZbXKpGydfDN0aZrsoHpLJlZsBrGMFWbgLDGnPZk=
6458
github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
65-
github.com/google/certificate-transparency-go v0.0.0-20181127102053-c25855a82c75 h1:gCV0QQc4QDuekXbFI1RsuzK/jPq9WCRZF9hd6AvduVQ=
66-
github.com/google/certificate-transparency-go v0.0.0-20181127102053-c25855a82c75/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg=
6759
github.com/google/certificate-transparency-go v1.0.21 h1:Yf1aXowfZ2nuboBsg7iYGLmwsOARdV86pfH3g95wXmE=
6860
github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg=
6961
github.com/google/certificate-transparency-go v1.0.22-0.20181127102053-c25855a82c75 h1:+QTUt+tQMFBQPGB/gfpLj6JKfKISHo0c4U6jLkLYLoY=
@@ -147,8 +139,6 @@ github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8W
147139
github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
148140
github.com/weppos/publicsuffix-go v0.4.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k=
149141
github.com/weppos/publicsuffix-go v0.5.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k=
150-
github.com/weppos/publicsuffix-go v0.5.1-0.20190725085804-8ac7722bc7d7 h1:lUoUsiXpqn6az3G3jCQXlx0/JCN/XM3qekSkNAAn57E=
151-
github.com/weppos/publicsuffix-go v0.5.1-0.20190725085804-8ac7722bc7d7/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k=
152142
github.com/weppos/publicsuffix-go v0.10.1-0.20190926082447-75329425f8bb h1:EiKPP9teaFiXHBov7yjs2s2OdtCIRPxHHmWe9D0+e88=
153143
github.com/weppos/publicsuffix-go v0.10.1-0.20190926082447-75329425f8bb/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k=
154144
github.com/weppos/publicsuffix-go v0.10.1-0.20191119120252-3dd5f42d2d87 h1:atBJZP3ARnSmu6xeR2b0ksATs8da4d6er1f6VnrucoY=
@@ -160,10 +150,6 @@ github.com/zmap/zcertificate v0.0.0-20180516150559-0e3d58b1bac4/go.mod h1:5iU54t
160150
github.com/zmap/zcrypto v0.0.0-20190729165852-9051775e6a2e h1:mvOa4+/DXStR4ZXOks/UsjeFdn5O5JpLUtzqk9U8xXw=
161151
github.com/zmap/zcrypto v0.0.0-20190729165852-9051775e6a2e/go.mod h1:w7kd3qXHh8FNaczNjslXqvFQiv5mMWRXlL9klTUAHc8=
162152
github.com/zmap/zlint v0.0.0-20190806154020-fd021b4cfbeb/go.mod h1:29UiAJNsiVdvTBFCJW8e3q6dcDbOoPkhMgttOSCIMMY=
163-
github.com/zmap/zlint v0.0.0-20190812234238-3307e6abe190 h1:6GptW5eE0D3TUxZcnJ6T/krJlGyULRQjGI1Kz0fsu6c=
164-
github.com/zmap/zlint v0.0.0-20190812234238-3307e6abe190/go.mod h1:29UiAJNsiVdvTBFCJW8e3q6dcDbOoPkhMgttOSCIMMY=
165-
github.com/zmap/zlint v1.0.1 h1:LRjQApGB7ppkCQEsW2FVYBxz7KJWGHZZvk1OsnbLxgY=
166-
github.com/zmap/zlint v1.0.1/go.mod h1:29UiAJNsiVdvTBFCJW8e3q6dcDbOoPkhMgttOSCIMMY=
167153
github.com/zmap/zlint v1.0.2-0.20190921214057-00156801166b h1:gZluua+YxLCHC5AN3j2HnuLj0BgkxuHy9OzZC8W86fE=
168154
github.com/zmap/zlint v1.0.2-0.20190921214057-00156801166b/go.mod h1:29UiAJNsiVdvTBFCJW8e3q6dcDbOoPkhMgttOSCIMMY=
169155
github.com/zmap/zlint v1.0.3-0.20191115164049-eea5fe83935a h1:QaoQc5dqoKaxmebnB1fCIrBxHCdrIinK8SAsWC/v720=
@@ -224,12 +210,8 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33
224210
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
225211
gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
226212
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
227-
gopkg.in/go-gorp/gorp.v2 v2.0.0-20180410155428-6032c66e0f5f h1:zundYZrPliLrlQV98q+z4b2hcfGxd2X1pH6y9gBv00c=
228-
gopkg.in/go-gorp/gorp.v2 v2.0.0-20180410155428-6032c66e0f5f/go.mod h1:eJwu1bWCXesk9aw26U78PFtctx3Y8haXGmL7x3VJlrw=
229213
gopkg.in/go-gorp/gorp.v2 v2.0.1-0.20180410155428-6032c66e0f5f h1:OuFU7cfzlNAFNOXX0F3uy5jrC8YHSR0UeNponDkdZO8=
230214
gopkg.in/go-gorp/gorp.v2 v2.0.1-0.20180410155428-6032c66e0f5f/go.mod h1:eJwu1bWCXesk9aw26U78PFtctx3Y8haXGmL7x3VJlrw=
231-
gopkg.in/square/go-jose.v2 v2.3.1 h1:SK5KegNXmKmqE342YYN2qPHEnUYeoMiXXl1poUlI+o4=
232-
gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
233215
gopkg.in/square/go-jose.v2 v2.4.0 h1:0kXPskUMGAXXWJlP05ktEMOV0vmzFQUWw6d+aZJQU8A=
234216
gopkg.in/square/go-jose.v2 v2.4.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
235217
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=

‎test/integration-test.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ def run_go_tests(filterPattern=None):
4848
cmdLine = [ "go", "test", ]
4949
if filterPattern is not None and filterPattern != "":
5050
cmdLine = cmdLine + ["--test.run", filterPattern]
51-
# TODO: We don't run the race detector here as it catches a race condition
52-
# in eggsampler/acme that we are waiting on a fix for.
53-
cmdLine = cmdLine + ["-tags", "integration", "-count=1", "./test/integration"]
51+
cmdLine = cmdLine + ["-tags", "integration", "-count=1", "-race", "./test/integration"]
5452
return subprocess.check_call(cmdLine, shell=False, stderr=subprocess.STDOUT)
5553

5654
def run_expired_authz_purger():

‎test/integration/common_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"net/http"
1616
"os"
1717

18-
"github.com/eggsampler/acme/v2"
18+
"github.com/eggsampler/acme/v3"
1919
)
2020

2121
func init() {

‎vendor/github.com/eggsampler/acme/v2/go.mod‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

vendor/github.com/eggsampler/acme/v2/.gitignore renamed to vendor/github.com/eggsampler/acme/v3/.gitignore

File renamed without changes.

vendor/github.com/eggsampler/acme/v2/.travis.yml renamed to vendor/github.com/eggsampler/acme/v3/.travis.yml

Lines changed: 8 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/eggsampler/acme/v2/LICENSE renamed to vendor/github.com/eggsampler/acme/v3/LICENSE

File renamed without changes.

vendor/github.com/eggsampler/acme/v2/Makefile renamed to vendor/github.com/eggsampler/acme/v3/Makefile

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/eggsampler/acme/v2/README.md renamed to vendor/github.com/eggsampler/acme/v3/README.md

Lines changed: 19 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)