Skip to content

Commit c1db4a2

Browse files
authored
Merge pull request #57 from cobaltcore-dev/fix-linter
Fix linter
2 parents 6645f8a + c8d79b5 commit c1db4a2

3 files changed

Lines changed: 15 additions & 6 deletions

File tree

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ require (
7676
github.com/x448/float16 v0.8.4 // indirect
7777
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
7878
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 // indirect
79-
go.opentelemetry.io/otel v1.39.0 // indirect
79+
go.opentelemetry.io/otel v1.40.0 // indirect
8080
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0 // indirect
8181
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0 // indirect
82-
go.opentelemetry.io/otel/metric v1.39.0 // indirect
83-
go.opentelemetry.io/otel/sdk v1.39.0 // indirect
84-
go.opentelemetry.io/otel/trace v1.39.0 // indirect
82+
go.opentelemetry.io/otel/metric v1.40.0 // indirect
83+
go.opentelemetry.io/otel/sdk v1.40.0 // indirect
84+
go.opentelemetry.io/otel/trace v1.40.0 // indirect
8585
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
8686
go.uber.org/multierr v1.11.0 // indirect
8787
go.uber.org/zap v1.27.1 // indirect

go.sum

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,18 +191,27 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 h1:ssfIgGN
191191
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0/go.mod h1:GQ/474YrbE4Jx8gZ4q5I4hrhUzM6UPzyrqJYV2AqPoQ=
192192
go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
193193
go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
194+
go.opentelemetry.io/otel v1.40.0 h1:oA5YeOcpRTXq6NN7frwmwFR0Cn3RhTVZvXsP4duvCms=
195+
go.opentelemetry.io/otel v1.40.0/go.mod h1:IMb+uXZUKkMXdPddhwAHm6UfOwJyh4ct1ybIlV14J0g=
194196
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0 h1:f0cb2XPmrqn4XMy9PNliTgRKJgS5WcL/u0/WRYGz4t0=
195197
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0/go.mod h1:vnakAaFckOMiMtOIhFI2MNH4FYrZzXCYxmb1LlhoGz8=
196198
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0 h1:in9O8ESIOlwJAEGTkkf34DesGRAc/Pn8qJ7k3r/42LM=
197199
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0/go.mod h1:Rp0EXBm5tfnv0WL+ARyO/PHBEaEAT8UUHQ6AGJcSq6c=
198200
go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=
199201
go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
202+
go.opentelemetry.io/otel/metric v1.40.0 h1:rcZe317KPftE2rstWIBitCdVp89A2HqjkxR3c11+p9g=
203+
go.opentelemetry.io/otel/metric v1.40.0/go.mod h1:ib/crwQH7N3r5kfiBZQbwrTge743UDc7DTFVZrrXnqc=
200204
go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18=
201205
go.opentelemetry.io/otel/sdk v1.39.0/go.mod h1:vDojkC4/jsTJsE+kh+LXYQlbL8CgrEcwmt1ENZszdJE=
206+
go.opentelemetry.io/otel/sdk v1.40.0 h1:KHW/jUzgo6wsPh9At46+h4upjtccTmuZCFAc9OJ71f8=
207+
go.opentelemetry.io/otel/sdk v1.40.0/go.mod h1:Ph7EFdYvxq72Y8Li9q8KebuYUr2KoeyHx0DRMKrYBUE=
202208
go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8=
203209
go.opentelemetry.io/otel/sdk/metric v1.39.0/go.mod h1:xq9HEVH7qeX69/JnwEfp6fVq5wosJsY1mt4lLfYdVew=
210+
go.opentelemetry.io/otel/sdk/metric v1.40.0 h1:mtmdVqgQkeRxHgRv4qhyJduP3fYJRMX4AtAlbuWdCYw=
204211
go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=
205212
go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA=
213+
go.opentelemetry.io/otel/trace v1.40.0 h1:WA4etStDttCSYuhwvEa8OP8I5EWu24lkOzp+ZYblVjw=
214+
go.opentelemetry.io/otel/trace v1.40.0/go.mod h1:zeAhriXecNGP/s2SEG3+Y8X9ujcJOTqQ5RgdEJcawiA=
206215
go.opentelemetry.io/proto/otlp v1.9.0 h1:l706jCMITVouPOqEnii2fIAuO3IVGBRPV5ICjceRb/A=
207216
go.opentelemetry.io/proto/otlp v1.9.0/go.mod h1:xE+Cx5E/eEHw+ISFkwPLwCZefwVjY+pqKg1qcK03+/4=
208217
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=

internal/controller/secret_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func (r *SecretReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
112112
// Save the last resource version to file system
113113
pki := os.Getenv("PKI_PATH")
114114
path := filepath.Join(pki, "CA", ".last_resource_version")
115-
if err = os.WriteFile(path, []byte(secret.ResourceVersion), 0600); err != nil { //nolint:gosec // PKI_PATH is controlled by deployment configuration
115+
if err = os.WriteFile(path, []byte(secret.ResourceVersion), 0600); err != nil {
116116
// not a failure condition, just log the error
117117
log.Error(err, "failed to write last resource version", "path", path)
118118
}
@@ -128,7 +128,7 @@ func (r *SecretReconciler) SetupWithManager(mgr ctrl.Manager) error {
128128
// processing if the resource version hasn't changed
129129
pki := os.Getenv("PKI_PATH")
130130
path := filepath.Join(pki, "CA", ".last_resource_version")
131-
if buf, err := os.ReadFile(path); err != nil { //nolint:gosec // PKI_PATH is controlled by deployment configuration
131+
if buf, err := os.ReadFile(path); err != nil {
132132
logger.Log.Info("No last resource version found for PKI secrets", "path", path)
133133
} else {
134134
r.lastResourceVersion = string(buf)

0 commit comments

Comments
 (0)