bump go and deps (#352)

Author: movence

.github/workflows/build-and-upload.yml

@@ -66,7 +66,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v4
         with:
-          go-version: ~1.22.7
+          go-version: '>1.25'
           cache: false
 
       - name: Configure AWS Credentials
@@ -158,7 +158,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v4
         with:
-          go-version: '>1.22'
+          go-version: '>1.25'
           cache: true
 
       - name: Configure AWS Credentials
@@ -285,7 +285,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v4
         with:
-          go-version: '>1.22'
+          go-version: '>1.25'
           cache: true
 
       - name: Configure AWS Credentials

.github/workflows/pr-build-test.yml

@@ -47,7 +47,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: "~1.24.4"
+        go-version: "~1.25.5"
 
     - name: Cache tools
       uses: actions/cache@v4

Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.4
-FROM --platform=$BUILDPLATFORM golang:1.24 AS builder
+FROM --platform=$BUILDPLATFORM golang:1.25 AS builder
 
 # Set build arguments early
 ARG TARGETARCH

Makefile

@@ -195,12 +195,14 @@ $(CONTROLLER_GEN): $(LOCALBIN)
 	test -s $(LOCALBIN)/controller-gen && $(LOCALBIN)/controller-gen --version | grep -q $(CONTROLLER_TOOLS_VERSION) || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
 
 .PHONY: goimports
-goimports:
-	@echo $(ALL_SRC) | xargs -n 10 $(LOCALBIN)/goimports -w -local $(CW_AGENT_OPERATOR_IMPORT_PATH) || GOBIN=$(LOCALBIN) go install golang.org/x/tools/cmd/goimports
+goimports: $(LOCALBIN)
+	@test -s $(LOCALBIN)/goimports || GOBIN=$(LOCALBIN) go install golang.org/x/tools/cmd/goimports@latest
+	@echo $(ALL_SRC) | xargs -n 10 $(LOCALBIN)/goimports -w -local $(CW_AGENT_OPERATOR_IMPORT_PATH)
 
 .PHONY: impi
-impi:
-	@echo $(ALL_SRC) | xargs -n 10 $(LOCALBIN)/impi --local $(CW_AGENT_OPERATOR_IMPORT_PATH) --scheme stdThirdPartyLocal || GOBIN=$(LOCALBIN) go install github.com/pavius/impi/cmd/[email protected]
+impi: $(LOCALBIN)
+	@test -s $(LOCALBIN)/impi || GOBIN=$(LOCALBIN) go install github.com/pavius/impi/cmd/[email protected]
+	@echo $(ALL_SRC) | xargs -n 10 $(LOCALBIN)/impi --local $(CW_AGENT_OPERATOR_IMPORT_PATH) --scheme stdThirdPartyLocal
 	@echo "Check import order/grouping finished"
 
 .PHONY: lint
@@ -237,7 +239,10 @@ checklicense: install-addlicense
 
 .PHONY: golangci-lint
 golangci-lint: ## Download golangci-lint locally if necessary.
-	$(call go-get-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint,$(GOLANGCI_LINT_VERSION))
+# 	$(call go-get-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint,$(GOLANGCI_LINT_VERSION))
+	#Install from source for golangci-lint is not recommended based on https://golangci-lint.run/usage/install/#install-from-source so using binary
+	#installation
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(LOCALBIN) v2.4.0
 
 .PHONY: envtest
 envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.

apis/v1alpha1/collector_webhook.go

@@ -328,15 +328,16 @@ func checkAutoscalerSpec(autoscaler *AutoscalerSpec) error {
 		}
 
 		// pod metrics target only support value and averageValue.
-		if metric.Pods.Target.Type == autoscalingv2.AverageValueMetricType {
+		switch metric.Pods.Target.Type {
+		case autoscalingv2.AverageValueMetricType:
 			if val, ok := metric.Pods.Target.AverageValue.AsInt64(); !ok || val < int64(1) {
 				return fmt.Errorf("the OpenTelemetry Spec autoscale configuration is incorrect, average value should be greater than 0")
 			}
-		} else if metric.Pods.Target.Type == autoscalingv2.ValueMetricType {
+		case autoscalingv2.ValueMetricType:
 			if val, ok := metric.Pods.Target.Value.AsInt64(); !ok || val < int64(1) {
 				return fmt.Errorf("the OpenTelemetry Spec autoscale configuration is incorrect, value should be greater than 0")
 			}
-		} else {
+		default:
 			return fmt.Errorf("the OpenTelemetry Spec autoscale configuration is incorrect, invalid pods target type")
 		}
 	}

apis/v1alpha1/instrumentation_webhook.go

@@ -207,32 +207,32 @@ func (w InstrumentationWebhook) defaulter(r *Instrumentation) error {
 
 func (w InstrumentationWebhook) validate(r *Instrumentation) (admission.Warnings, error) {
 	var warnings []string
-	switch r.Spec.Sampler.Type {
+	switch r.Spec.Type {
 	case "":
 		warnings = append(warnings, "sampler type not set")
 	case TraceIDRatio, ParentBasedTraceIDRatio:
-		if r.Spec.Sampler.Argument != "" {
-			rate, err := strconv.ParseFloat(r.Spec.Sampler.Argument, 64)
+		if r.Spec.Argument != "" {
+			rate, err := strconv.ParseFloat(r.Spec.Argument, 64)
 			if err != nil {
-				return warnings, fmt.Errorf("spec.sampler.argument is not a number: %s", r.Spec.Sampler.Argument)
+				return warnings, fmt.Errorf("spec.sampler.argument is not a number: %s", r.Spec.Argument)
 			}
 			if rate < 0 || rate > 1 {
-				return warnings, fmt.Errorf("spec.sampler.argument should be in rage [0..1]: %s", r.Spec.Sampler.Argument)
+				return warnings, fmt.Errorf("spec.sampler.argument should be in rage [0..1]: %s", r.Spec.Argument)
 			}
 		}
 	case JaegerRemote, ParentBasedJaegerRemote:
 		// value is a comma separated list of endpoint, pollingIntervalMs, initialSamplingRate
 		// Example: `endpoint=http://localhost:14250,pollingIntervalMs=5000,initialSamplingRate=0.25`
-		if r.Spec.Sampler.Argument != "" {
-			err := validateJaegerRemoteSamplerArgument(r.Spec.Sampler.Argument)
+		if r.Spec.Argument != "" {
+			err := validateJaegerRemoteSamplerArgument(r.Spec.Argument)
 
 			if err != nil {
-				return warnings, fmt.Errorf("spec.sampler.argument is not a valid argument for sampler %s: %w", r.Spec.Sampler.Type, err)
+				return warnings, fmt.Errorf("spec.sampler.argument is not a valid argument for sampler %s: %w", r.Spec.Type, err)
 			}
 		}
 	case AlwaysOn, AlwaysOff, ParentBasedAlwaysOn, ParentBasedAlwaysOff, XRaySampler:
 	default:
-		return warnings, fmt.Errorf("spec.sampler.type is not valid: %s", r.Spec.Sampler.Type)
+		return warnings, fmt.Errorf("spec.sampler.type is not valid: %s", r.Spec.Type)
 	}
 
 	// validate env vars

cmd/amazon-cloudwatch-agent-target-allocator/collector/collector_test.go

@@ -159,20 +159,20 @@ func Test_closeChannel(t *testing.T) {
 	tests := []struct {
 		description    string
 		isCloseChannel bool
-		timeoutSeconds time.Duration
+		timeout        time.Duration
 	}{
 		{
 			// event is triggered by channel closing.
 			description:    "close_channel",
 			isCloseChannel: true,
 			// channel should be closed before this timeout occurs
-			timeoutSeconds: 10 * time.Second,
+			timeout: 10 * time.Second,
 		},
 		{
 			// event triggered by timeout.
 			description:    "watcher_timeout",
 			isCloseChannel: false,
-			timeoutSeconds: 0 * time.Second,
+			timeout:        0 * time.Second,
 		},
 	}
 
@@ -190,7 +190,7 @@ func Test_closeChannel(t *testing.T) {
 
 			go func(watcher watch.Interface) {
 				defer wg.Done()
-				ctx, cancel := context.WithTimeout(context.Background(), tc.timeoutSeconds)
+				ctx, cancel := context.WithTimeout(context.Background(), tc.timeout)
 				defer cancel()
 				if msg := runWatch(ctx, &kubeClient, watcher.ResultChan(), map[string]*allocation.Collector{}, func(colMap map[string]*allocation.Collector) {}); msg != "" {
 					terminated = true

cmd/amazon-cloudwatch-agent-target-allocator/config/config.go

@@ -207,7 +207,7 @@ func Load() (*Config, string, error) {
 // ValidateConfig validates the cli and file configs together.
 func ValidateConfig(config *Config) error {
 	scrapeConfigsPresent := config.PromConfig != nil && len(config.PromConfig.ScrapeConfigs) > 0
-	if !(config.PrometheusCR.Enabled || scrapeConfigsPresent) {
+	if !config.PrometheusCR.Enabled && !scrapeConfigsPresent {
 		return fmt.Errorf("at least one scrape config must be defined, or Prometheus CR watching must be enabled")
 	}
 	return nil

cmd/amazon-cloudwatch-agent-target-allocator/server/server_test.go

@@ -1044,37 +1044,37 @@ func generateTestingCerts() (caBundlePath, caCertPath, caKeyPath, clientCertPath
 	if err != nil {
 		return "", "", "", "", "", fmt.Errorf("error creating temp CA cert file: %w", err)
 	}
-	defer caCertFile.Close()
+	defer func() { _ = caCertFile.Close() }()
 
 	caKeyFile, err := os.CreateTemp(tempDir, "ca-key-*.key")
 	if err != nil {
 		return "", "", "", "", "", fmt.Errorf("error creating temp CA key file: %w", err)
 	}
-	defer caKeyFile.Close()
+	defer func() { _ = caKeyFile.Close() }()
 
 	serverCertFile, err := os.CreateTemp(tempDir, "server-cert-*.crt")
 	if err != nil {
 		return "", "", "", "", "", fmt.Errorf("error creating temp server cert file: %w", err)
 	}
-	defer serverCertFile.Close()
+	defer func() { _ = serverCertFile.Close() }()
 
 	serverKeyFile, err := os.CreateTemp(tempDir, "server-key-*.key")
 	if err != nil {
 		return "", "", "", "", "", fmt.Errorf("error creating temp server key file: %w", err)
 	}
-	defer serverKeyFile.Close()
+	defer func() { _ = serverKeyFile.Close() }()
 
 	clientCertFile, err := os.CreateTemp(tempDir, "client-cert-*.crt")
 	if err != nil {
 		return "", "", "", "", "", fmt.Errorf("error creating temp client cert file: %w", err)
 	}
-	defer clientCertFile.Close()
+	defer func() { _ = clientCertFile.Close() }()
 
 	clientKeyFile, err := os.CreateTemp(tempDir, "client-key-*.key")
 	if err != nil {
 		return "", "", "", "", "", fmt.Errorf("error creating temp client key file: %w", err)
 	}
-	defer clientKeyFile.Close()
+	defer func() { _ = clientKeyFile.Close() }()
 
 	// Write the CA, server, and client certificates and keys to their respective files
 	caCertPEMBlock := &pem.Block{Type: "CERTIFICATE", Bytes: caCertBytes}
@@ -1150,7 +1150,7 @@ func createMismatchedClientCert() (caPath string, tlsConfig *tls.Config, err err
 	if err != nil {
 		return "", nil, err
 	}
-	defer caFile.Close()
+	defer func() { _ = caFile.Close() }()
 	err = pem.Encode(caFile, &pem.Block{Type: "CERTIFICATE", Bytes: caBytes})
 	if err != nil {
 		return "", nil, err
@@ -1161,7 +1161,7 @@ func createMismatchedClientCert() (caPath string, tlsConfig *tls.Config, err err
 	if err != nil {
 		return "", nil, err
 	}
-	defer clientCertFile.Close()
+	defer func() { _ = clientCertFile.Close() }()
 	err = pem.Encode(clientCertFile, &pem.Block{Type: "CERTIFICATE", Bytes: clientCertBytes})
 	if err != nil {
 		return "", nil, err
@@ -1172,7 +1172,7 @@ func createMismatchedClientCert() (caPath string, tlsConfig *tls.Config, err err
 	if err != nil {
 		return "", nil, err
 	}
-	defer clientKeyFile.Close()
+	defer func() { _ = clientKeyFile.Close() }()
 	clientKeyBytes, err := x509.MarshalECPrivateKey(clientKey)
 	if err != nil {
 		return "", nil, err

cmd/amazon-cloudwatch-agent-target-allocator/target/discovery.go

@@ -140,6 +140,6 @@ func getScrapeConfigHash(jobToScrapeConfig map[string]*config.ScrapeConfig) (has
 			return nil, err
 		}
 	}
-	yamlEncoder.Close()
+	_ = yamlEncoder.Close()
 	return hash, err
 }