Skip to content

Commit

Permalink
Pull request #11: Upgrade Go dependencies, update linter & releaser
Browse files Browse the repository at this point in the history
Merge in PRODUCT/squirreldb-ingestor from upgrade-deps-2024-06-24 to main

* commit '4527314eed3c00c8a0afd04f0d2f72facace275c':
  Update linter & releaser
  Upgrade Go dependencies
  • Loading branch information
Thomas Delbende authored and cavanierc committed Jun 28, 2024
2 parents 37866f4 + 4527314 commit dc5e937
Show file tree
Hide file tree
Showing 6 changed files with 150 additions and 167 deletions.
16 changes: 3 additions & 13 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,22 @@ linters:
# Base linters disabled for all projects.
- funlen
- gomnd # Too picky. For example it says that 1000 (used in number of ms in one second) is a magic number.
- exhaustivestruct # This linter is meant to be used only for special cases. It is not recommended to use it for all files in a project.
- exhaustruct # Same as above.
- mnd # Same as above.
- exhaustruct # This linter is meant to be used only for special cases. It is not recommended to use it for all files in a project.
- gci # Conflicts with gofumpt.
- varnamelen # I think there is too many false-positive.
- ireturn # Complain that interface A implementation method return an interface B... it's a requirement of interface A that is unavoidable.
- nonamedreturns # Warn for every named return, not useful.
- interfacebloat # Warn when an interface has too many methods, not useful.
# Deprecated and replaced linter.
- maligned
- golint
- interfacer
- scopelint
- ifshort
- deadcode
- structcheck
- varcheck
- nosnakecase
- execinquery
# We use maintidx to lint function complexity.
- gocyclo
- cyclop
- gocognit

linters-settings:
nolintlint:
# Ensure that nolint directives don't have a leading space.
allow-leading-space: false
# Require nolint directives to mention the specific linter being suppressed.
require-specific: true

Expand Down
1 change: 1 addition & 0 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
version: 2
project_name: squirreldb-ingestor
snapshot:
# Our version is based on the date.
Expand Down
5 changes: 2 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

set -e


GORELEASER_VERSION="v1.25.1"
GORELEASER_VERSION="v2.0.1"
USER_UID=$(id -u)

case "$1" in
Expand Down Expand Up @@ -68,7 +67,7 @@ else
git config --global --add safe.directory /src
goreleaser check
go test ./...
goreleaser --rm-dist --snapshot --parallelism 2
goreleaser --clean --snapshot --parallelism 2
chown -R $USER_UID dist
"

Expand Down
68 changes: 33 additions & 35 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,75 +5,73 @@ go 1.22.0
toolchain go1.22.1

require (
github.com/alexflint/go-arg v1.4.3
github.com/alexflint/go-arg v1.5.0
github.com/eclipse/paho.mqtt.golang v1.4.3
github.com/gogo/protobuf v1.3.2
github.com/golang/snappy v0.0.4
github.com/prometheus/common v0.53.0
github.com/prometheus/prometheus v0.51.2
github.com/rs/zerolog v1.32.0
github.com/prometheus/common v0.54.0
github.com/prometheus/prometheus v0.53.0
github.com/rs/zerolog v1.33.0
)

require (
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.6.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.9.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect
github.com/alexflint/go-scalar v1.2.0 // indirect
github.com/aws/aws-sdk-go v1.51.27 // indirect
github.com/aws/aws-sdk-go v1.54.6 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/dennwc/varint v1.0.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.8 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/prometheus/client_golang v1.19.0 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common/sigv4 v0.1.0 // indirect
github.com/prometheus/procfs v0.14.0 // indirect
go.opentelemetry.io/collector/featuregate v1.6.0 // indirect
go.opentelemetry.io/collector/pdata v1.6.0 // indirect
go.opentelemetry.io/collector/semconv v0.99.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0 // indirect
go.opentelemetry.io/otel v1.25.0 // indirect
go.opentelemetry.io/otel/metric v1.25.0 // indirect
go.opentelemetry.io/otel/trace v1.25.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
go.opentelemetry.io/collector/pdata v1.10.0 // indirect
go.opentelemetry.io/collector/semconv v0.103.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
go.opentelemetry.io/otel v1.27.0 // indirect
go.opentelemetry.io/otel/metric v1.27.0 // indirect
go.opentelemetry.io/otel/trace v1.27.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/oauth2 v0.19.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.20.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
google.golang.org/grpc v1.63.2 // indirect
google.golang.org/protobuf v1.33.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240617180043-68d350f18fd4 // indirect
google.golang.org/grpc v1.64.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/apimachinery v0.30.0 // indirect
k8s.io/client-go v0.30.0 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/utils v0.0.0-20240423183400-0849a56e8f22 // indirect
k8s.io/apimachinery v0.30.2 // indirect
k8s.io/client-go v0.30.2 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
)
Loading

0 comments on commit dc5e937

Please sign in to comment.