Skip to content

Commit 0839e62

Browse files
authored
Merge pull request #351 from hectorj2f/bump_all_dep
Manually bump all go deps to latest
2 parents 76c989d + 75ec94a commit 0839e62

File tree

16 files changed

+547
-1384
lines changed

16 files changed

+547
-1384
lines changed

go.mod

+69-120
Large diffs are not rendered by default.

go.sum

+159-819
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,25 @@
1-
Copyright (c) 2012 The Go Authors. All rights reserved.
2-
Copyright (c) 2012-2019 fsnotify Authors. All rights reserved.
1+
Copyright © 2012 The Go Authors. All rights reserved.
2+
Copyright © fsnotify Authors. All rights reserved.
33

4-
Redistribution and use in source and binary forms, with or without
5-
modification, are permitted provided that the following conditions are
6-
met:
4+
Redistribution and use in source and binary forms, with or without modification,
5+
are permitted provided that the following conditions are met:
76

8-
* Redistributions of source code must retain the above copyright
9-
notice, this list of conditions and the following disclaimer.
10-
* Redistributions in binary form must reproduce the above
11-
copyright notice, this list of conditions and the following disclaimer
12-
in the documentation and/or other materials provided with the
13-
distribution.
14-
* Neither the name of Google Inc. nor the names of its
15-
contributors may be used to endorse or promote products derived from
16-
this software without specific prior written permission.
7+
* Redistributions of source code must retain the above copyright notice, this
8+
list of conditions and the following disclaimer.
9+
* Redistributions in binary form must reproduce the above copyright notice, this
10+
list of conditions and the following disclaimer in the documentation and/or
11+
other materials provided with the distribution.
12+
* Neither the name of Google Inc. nor the names of its contributors may be used
13+
to endorse or promote products derived from this software without specific
14+
prior written permission.
1715

18-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
16+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
17+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
20+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
23+
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

third_party/VENDOR-LICENSE/github.com/golang/glog/LICENSE

-191
This file was deleted.

third_party/VENDOR-LICENSE/github.com/letsencrypt/boulder/core/objects.go

-5
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,6 @@ type ValidationRecord struct {
175175
// ...
176176
// }
177177
AddressesTried []net.IP `json:"addressesTried,omitempty"`
178-
179-
// OldTLS is true if any request in the validation chain used HTTPS and negotiated
180-
// a TLS version lower than 1.2.
181-
// TODO(#6011): Remove once TLS 1.0 and 1.1 support is gone.
182-
OldTLS bool `json:"oldTLS,omitempty"`
183178
}
184179

