Skip to content

Commit

Permalink
Run go mod tidy for Go 1.17 and adopt new build tag format
Browse files Browse the repository at this point in the history
  • Loading branch information
csstaub committed Sep 23, 2021
1 parent 69519ed commit bf04b55
Show file tree
Hide file tree
Showing 62 changed files with 92 additions and 607 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,3 +1,4 @@
.DS_Store
.vscode
*.log
*.srl
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -90,7 +90,7 @@ To run tests:
make test

# Option 2: run unit & integration tests in a Docker container
GO_VERSION=1.16 make docker-test
GO_VERSION=1.17 make docker-test

# Open coverage information in browser
go tool cover -html coverage-merged.out
Expand Down
2 changes: 1 addition & 1 deletion certloader/certstore_disabled.go
@@ -1,4 +1,4 @@
// +build !darwin,!windows
//go:build !darwin && !windows

/*-
* Copyright 2018 Square Inc.
Expand Down
2 changes: 1 addition & 1 deletion certloader/certstore_enabled.go
@@ -1,4 +1,4 @@
// +build darwin windows
//go:build darwin || windows

/*-
* Copyright 2018 Square Inc.
Expand Down
2 changes: 1 addition & 1 deletion certloader/pkcs11_disabled.go
@@ -1,4 +1,4 @@
// +build !cgo nopkcs11
//go:build !cgo || nopkcs11

/*-
* Copyright 2018 Square Inc.
Expand Down
2 changes: 1 addition & 1 deletion certloader/pkcs11_enabled.go
@@ -1,4 +1,4 @@
// +build cgo,!nopkcs11
//go:build cgo && !nopkcs11

/*-
* Copyright 2018 Square Inc.
Expand Down
2 changes: 1 addition & 1 deletion certloader/pkcs11_test.go
@@ -1,4 +1,4 @@
// +build cgo
//go:build cgo

/*-
* Copyright 2018 Square Inc.
Expand Down
33 changes: 32 additions & 1 deletion go.mod
Expand Up @@ -34,4 +34,35 @@ require (
gopkg.in/alecthomas/kingpin.v2 v2.2.6
)

go 1.16
require (
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fatih/color v1.9.0 // indirect
github.com/gogo/protobuf v1.2.1 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/klauspost/cpuid/v2 v2.0.6 // indirect
github.com/libdns/libdns v0.2.1 // indirect
github.com/mattn/go-colorable v0.1.4 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/miekg/dns v1.1.42 // indirect
github.com/mitchellh/reflectwalk v1.0.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.17.0 // indirect
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect
golang.org/x/net v0.0.0-20210525063256-abc453219eb5 // indirect
golang.org/x/text v0.3.6 // indirect
google.golang.org/protobuf v1.26.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
)

go 1.17
2 changes: 1 addition & 1 deletion socket/launchd_disabled.go
@@ -1,4 +1,4 @@
// +build !darwin
//go:build !darwin

/*-
* Copyright 2019 Square Inc.
Expand Down
2 changes: 1 addition & 1 deletion socket/launchd_enabled.go
@@ -1,4 +1,4 @@
// +build darwin
//go:build darwin

/*-
* Copyright 2019 Square Inc.
Expand Down
2 changes: 1 addition & 1 deletion socket/systemd_disabled.go
@@ -1,4 +1,4 @@
// +build !linux
//go:build !linux

/*-
* Copyright 2019 Square Inc.
Expand Down
2 changes: 1 addition & 1 deletion socket/systemd_enabled.go
@@ -1,4 +1,4 @@
// +build linux
//go:build linux

/*-
* Copyright 2019 Square Inc.
Expand Down
2 changes: 1 addition & 1 deletion unix.go
@@ -1,4 +1,4 @@
// +build !windows
//go:build !windows

/*-
* Copyright 2015 Square Inc.
Expand Down
1 change: 0 additions & 1 deletion vendor/github.com/alecthomas/template/go.mod

This file was deleted.

5 changes: 0 additions & 5 deletions vendor/github.com/alecthomas/units/go.mod

This file was deleted.

11 changes: 0 additions & 11 deletions vendor/github.com/alecthomas/units/go.sum

This file was deleted.

13 changes: 0 additions & 13 deletions vendor/github.com/caddyserver/certmagic/go.mod

This file was deleted.

85 changes: 0 additions & 85 deletions vendor/github.com/caddyserver/certmagic/go.sum

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/cespare/xxhash/v2/go.mod

This file was deleted.

Empty file.
8 changes: 0 additions & 8 deletions vendor/github.com/deathowl/go-metrics-prometheus/go.mod

This file was deleted.

69 changes: 0 additions & 69 deletions vendor/github.com/deathowl/go-metrics-prometheus/go.sum

This file was deleted.

8 changes: 0 additions & 8 deletions vendor/github.com/fatih/color/go.mod

This file was deleted.

0 comments on commit bf04b55

Please sign in to comment.