fixed the linter warnings (#40)

Author: kommendorkapten

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

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)
 		}
 	}
 

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,17 +211,18 @@ 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)
 
 			slog.Warn("recoverable error, re-trying",
 				"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)

pkg/metrics/prom.go pkg/dtmetrics/prom.gopkg/metrics/prom.go renamed to pkg/dtmetrics/prom.go

@@ -1,4 +1,4 @@
-package metrics
+package dtmetrics
 
 import (
 	"github.com/prometheus/client_golang/prometheus"

pkg/image/digest.go pkg/ociutil/digest.gopkg/image/digest.go renamed to 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...

pkg/image/digest_test.go pkg/ociutil/digest_test.gopkg/image/digest_test.go renamed to pkg/ociutil/digest_test.go

@@ -1,4 +1,4 @@
-package image
+package ociutil
 
 import (
 	"testing"

pkg/image/name.go pkg/ociutil/name.gopkg/image/name.go renamed to pkg/ociutil/name.go

@@ -1,4 +1,4 @@
-package image
+package ociutil
 
 import (
 	"strings"

pkg/image/name_test.go pkg/ociutil/name_test.gopkg/image/name_test.go renamed to pkg/ociutil/name_test.go

@@ -1,4 +1,4 @@
-package image
+package ociutil
 
 import (
 	"testing"