185180
func looksLikeKeyAuthorization(str string) error {

third_party/VENDOR-LICENSE/github.com/letsencrypt/boulder/core/util.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ import (
2626
jose "gopkg.in/square/go-jose.v2"
2727
)
2828

29+
const Unspecified = "Unspecified"
30+
2931
// Package Variables Variables
3032

3133
// BuildID is set by the compiler (using -ldflags "-X core.BuildID $(git rev-parse --short HEAD)")
@@ -182,7 +184,7 @@ func ValidSerial(serial string) bool {
182184
func GetBuildID() (retID string) {
183185
retID = BuildID
184186
if retID == "" {
185-
retID = "Unspecified"
187+
retID = Unspecified
186188
}
187189
return
188190
}
@@ -191,7 +193,7 @@ func GetBuildID() (retID string) {
191193
func GetBuildTime() (retID string) {
192194
retID = BuildTime
193195
if retID == "" {
194-
retID = "Unspecified"
196+
retID = Unspecified
195197
}
196198
return
197199
}
@@ -200,7 +202,7 @@ func GetBuildTime() (retID string) {
200202
func GetBuildHost() (retID string) {
201203
retID = BuildHost
202204
if retID == "" {
203-
retID = "Unspecified"
205+
retID = Unspecified
204206
}
205207
return
206208
}

third_party/VENDOR-LICENSE/github.com/letsencrypt/boulder/errors/errors.go

+25-15
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ package errors
1212

1313
import (
1414
"fmt"
15+
"time"
1516

1617
"github.com/letsencrypt/boulder/identifier"
1718
)
@@ -56,6 +57,10 @@ type BoulderError struct {
5657
Type ErrorType
5758
Detail string
5859
SubErrors []SubBoulderError
60+
61+
// RetryAfter the duration a client should wait before retrying the request
62+
// which resulted in this error.
63+
RetryAfter time.Duration
5964
}
6065

6166
// SubBoulderError represents sub-errors specific to an identifier that are
@@ -77,9 +82,10 @@ func (be *BoulderError) Unwrap() error {
7782
// provided subErrs to the existing BoulderError.
7883
func (be *BoulderError) WithSubErrors(subErrs []SubBoulderError) *BoulderError {
7984
return &BoulderError{
80-
Type: be.Type,
81-
Detail: be.Detail,
82-
SubErrors: append(be.SubErrors, subErrs...),
85+
Type: be.Type,
86+
Detail: be.Detail,
87+
SubErrors: append(be.SubErrors, subErrs...),
88+
RetryAfter: be.RetryAfter,
8389
}
8490
}
8591

@@ -107,31 +113,35 @@ func NotFoundError(msg string, args ...interface{}) error {
107113
return New(NotFound, msg, args...)
108114
}
109115

110-
func RateLimitError(msg string, args ...interface{}) error {
116+
func RateLimitError(retryAfter time.Duration, msg string, args ...interface{}) error {
111117
return &BoulderError{
112-
Type: RateLimit,
113-
Detail: fmt.Sprintf(msg+": see https://letsencrypt.org/docs/rate-limits/", args...),
118+
Type: RateLimit,
119+
Detail: fmt.Sprintf(msg+": see https://letsencrypt.org/docs/rate-limits/", args...),
120+
RetryAfter: retryAfter,
114121
}
115122
}
116123

117-
func DuplicateCertificateError(msg string, args ...interface{}) error {
124+
func DuplicateCertificateError(retryAfter time.Duration, msg string, args ...interface{}) error {
118125
return &BoulderError{
119-
Type: RateLimit,
120-
Detail: fmt.Sprintf(msg+": see https://letsencrypt.org/docs/duplicate-certificate-limit/", args...),
126+
Type: RateLimit,
127+
Detail: fmt.Sprintf(msg+": see https://letsencrypt.org/docs/duplicate-certificate-limit/", args...),
128+
RetryAfter: retryAfter,
121129
}
122130
}
123131

124-
func FailedValidationError(msg string, args ...interface{}) error {
132+
func FailedValidationError(retryAfter time.Duration, msg string, args ...interface{}) error {
125133
return &BoulderError{
126-
Type: RateLimit,
127-
Detail: fmt.Sprintf(msg+": see https://letsencrypt.org/docs/failed-validation-limit/", args...),
134+
Type: RateLimit,
135+
Detail: fmt.Sprintf(msg+": see https://letsencrypt.org/docs/failed-validation-limit/", args...),
136+
RetryAfter: retryAfter,
128137
}
129138
}
130139

131-
func RegistrationsPerIPError(msg string, args ...interface{}) error {
140+
func RegistrationsPerIPError(retryAfter time.Duration, msg string, args ...interface{}) error {
132141
return &BoulderError{
133-
Type: RateLimit,
134-
Detail: fmt.Sprintf(msg+": see https://letsencrypt.org/docs/too-many-registrations-for-this-ip/", args...),
142+
Type: RateLimit,
143+
Detail: fmt.Sprintf(msg+": see https://letsencrypt.org/docs/too-many-registrations-for-this-ip/", args...),
144+
RetryAfter: retryAfter,
135145
}
136146
}
137147

0 commit comments

Comments
 (0)