From 60427905df115c4514d3c444ea33a8903f681508 Mon Sep 17 00:00:00 2001
From: Evgenii Stratonikov <e.stratonikov@yadro.com>
Date: Wed, 30 Oct 2024 15:33:10 +0300
Subject: [PATCH] [#1459] .golanci.yml: Add tenv linter, fix issues

Refs #1309

Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
---
 .golangci.yml                          |  1 +
 cmd/frostfs-node/config/calls_test.go  |  4 +---
 cmd/frostfs-node/config/test/config.go | 14 +-------------
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 1235c62b4..57e3b4494 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -88,5 +88,6 @@ linters:
     - testifylint
     - protogetter
     - intrange
+    - tenv
   disable-all: true
   fast: false
diff --git a/cmd/frostfs-node/config/calls_test.go b/cmd/frostfs-node/config/calls_test.go
index 68bf1c679..bc149eb7d 100644
--- a/cmd/frostfs-node/config/calls_test.go
+++ b/cmd/frostfs-node/config/calls_test.go
@@ -1,7 +1,6 @@
 package config_test
 
 import (
-	"os"
 	"strings"
 	"testing"
 
@@ -38,8 +37,7 @@ func TestConfigEnv(t *testing.T) {
 
 	envName := strings.ToUpper(
 		strings.Join([]string{config.EnvPrefix, section, name}, configViper.EnvSeparator))
-	err := os.Setenv(envName, value)
-	require.NoError(t, err)
+	t.Setenv(envName, value)
 
 	c := configtest.EmptyConfig()
 
diff --git a/cmd/frostfs-node/config/test/config.go b/cmd/frostfs-node/config/test/config.go
index a93d7e648..e98c032f0 100644
--- a/cmd/frostfs-node/config/test/config.go
+++ b/cmd/frostfs-node/config/test/config.go
@@ -11,8 +11,6 @@ import (
 )
 
 func fromFile(path string) *config.Config {
-	os.Clearenv() // ENVs have priority over config files, so we do this in tests
-
 	return config.New(path, "", "")
 }
 
@@ -40,15 +38,6 @@ func ForEachFileType(pref string, f func(*config.Config)) {
 
 // ForEnvFileType creates config from `<pref>.env` file.
 func ForEnvFileType(t testing.TB, pref string, f func(*config.Config)) {
-	envs := os.Environ()
-	t.Cleanup(func() {
-		os.Clearenv()
-		for _, env := range envs {
-			keyValue := strings.Split(env, "=")
-			os.Setenv(keyValue[0], keyValue[1])
-		}
-	})
-
 	f(fromEnvFile(t, pref+".env"))
 }
 
@@ -73,7 +62,6 @@ func loadEnv(t testing.TB, path string) {
 
 		v = strings.Trim(v, `"`)
 
-		err = os.Setenv(k, v)
-		require.NoError(t, err, "can't set environment variable")
+		t.Setenv(k, v)
 	}
 }