Skip to content

Commit

Permalink
Pull request #16: 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-2025-01-06 to main

* commit 'f1eda6ba435003776cc310ad7bc2a429a3254921':
  Use alpine:3.21 as base for Docker image
  Update releaser
  Update linter
  Upgrade Go dependencies
  • Loading branch information
Thomas Delbende authored and cavanierc committed Jan 31, 2025
2 parents 052c092 + f1eda6b commit ff8a327
Show file tree
Hide file tree
Showing 6 changed files with 122 additions and 123 deletions.
4 changes: 1 addition & 3 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,14 @@ linters:
disable:
# 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.
- mnd # Same as above.
- mnd # Too picky. For example it says that 1000 (used in number of ms in one second) is a magic number.
- 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.
- execinquery
- exportloopref
# We use maintidx to lint function complexity.
- gocyclo
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM --platform=$BUILDPLATFORM alpine:3.16 AS build
FROM --platform=$BUILDPLATFORM alpine:3.21 AS build

ARG TARGETARCH

COPY dist/squirreldb-ingestor_linux_amd64_v1/squirreldb-ingestor /squirreldb-ingestor.amd64
COPY dist/squirreldb-ingestor_linux_arm64/squirreldb-ingestor /squirreldb-ingestor.arm64
COPY dist/squirreldb-ingestor_linux_arm64_v8.0/squirreldb-ingestor /squirreldb-ingestor.arm64
COPY dist/squirreldb-ingestor_linux_arm_6/squirreldb-ingestor /squirreldb-ingestor.arm

RUN cp -p /squirreldb-ingestor.$TARGETARCH /squirreldb-ingestor
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

GORELEASER_VERSION="v2.3.2"
GORELEASER_VERSION="v2.5.1"
USER_UID=$(id -u)

case "$1" in
Expand Down
57 changes: 29 additions & 28 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ require (
github.com/eclipse/paho.mqtt.golang v1.5.0
github.com/gogo/protobuf v1.3.2
github.com/golang/snappy v0.0.4
github.com/prometheus/common v0.60.0
github.com/prometheus/prometheus v0.55.0
github.com/prometheus/common v0.61.0
github.com/prometheus/prometheus v0.55.1
github.com/rs/zerolog v1.33.0
)

require (
cloud.google.com/go/auth v0.9.9 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
cloud.google.com/go/compute/metadata v0.5.2 // indirect
cloud.google.com/go/auth v0.13.0 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
cloud.google.com/go/compute/metadata v0.6.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 // indirect
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
github.com/alexflint/go-scalar v1.2.0 // indirect
github.com/aws/aws-sdk-go v1.55.5 // indirect
Expand All @@ -34,10 +34,10 @@ require (
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/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/s2a-go v0.1.8 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
github.com/googleapis/gax-go/v2 v2.14.1 // 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
Expand All @@ -56,30 +56,31 @@ require (
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common/sigv4 v0.1.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector/pdata v1.18.0 // indirect
go.opentelemetry.io/collector/semconv v0.112.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
go.opentelemetry.io/otel v1.31.0 // indirect
go.opentelemetry.io/otel/metric v1.31.0 // indirect
go.opentelemetry.io/otel/trace v1.31.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/pdata v1.22.0 // indirect
go.opentelemetry.io/collector/semconv v0.116.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
go.opentelemetry.io/otel v1.33.0 // indirect
go.opentelemetry.io/otel/metric v1.33.0 // indirect
go.opentelemetry.io/otel/trace v1.33.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/time v0.7.0 // indirect
google.golang.org/api v0.203.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
google.golang.org/grpc v1.67.1 // indirect
google.golang.org/protobuf v1.35.1 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/oauth2 v0.25.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.9.0 // indirect
google.golang.org/api v0.214.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241223144023-3abc09e42ca8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
google.golang.org/grpc v1.69.2 // indirect
google.golang.org/protobuf v1.36.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/apimachinery v0.31.2 // indirect
k8s.io/client-go v0.31.2 // indirect
k8s.io/apimachinery v0.32.0 // indirect
k8s.io/client-go v0.32.0 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
)
Loading

0 comments on commit ff8a327

Please sign in to comment.