From a971700c05c2d96b8ff56546af72c111e5de654c Mon Sep 17 00:00:00 2001 From: Fredrik Skogman Date: Tue, 17 Feb 2026 16:52:19 +0100 Subject: [PATCH] fixed the linter warnings --- internal/controller/config.go | 13 +++++++------ internal/controller/controller.go | 18 +++++++++--------- pkg/deploymentrecord/client.go | 15 ++++++++------- pkg/{metrics => dtmetrics}/prom.go | 2 +- pkg/{image => ociutil}/digest.go | 2 +- pkg/{image => ociutil}/digest_test.go | 2 +- pkg/{image => ociutil}/name.go | 2 +- pkg/{image => ociutil}/name_test.go | 2 +- 8 files changed, 29 insertions(+), 27 deletions(-) rename pkg/{metrics => dtmetrics}/prom.go (99%) rename pkg/{image => ociutil}/digest.go (97%) rename pkg/{image => ociutil}/digest_test.go (99%) rename pkg/{image => ociutil}/name.go (98%) rename pkg/{image => ociutil}/name_test.go (99%) diff --git a/internal/controller/config.go b/internal/controller/config.go index 53d051b..73e08d0 100644 --- a/internal/controller/config.go +++ b/internal/controller/config.go @@ -19,12 +19,13 @@ type Config struct { LogicalEnvironment string PhysicalEnvironment string Cluster string - APIToken string - BaseURL string - GHAppID string - GHInstallID string - GHAppPrivateKey string - Organization string + //nolint:gosec + APIToken string + BaseURL string + GHAppID string + GHInstallID string + GHAppPrivateKey string + Organization string } // ValidTemplate verifies that at least one placeholder is present diff --git a/internal/controller/controller.go b/internal/controller/controller.go index 1104cea..f4b333b 100644 --- a/internal/controller/controller.go +++ b/internal/controller/controller.go @@ -10,8 +10,8 @@ import ( "time" "github.com/github/deployment-tracker/pkg/deploymentrecord" - "github.com/github/deployment-tracker/pkg/image" - "github.com/github/deployment-tracker/pkg/metrics" + "github.com/github/deployment-tracker/pkg/dtmetrics" + "github.com/github/deployment-tracker/pkg/ociutil" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" amcache "k8s.io/apimachinery/pkg/util/cache" @@ -271,14 +271,14 @@ func (c *Controller) processNextItem(ctx context.Context) bool { dur := time.Since(start) if err == nil { - metrics.EventsProcessedOk.WithLabelValues(event.EventType).Inc() - metrics.EventsProcessedTimer.WithLabelValues("ok").Observe(dur.Seconds()) + dtmetrics.EventsProcessedOk.WithLabelValues(event.EventType).Inc() + dtmetrics.EventsProcessedTimer.WithLabelValues("ok").Observe(dur.Seconds()) c.workqueue.Forget(event) return true } - metrics.EventsProcessedTimer.WithLabelValues("failed").Observe(dur.Seconds()) - metrics.EventsProcessedFailed.WithLabelValues(event.EventType).Inc() + dtmetrics.EventsProcessedTimer.WithLabelValues("failed").Observe(dur.Seconds()) + dtmetrics.EventsProcessedFailed.WithLabelValues(event.EventType).Inc() // Requeue on error with rate limiting slog.Error("Failed to process event, requeuing", @@ -443,7 +443,7 @@ func (c *Controller) recordContainer(ctx context.Context, pod *corev1.Pod, conta } // Extract image name and tag - imageName, version := image.ExtractName(container.Image) + imageName, version := ociutil.ExtractName(container.Image) // Create deployment record record := deploymentrecord.NewDeploymentRecord( @@ -676,14 +676,14 @@ func getContainerDigest(pod *corev1.Pod, containerName string) string { // Check regular container statuses for _, status := range pod.Status.ContainerStatuses { if status.Name == containerName { - return image.ExtractDigest(status.ImageID) + return ociutil.ExtractDigest(status.ImageID) } } // Check init container statuses for _, status := range pod.Status.InitContainerStatuses { if status.Name == containerName { - return image.ExtractDigest(status.ImageID) + return ociutil.ExtractDigest(status.ImageID) } } diff --git a/pkg/deploymentrecord/client.go b/pkg/deploymentrecord/client.go index 34f8d0a..a9199ad 100644 --- a/pkg/deploymentrecord/client.go +++ b/pkg/deploymentrecord/client.go @@ -17,7 +17,7 @@ import ( "time" "github.com/bradleyfalzon/ghinstallation/v2" - "github.com/github/deployment-tracker/pkg/metrics" + "github.com/github/deployment-tracker/pkg/dtmetrics" "golang.org/x/time/rate" ) @@ -211,9 +211,10 @@ func (c *Client) PostOne(ctx context.Context, record *DeploymentRecord) error { } start := time.Now() + // nolint: gosec resp, err := c.httpClient.Do(req) dur := time.Since(start) - metrics.PostDeploymentRecordTimer.Observe(dur.Seconds()) + dtmetrics.PostDeploymentRecordTimer.Observe(dur.Seconds()) if err != nil { lastErr = fmt.Errorf("post request failed: %w", err) @@ -221,7 +222,7 @@ func (c *Client) PostOne(ctx context.Context, record *DeploymentRecord) error { "attempt", attempt, "retries", c.retries, "error", lastErr) - metrics.PostDeploymentRecordSoftFail.Inc() + dtmetrics.PostDeploymentRecordSoftFail.Inc() continue } @@ -230,7 +231,7 @@ func (c *Client) PostOne(ctx context.Context, record *DeploymentRecord) error { resp.Body.Close() if resp.StatusCode >= 200 && resp.StatusCode < 300 { - metrics.PostDeploymentRecordOk.Inc() + dtmetrics.PostDeploymentRecordOk.Inc() return nil } @@ -239,16 +240,16 @@ func (c *Client) PostOne(ctx context.Context, record *DeploymentRecord) error { // Don't retry on client errors (4xx) except for 429 // (rate limit) if resp.StatusCode >= 400 && resp.StatusCode < 500 && resp.StatusCode != 429 { - metrics.PostDeploymentRecordClientError.Inc() + dtmetrics.PostDeploymentRecordClientError.Inc() slog.Warn("client error, aborting", "attempt", attempt, "error", lastErr) return &ClientError{err: lastErr} } - metrics.PostDeploymentRecordSoftFail.Inc() + dtmetrics.PostDeploymentRecordSoftFail.Inc() } - metrics.PostDeploymentRecordHardFail.Inc() + dtmetrics.PostDeploymentRecordHardFail.Inc() slog.Error("all retries exhausted", "count", c.retries, "error", lastErr) diff --git a/pkg/metrics/prom.go b/pkg/dtmetrics/prom.go similarity index 99% rename from pkg/metrics/prom.go rename to pkg/dtmetrics/prom.go index 3d28cb4..8e76ff8 100644 --- a/pkg/metrics/prom.go +++ b/pkg/dtmetrics/prom.go @@ -1,4 +1,4 @@ -package metrics +package dtmetrics import ( "github.com/prometheus/client_golang/prometheus" diff --git a/pkg/image/digest.go b/pkg/ociutil/digest.go similarity index 97% rename from pkg/image/digest.go rename to pkg/ociutil/digest.go index 9a43ab8..fdbb65f 100644 --- a/pkg/image/digest.go +++ b/pkg/ociutil/digest.go @@ -1,4 +1,4 @@ -package image +package ociutil // ExtractDigest extracts the digest from an ImageID. // ImageID format is typically: docker-pullable://image@sha256:abc123... diff --git a/pkg/image/digest_test.go b/pkg/ociutil/digest_test.go similarity index 99% rename from pkg/image/digest_test.go rename to pkg/ociutil/digest_test.go index fcc18a8..850bc00 100644 --- a/pkg/image/digest_test.go +++ b/pkg/ociutil/digest_test.go @@ -1,4 +1,4 @@ -package image +package ociutil import ( "testing" diff --git a/pkg/image/name.go b/pkg/ociutil/name.go similarity index 98% rename from pkg/image/name.go rename to pkg/ociutil/name.go index 3e70481..e0b992a 100644 --- a/pkg/image/name.go +++ b/pkg/ociutil/name.go @@ -1,4 +1,4 @@ -package image +package ociutil import ( "strings" diff --git a/pkg/image/name_test.go b/pkg/ociutil/name_test.go similarity index 99% rename from pkg/image/name_test.go rename to pkg/ociutil/name_test.go index 251a0e9..a660216 100644 --- a/pkg/image/name_test.go +++ b/pkg/ociutil/name_test.go @@ -1,4 +1,4 @@ -package image +package ociutil import ( "testing"