Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Try to make (make lint) pass with Go 1.18 #1492

Merged
merged 1 commit into from
Mar 16, 2022
Merged

Try to make (make lint) pass with Go 1.18 #1492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ tools: .install.gitvalidation .install.golangci-lint .install.golint

.install.golangci-lint:
if [ ! -x "$(GOBIN)/golangci-lint" ]; then \
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(GOBIN) v1.35.2; \
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(GOBIN) v1.44.2; \
fi

.install.golint:
Expand Down
35 changes: 30 additions & 5 deletions pkg/tlsclientconfig/tlsclientconfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,45 @@ func TestSetupCertificates(t *testing.T) {
err := SetupCertificates("testdata/full", &tlsc)
require.NoError(t, err)
require.NotNil(t, tlsc.RootCAs)
// RootCAs include SystemCertPool

// SystemCertPool is implemented natively, and .Subjects() does not
// return raw certificates, on some systems (as of Go 1.18,
// Windows, macOS, iOS); so, .Subjects() is deprecated.
// We still use .Subjects() in these tests, because they work
// acceptably even in the native case, and they work fine on Linux,
// which we care about the most.

// For an unknown reason, with Go 1.18, as of Mar 15 2022,
// (golangci-lint) reports staticcheck SA1019 about using
// the deprecated .Subjects() function, but the //lint:ignore
// directives are ineffective (and cause extra warnings about
// pointless lint:ignore directives). So, use the big hammer
// of silencing staticcheck entirely; that should be removed
// as soon as practical.

// On systems where SystemCertPool is not special-cased, RootCAs include SystemCertPool;
// On systems where SystemCertPool is special cased, this compares two empty sets
// and succeeds.
// There isn’t a plausible alternative to calling .Subjects() here.
loadedSubjectBytes := map[string]struct{}{}
for _, s := range tlsc.RootCAs.Subjects() {
// lint:ignore SA1019 Receiving no data for system roots is acceptable.
for _, s := range tlsc.RootCAs.Subjects() { //nolint staticcheck: the lint:ignore directive is somehow not recognized (and causes an extra warning!)
loadedSubjectBytes[string(s)] = struct{}{}
}
systemCertPool, err := x509.SystemCertPool()
require.NoError(t, err)
for _, s := range systemCertPool.Subjects() {
// lint:ignore SA1019 Receiving no data for system roots is acceptable.
for _, s := range systemCertPool.Subjects() { //nolint staticcheck: the lint:ignore directive is somehow not recognized (and causes an extra warning!)
_, ok := loadedSubjectBytes[string(s)]
assert.True(t, ok)
}
// RootCAs include our certificates

// RootCAs include our certificates.
// We could possibly test without .Subjects() this by validating certificates
// signed by our test CAs.
loadedSubjectCNs := map[string]struct{}{}
for _, s := range tlsc.RootCAs.Subjects() {
// lint:ignore SA1019 We only care about non-system roots here.
for _, s := range tlsc.RootCAs.Subjects() { //nolint staticcheck: the lint:ignore directive is somehow not recognized (and causes an extra warning!)
subjectRDN := pkix.RDNSequence{}
rest, err := asn1.Unmarshal(s, &subjectRDN)
require.NoError(t, err)
Expand Down