From 18417ec0c0babe77ed0f23cf04f8da6f22623e76 Mon Sep 17 00:00:00 2001
From: Fernandez Ludovic <ldez@users.noreply.github.com>
Date: Sun, 2 Feb 2025 00:58:15 +0100
Subject: [PATCH 1/2] tenv: deprecation

---
 .golangci.next.reference.yml                    | 9 ++++-----
 jsonschema/golangci.next.jsonschema.json        | 2 +-
 pkg/config/linters_settings.go                  | 2 +-
 pkg/golinters/usetesting/testdata/usetesting.go | 2 +-
 pkg/lint/lintersdb/builder_linter.go            | 3 ++-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.golangci.next.reference.yml b/.golangci.next.reference.yml
index 0f8586d2b583..a5f0ec11cf1b 100644
--- a/.golangci.next.reference.yml
+++ b/.golangci.next.reference.yml
@@ -106,7 +106,6 @@ linters:
     - stylecheck
     - tagalign
     - tagliatelle
-    - tenv
     - testableexamples
     - testifylint
     - testpackage
@@ -225,7 +224,6 @@ linters:
     - stylecheck
     - tagalign
     - tagliatelle
-    - tenv
     - testableexamples
     - testifylint
     - testpackage
@@ -245,13 +243,14 @@ linters:
     - deadcode # Deprecated
     - exhaustivestruct # Deprecated
     - golint # Deprecated
+    - gomnd # Deprecated
     - ifshort # Deprecated
     - interfacer # Deprecated
     - maligned # Deprecated
-    - gomnd # Deprecated
     - nosnakecase # Deprecated
     - scopelint # Deprecated
     - structcheck # Deprecated
+    - tenv # Deprecated
     - varcheck # Deprecated
 
   # Enable presets.
@@ -3656,8 +3655,8 @@ linters-settings:
     os-mkdir-temp: false
 
     # Enable/disable `os.Setenv()` detections.
-    # Default: false
-    os-setenv: true
+    # Default: true
+    os-setenv: false
 
     # Enable/disable `os.TempDir()` detections.
     # Default: false
diff --git a/jsonschema/golangci.next.jsonschema.json b/jsonschema/golangci.next.jsonschema.json
index 888d8249d807..64c2d3f51f2b 100644
--- a/jsonschema/golangci.next.jsonschema.json
+++ b/jsonschema/golangci.next.jsonschema.json
@@ -3488,7 +3488,7 @@
             },
             "os-setenv": {
               "type": "boolean",
-              "default": false
+              "default": true
             },
             "os-create-temp": {
               "type": "boolean",
diff --git a/pkg/config/linters_settings.go b/pkg/config/linters_settings.go
index 9968f3a0760b..eb274ba774fc 100644
--- a/pkg/config/linters_settings.go
+++ b/pkg/config/linters_settings.go
@@ -183,7 +183,7 @@ var defaultLintersSettings = LintersSettings{
 		ContextTodo:       true,
 		OSChdir:           true,
 		OSMkdirTemp:       true,
-		OSSetenv:          false,
+		OSSetenv:          true,
 		OSTempDir:         false,
 		OSCreateTemp:      true,
 	},
diff --git a/pkg/golinters/usetesting/testdata/usetesting.go b/pkg/golinters/usetesting/testdata/usetesting.go
index 579908d48be5..d37dfd782000 100644
--- a/pkg/golinters/usetesting/testdata/usetesting.go
+++ b/pkg/golinters/usetesting/testdata/usetesting.go
@@ -11,7 +11,7 @@ func Test_osMkdirTemp(t *testing.T) {
 }
 
 func Test_osSetenv(t *testing.T) {
-	os.Setenv("", "")
+	os.Setenv("", "") // want `s\.Setenv\(\) could be replaced by t\.Setenv\(\) in .+`
 }
 
 func Test_osTempDir(t *testing.T) {
diff --git a/pkg/lint/lintersdb/builder_linter.go b/pkg/lint/lintersdb/builder_linter.go
index ac5ff5d6f22b..4fb068acdc96 100644
--- a/pkg/lint/lintersdb/builder_linter.go
+++ b/pkg/lint/lintersdb/builder_linter.go
@@ -769,7 +769,8 @@ func (LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
 			WithSince("v1.43.0").
 			WithPresets(linter.PresetTest).
 			WithLoadForGoAnalysis().
-			WithURL("https://github.com/sivchari/tenv"),
+			WithURL("https://github.com/sivchari/tenv").
+			DeprecatedWarning("Duplicate feature another linter.", "v1.64.0", "usetesting"),
 
 		linter.NewConfig(testableexamples.New()).
 			WithSince("v1.50.0").

From 7553a1ae434fb6486d9e74a57c6e30fc6018d30c Mon Sep 17 00:00:00 2001
From: Fernandez Ludovic <ldez@users.noreply.github.com>
Date: Tue, 4 Feb 2025 03:44:02 +0100
Subject: [PATCH 2/2] review

---
 pkg/golinters/usetesting/testdata/usetesting.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/golinters/usetesting/testdata/usetesting.go b/pkg/golinters/usetesting/testdata/usetesting.go
index d37dfd782000..2d724e11da6b 100644
--- a/pkg/golinters/usetesting/testdata/usetesting.go
+++ b/pkg/golinters/usetesting/testdata/usetesting.go
@@ -11,7 +11,7 @@ func Test_osMkdirTemp(t *testing.T) {
 }
 
 func Test_osSetenv(t *testing.T) {
-	os.Setenv("", "") // want `s\.Setenv\(\) could be replaced by t\.Setenv\(\) in .+`
+	os.Setenv("", "") // want `os\.Setenv\(\) could be replaced by t\.Setenv\(\) in .+`
 }
 
 func Test_osTempDir(t *testing.T) {