Skip to content

Commit

Permalink
exp: add experimental slog packages
Browse files Browse the repository at this point in the history
  • Loading branch information
sethvargo committed Jun 30, 2023
1 parent f75fec6 commit 4f42ab7
Show file tree
Hide file tree
Showing 16 changed files with 1,030 additions and 145 deletions.
2 changes: 1 addition & 1 deletion .github/actions/terraform-linter/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ runs:
- id: 'setup-go'
uses: 'actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568' # ratchet:actions/setup-go@v3
with:
go-version: '1.20'
go-version: '1.21'

- id: 'run-linter'
shell: 'bash'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
lint:
uses: './.github/workflows/go-lint.yml'
with:
go_version: '1.20'
go_version: '1.21.0-rc.2'

test:
uses: './.github/workflows/go-test.yml'
with:
go_version: '1.20'
go_version: '1.21.0-rc.2'

lint-terraform:
uses: './.github/workflows/terraform-lint.yml'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
golangci_lint_version:
description: 'Version of golangci linter to use'
type: 'string'
default: 'v1.52'
default: 'v1.53'

jobs:
# modules checks if the go modules are all up-to-date. While rare with modern
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/terraform-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- id: 'setup-go'
uses: 'actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568' # ratchet:actions/setup-go@v3
with:
go-version: '1.20'
go-version: '1.21'

- id: 'run-linter'
shell: 'bash'
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
lint:
uses: 'abcxyz/pkg/.github/workflows/go-lint.yml@main'
with:
go_version: '1.20'
go_version: '1.21'
```
Linting is done via [golangci-lint](https://golangci-lint.run/). If a
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
lint:
uses: 'abcxyz/pkg/.github/workflows/go-test.yml@main'
with:
go_version: '1.20'
go_version: '1.21'
```

Testing is done via the `go test` command with:
Expand Down
4 changes: 2 additions & 2 deletions containertest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: '1.20' # Optional
go-version: '1.21' # Optional
```
... and *don't* do this:
Expand All @@ -111,5 +111,5 @@ jobs:
test:
name: Go Test
runs-on: ubuntu-latest
container: golang:1.20 # DON'T DO THIS
container: golang:1.21 # DON'T DO THIS
```
69 changes: 34 additions & 35 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,81 +1,80 @@
module github.com/abcxyz/pkg

go 1.20
go 1.21

require (
cloud.google.com/go/compute/metadata v0.2.3
github.com/go-sql-driver/mysql v1.7.0
github.com/go-sql-driver/mysql v1.7.1
github.com/google/go-cmp v0.5.9
github.com/hashicorp/hcl/v2 v2.16.2
github.com/jackc/pgx/v5 v5.3.1
github.com/kr/text v0.1.0
github.com/hashicorp/hcl/v2 v2.17.0
github.com/jackc/pgx/v5 v5.4.1
github.com/kr/text v0.2.0
github.com/lestrrat-go/jwx/v2 v2.0.11
github.com/mattn/go-isatty v0.0.17
github.com/ory/dockertest/v3 v3.9.1
github.com/mattn/go-isatty v0.0.19
github.com/ory/dockertest/v3 v3.10.0
github.com/posener/complete/v2 v2.0.1-alpha.13
github.com/sethvargo/go-envconfig v0.9.0
go.uber.org/zap v1.24.0
golang.org/x/oauth2 v0.8.0
golang.org/x/sync v0.1.0
google.golang.org/grpc v1.54.0
google.golang.org/protobuf v1.30.0
golang.org/x/oauth2 v0.9.0
golang.org/x/sync v0.3.0
google.golang.org/grpc v1.56.1
google.golang.org/protobuf v1.31.0
gopkg.in/yaml.v3 v3.0.1
)

require (
cloud.google.com/go/compute v1.18.0 // indirect
cloud.google.com/go/compute v1.20.1 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/Microsoft/go-winio v0.6.0 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
github.com/agext/levenshtein v1.2.3 // indirect
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
github.com/containerd/continuity v0.3.0 // indirect
github.com/benbjohnson/clock v1.3.5 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/containerd/continuity v0.4.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
github.com/docker/cli v23.0.1+incompatible // indirect
github.com/docker/docker v23.0.3+incompatible // indirect
github.com/docker/cli v24.0.2+incompatible // indirect
github.com/docker/docker v24.0.2+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-multierror v1.0.0 // indirect
github.com/imdario/mergo v0.3.14 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/lestrrat-go/blackmagic v1.0.1 // indirect
github.com/lestrrat-go/httpcc v1.0.1 // indirect
github.com/lestrrat-go/httprc v1.0.4 // indirect
github.com/lestrrat-go/iter v1.0.2 // indirect
github.com/lestrrat-go/option v1.0.1 // indirect
github.com/lib/pq v1.10.2 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
github.com/opencontainers/runc v1.1.5 // indirect
github.com/opencontainers/runc v1.1.7 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/posener/script v1.1.5 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
github.com/segmentio/asm v1.2.0 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/zclconf/go-cty v1.13.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.10.0 // indirect
golang.org/x/crypto v0.9.0 // indirect
golang.org/x/mod v0.9.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/tools v0.7.0 // indirect
github.com/zclconf/go-cty v1.13.2 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.10.0 // indirect
golang.org/x/mod v0.11.0 // indirect
golang.org/x/net v0.11.0 // indirect
golang.org/x/sys v0.9.0 // indirect
golang.org/x/text v0.10.0 // indirect
golang.org/x/tools v0.10.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230628200519-e449d1ea0e82 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
Loading

0 comments on commit 4f42ab7

Please sign in to comment.