Bump boulder version to release-2021-02-08

2026-01-27 18:19:33 +00:00 · 2021-02-13 14:11:42 +01:00
parent 8246b14dcd
commit ec1c8d5343
12 changed files with 35 additions and 35 deletions
--- a/bad-key-revoker_main.patch
+++ b/bad-key-revoker_main.patch
@@ -1,5 +1,5 @@
 diff --git a/cmd/bad-key-revoker/main.go b/cmd/bad-key-revoker/main.go
-index 563ce678c..1e53d875c 100644
+index 7d4c9311..2858ada7 100644
 --- a/cmd/bad-key-revoker/main.go
 +++ b/cmd/bad-key-revoker/main.go
@@ -13,6 +13,7 @@ import (
@@ -33,7 +33,7 @@ index 563ce678c..1e53d875c 100644
 	}
 	configPath := flag.String("config", "", "File path to the configuration file for this service")
 	flag.Parse()
-@@ -404,6 +414,30 @@ func main() {
+@@ -411,6 +421,30 @@ func main() {
 	cmd.FailOnError(err, "Failed to load credentials and create gRPC connection to RA")
 	rac := rapb.NewRegistrationAuthorityClient(conn)
 
@@ -43,12 +43,12 @@ index 563ce678c..1e53d875c 100644
 +	if dnsTries < 1 {
 +		dnsTries = 1
 +	}
-+	var resolver bdns.DNSClient
+	var resolver bdns.Client
 +	if len(config.Common.DNSResolver) != 0 {
 +		config.BadKeyRevoker.DNSResolvers = append(config.BadKeyRevoker.DNSResolvers, config.Common.DNSResolver)
 +	}
 +	if !config.Common.DNSAllowLoopbackAddresses {
-+		r := bdns.NewDNSClientImpl(
+		r := bdns.New(
 +			dnsTimeout,
 +			config.BadKeyRevoker.DNSResolvers,
 +			scope,
@@ -57,14 +57,14 @@ index 563ce678c..1e53d875c 100644
 +			logger)
 +		resolver = r
 +	} else {
-+		r := bdns.NewTestDNSClientImpl(dnsTimeout, config.BadKeyRevoker.DNSResolvers, scope, clk, dnsTries, logger)
+		r := bdns.NewTest(dnsTimeout, config.BadKeyRevoker.DNSResolvers, scope, clk, dnsTries, logger)
 +		resolver = r
 +	}
 +
 	var smtpRoots *x509.CertPool
 	if config.BadKeyRevoker.Mailer.SMTPTrustedRootFile != "" {
 		pem, err := ioutil.ReadFile(config.BadKeyRevoker.Mailer.SMTPTrustedRootFile)
-@@ -425,6 +459,7 @@ func main() {
+@@ -432,6 +466,7 @@ func main() {
 		config.BadKeyRevoker.Mailer.Username,
 		smtpPassword,
 		smtpRoots,
--- a/config_bad-key-revoker.patch
+++ b/config_bad-key-revoker.patch
@@ -4,7 +4,7 @@ index 482fd85fc..3e678aa5b 100644
 +++ b/test/config/bad-key-revoker.json
@@ -3,6 +3,11 @@
         "dbConnectFile": "test/secrets/badkeyrevoker_dburl",
-         "maxDBConns": 10,
+         "maxOpenConns": 10,
         "debugAddr": ":8020",
 +        "dnsTries": 3,
 +        "dnsResolvers": [
--- a/config_notify-mailer.patch
+++ b/config_notify-mailer.patch
@@ -1,5 +1,5 @@
 diff --git a/test/config/notify-mailer.json b/test/config/notify-mailer.json
-index 73864aeb5..93b17c28e 100644
+index 1d17012..0d061b5 100644
 --- a/test/config/notify-mailer.json
 +++ b/test/config/notify-mailer.json
@@ -2,11 +2,20 @@
@@ -11,7 +11,7 @@ index 73864aeb5..93b17c28e 100644
 +    "from": "notify mailer <test@example.com>",
     "passwordFile": "test/secrets/smtp_password",
     "dbConnectFile": "test/secrets/mailer_dburl",
-     "maxDBConns": 10
+     "maxOpenConns": 10
   },
 +  "pa": {
 +    "challenges": {
--- a/docker-compose.patch
+++ b/docker-compose.patch
@@ -1,9 +1,9 @@
 diff --git a/docker-compose.yml b/docker-compose.yml
-index 2c93b96ee..d0585344f 100644
+index 19cc67b1..b572b420 100644
 --- a/docker-compose.yml
 +++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
-         image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.15.5}:2020-11-20
+         image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.15.7}:2021-01-19
         environment:
             - FAKE_DNS=10.77.77.77
 -            - BOULDER_CONFIG_DIR=test/config
@@ -51,7 +51,7 @@ index 2c93b96ee..d0585344f 100644
 +            max-file: "5"
 +        restart: always
 +    labca:
-         image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.15.5}:2020-11-20
+         image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.15.7}:2021-01-19
 -        environment:
 -            GO111MODULE: "on"
 -            GOFLAGS: "-mod=vendor"
--- a/expiration-mailer_main.patch
+++ b/expiration-mailer_main.patch
@@ -1,5 +1,5 @@
 diff --git a/cmd/expiration-mailer/main.go b/cmd/expiration-mailer/main.go
-index 6d31a7033..c2ad80495 100644
+index 30aa52a1..a72b4734 100644
 --- a/cmd/expiration-mailer/main.go
 +++ b/cmd/expiration-mailer/main.go
@@ -19,6 +19,7 @@ import (
@@ -42,7 +42,7 @@ index 6d31a7033..c2ad80495 100644
 }
 
 func initStats(stats prometheus.Registerer) mailerStats {
-@@ -494,6 +504,30 @@ func main() {
+@@ -500,6 +510,30 @@ func main() {
 	cmd.FailOnError(err, "Failed to load credentials and create gRPC connection to SA")
 	sac := bgrpc.NewStorageAuthorityClient(sapb.NewStorageAuthorityClient(conn))
 
@@ -52,12 +52,12 @@ index 6d31a7033..c2ad80495 100644
 +	if dnsTries < 1 {
 +		dnsTries = 1
 +	}
-+	var resolver bdns.DNSClient
+	var resolver bdns.Client
 +	if len(c.Common.DNSResolver) != 0 {
 +		c.Mailer.DNSResolvers = append(c.Mailer.DNSResolvers, c.Common.DNSResolver)
 +	}
 +	if !c.Common.DNSAllowLoopbackAddresses {
-+		r := bdns.NewDNSClientImpl(
+		r := bdns.New(
 +			dnsTimeout,
 +			c.Mailer.DNSResolvers,
 +			scope,
@@ -66,14 +66,14 @@ index 6d31a7033..c2ad80495 100644
 +			logger)
 +		resolver = r
 +	} else {
-+		r := bdns.NewTestDNSClientImpl(dnsTimeout, c.Mailer.DNSResolvers, scope, clk, dnsTries, logger)
+		r := bdns.NewTest(dnsTimeout, c.Mailer.DNSResolvers, scope, clk, dnsTries, logger)
 +		resolver = r
 +	}
 +
 	var smtpRoots *x509.CertPool
 	if c.Mailer.SMTPTrustedRootFile != "" {
 		pem, err := ioutil.ReadFile(c.Mailer.SMTPTrustedRootFile)
-@@ -529,6 +563,7 @@ func main() {
+@@ -535,6 +569,7 @@ func main() {
 		c.Mailer.Username,
 		smtpPassword,
 		smtpRoots,
--- a/2
+++ b/2
@@ -24,7 +24,7 @@ dockerComposeVersion="1.22.0"

 labcaUrl="https://github.com/hakwerk/labca/"
 boulderUrl="https://github.com/letsencrypt/boulder/"
-boulderTag="release-2021-01-12"
+boulderTag="release-2021-02-08"

 #
 # Color configuration
--- a/mail-tester.go
+++ b/mail-tester.go
@@ -79,12 +79,12 @@ func main() {
 	if dnsTries < 1 {
 		dnsTries = 1
 	}
-	var resolver bdns.DNSClient
+	var resolver bdns.Client
 	if len(c.Common.DNSResolver) != 0 {
 		c.Mailer.DNSResolvers = append(c.Mailer.DNSResolvers, c.Common.DNSResolver)
 	}
 	if !c.Common.DNSAllowLoopbackAddresses {
-		r := bdns.NewDNSClientImpl(
+		r := bdns.New(
 			dnsTimeout,
 			c.Mailer.DNSResolvers,
 			scope,
@@ -93,7 +93,7 @@ func main() {
 			logger)
 		resolver = r
 	} else {
-		r := bdns.NewTestDNSClientImpl(dnsTimeout, c.Mailer.DNSResolvers, scope, clk, dnsTries, logger)
+		r := bdns.NewTest(dnsTimeout, c.Mailer.DNSResolvers, scope, clk, dnsTries, logger)
 		resolver = r
 	}

--- a/mail_mailer.patch
+++ b/mail_mailer.patch
@@ -21,7 +21,7 @@ index bb5bacaf2..946992dca 100644
 	username,
 	password string,
 	rootCAs *x509.CertPool,
-+	resolver bdns.DNSClient,
+	resolver bdns.Client,
 	from mail.Address,
 	logger blog.Logger,
 	stats prometheus.Registerer,
@@ -46,7 +46,7 @@ index bb5bacaf2..946992dca 100644
 type dialerImpl struct {
 	username, password, server, port string
 	rootCAs                          *x509.CertPool
-+	dnsClient                        bdns.DNSClient
+	dnsClient                        bdns.Client
 }
 
 func (di *dialerImpl) Dial() (smtpClient, error) {
--- a/notify-mailer_main.patch
+++ b/notify-mailer_main.patch
@@ -1,5 +1,5 @@
 diff --git a/cmd/notify-mailer/main.go b/cmd/notify-mailer/main.go
-index e00541cb1..39af62530 100644
+index f4a25a78..68b23dc7 100644
 --- a/cmd/notify-mailer/main.go
 +++ b/cmd/notify-mailer/main.go
@@ -38,6 +38,7 @@ type mailer struct {
@@ -29,7 +29,7 @@ index e00541cb1..39af62530 100644
 		Syslog cmd.SyslogConfig
 	}
 	configFile := flag.String("config", "", "File containing a JSON config.")
-@@ -461,6 +464,14 @@ func main() {
+@@ -464,6 +467,14 @@ func main() {
 		end:   *end,
 	}
 
@@ -44,7 +44,7 @@ index e00541cb1..39af62530 100644
 	var mailClient bmail.Mailer
 	if *dryRun {
 		log.Infof("Doing a dry run.")
-@@ -474,6 +485,7 @@ func main() {
+@@ -477,6 +488,7 @@ func main() {
 			cfg.NotifyMailer.Username,
 			smtpPassword,
 			nil,
@@ -52,7 +52,7 @@ index e00541cb1..39af62530 100644
 			*address,
 			log,
 			metrics.NoopRegisterer,
-@@ -491,6 +503,7 @@ func main() {
+@@ -494,6 +506,7 @@ func main() {
 		emailTemplate: template,
 		targetRange:   targetRange,
 		sleepInterval: *sleep,
--- a/ra_ra.patch
+++ b/ra_ra.patch
@@ -1,5 +1,5 @@
 diff --git a/ra/ra.go b/ra/ra.go
-index bdc0520bc..2d74d1318 100644
+index cefe8ad1..faaeae66 100644
 --- a/ra/ra.go
 +++ b/ra/ra.go
@@ -30,7 +30,6 @@ import (
@@ -10,7 +10,7 @@ index bdc0520bc..2d74d1318 100644
 	"github.com/letsencrypt/boulder/probs"
 	rapb "github.com/letsencrypt/boulder/ra/proto"
 	"github.com/letsencrypt/boulder/ratelimit"
-@@ -401,7 +400,7 @@ func (ra *RegistrationAuthorityImpl) validateContacts(ctx context.Context, conta
+@@ -406,7 +405,7 @@ func (ra *RegistrationAuthorityImpl) validateContacts(ctx context.Context, conta
 				contact,
 			)
 		}
--- a/test_config_ca_a.patch
+++ b/test_config_ca_a.patch
@@ -1,9 +1,9 @@
 diff --git a/test/config/ca-a.json b/test/config/ca-a.json
-index be064a52e..e7ef8fcf6 100644
+index 51f8416..7668fd5 100644
 --- a/test/config/ca-a.json
 +++ b/test/config/ca-a.json
@@ -122,11 +122,7 @@
-     },
+     "ecdsaProfile": "ecdsaEE",
     "issuers": [{
       "configFile": "test/test-ca.key-pkcs11.json",
 -      "certFile": "/tmp/intermediate-cert-rsa-a.pem",
--- a/test_config_ca_b.patch
+++ b/test_config_ca_b.patch
@@ -1,9 +1,9 @@
 diff --git a/test/config/ca-b.json b/test/config/ca-b.json
-index ed2498f1a..4d24ffa94 100644
+index 6478be1..6e1e828 100644
 --- a/test/config/ca-b.json
 +++ b/test/config/ca-b.json
-@@ -127,11 +127,7 @@
-     },
+@@ -122,11 +122,7 @@
+     "ecdsaProfile": "ecdsaEE",
     "issuers": [{
       "configFile": "test/test-ca.key-pkcs11.json",
 -      "certFile": "/tmp/intermediate-cert-rsa-a.pem",