Merge remote-tracking branch 'origin/master' into CLOUDP-320243-dev-2.0.0

Author: svc-apix-Bot

.github/workflows/code-health.yml

@@ -55,7 +55,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9
         with:
-          version: v2.1.6 # Also update GOLANGCI_VERSION variable in GNUmakefile when updating this version
+          version: v2.3.1 # Also update GOLANGCI_VERSION variable in GNUmakefile when updating this version
       - name: actionlint
         run: |
           make tools

Makefile

@@ -16,7 +16,7 @@ GITTAG=$(shell git describe --always --tags)
 VERSION=$(GITTAG:v%=%)
 LINKER_FLAGS=-s -w -X 'github.com/mongodb/terraform-provider-mongodbatlas/version.ProviderVersion=${VERSION}'
 
-GOLANGCI_VERSION=v2.1.6 # Also update golangci-lint GH action in code-health.yml when updating this version
+GOLANGCI_VERSION=v2.3.1 # Also update golangci-lint GH action in code-health.yml when updating this version
 
 export PATH := $(shell go env GOPATH)/bin:$(PATH)
 export SHELL := env PATH=$(PATH) /bin/bash

go.mod

@@ -1,6 +1,6 @@
 module github.com/mongodb/terraform-provider-mongodbatlas
 
-go 1.24.5
+go 1.24.6
 
 require (
 	github.com/andygrunwald/go-jira/v2 v2.0.0-20240116150243-50d59fe116d6

internal/serviceapi/clusterapi/resource_schema.go

@@ -142,7 +142,7 @@ func TestCleanProjectAndClusters(t *testing.T) {
 		})
 	}
 	t.Cleanup(func() {
-		projectsAfter := readAllProjects(context.Background(), t, client) //nolint:usetesting // reason: using context.Background() here intentionally because t.Context() is canceled at cleanup
+		projectsAfter := readAllProjects(context.Background(), t, client) // reason: using context.Background() here intentionally because t.Context() is canceled at cleanup
 		t.Logf("SUMMARY\nProjects changed from %d to %d\ndelete_errors=%d\nempty_project_count=%d\nDRY_RUN=%t", projectsBefore, len(projectsAfter), deleteErrors, emptyProjectCount, dryRun)
 	})
 }

internal/serviceapi/projectapi/resource_schema.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"os"
@@ -75,12 +76,12 @@ func writeToFile(fileName, content string) error {
 
 // formatGoFile runs goimports and fieldalignment on the specified Go file
 func formatGoFile(filePath string) {
-	goimportsCmd := exec.Command("goimports", "-w", filePath)
+	goimportsCmd := exec.CommandContext(context.Background(), "goimports", "-w", filePath)
 	if output, err := goimportsCmd.CombinedOutput(); err != nil {
 		log.Printf("warning: goimports failed for %s: %v\nOutput: %s", filePath, err, output)
 	}
 
-	fieldalignmentCmd := exec.Command("fieldalignment", "-fix", filePath)
+	fieldalignmentCmd := exec.CommandContext(context.Background(), "fieldalignment", "-fix", filePath)
 	if output, err := fieldalignmentCmd.CombinedOutput(); err != nil {
 		log.Printf("warning: fieldalignment failed for %s: %v\nOutput: %s", filePath, err, output)
 	}