Skip to content

Commit 7d3e03e

Browse files
mattsainsmx-psi
andauthored
[chore] replace deprecated tenv with usetesting (#12576)
#### Description There are a bunch of warnings in the lint output about tenv being deprecated, and moving to usetesting. Reference: https://golangci-lint.run/usage/linters/#tenv #### Link to tracking issue none #### Testing Ran `make golint` and `make all` <!--Describe the documentation added.--> --------- Co-authored-by: Pablo Baeyens <[email protected]>
1 parent 9de8cfd commit 7d3e03e

File tree

7 files changed

+24
-28
lines changed

7 files changed

+24
-28
lines changed

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ linters:
211211
- perfsprint
212212
- revive
213213
- staticcheck
214-
- tenv
214+
- usetesting
215215
- testifylint
216216
- thelper
217217
- unconvert

config/configgrpc/configgrpc_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1165,7 +1165,7 @@ func sendTestRequest(t *testing.T, gcs ClientConfig) (ptraceotlp.ExportResponse,
11651165

11661166
// tempSocketName provides a temporary Unix socket name for testing.
11671167
func tempSocketName(t *testing.T) string {
1168-
tmpfile, err := os.CreateTemp("", "sock")
1168+
tmpfile, err := os.CreateTemp(t.TempDir(), "sock")
11691169
require.NoError(t, err)
11701170
require.NoError(t, tmpfile.Close())
11711171
socket := tmpfile.Name()

config/configtls/clientcasfilereloader_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func createReloader(t *testing.T) (*clientCAsFileReloader, *testLoader, string)
8282
}
8383

8484
func createTempFile(t *testing.T) string {
85-
tmpCa, err := os.CreateTemp("", "clientCAs.crt")
85+
tmpCa, err := os.CreateTemp(t.TempDir(), "clientCAs.crt")
8686
require.NoError(t, err)
8787
tmpCaPath, err := filepath.Abs(tmpCa.Name())
8888
assert.NoError(t, err)

config/configtls/configtls_test.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ func overwriteClientCA(t *testing.T, targetFilePath string, testdataFileName str
456456
}
457457

458458
func createTempClientCaFile(t *testing.T) string {
459-
tmpCa, err := os.CreateTemp("", "ca-tmp.crt")
459+
tmpCa, err := os.CreateTemp(t.TempDir(), "ca-tmp.crt")
460460
require.NoError(t, err)
461461
tmpCaPath, err := filepath.Abs(tmpCa.Name())
462462
assert.NoError(t, err)
@@ -533,18 +533,20 @@ func TestCertificateReload(t *testing.T) {
533533
for _, test := range tests {
534534
t.Run(test.name, func(t *testing.T) {
535535
// Copy certs into a temp dir so we can safely modify them
536-
certFile, err := os.CreateTemp("", "cert")
536+
tempDir := t.TempDir()
537+
certFile, err := os.CreateTemp(tempDir, "cert")
537538
require.NoError(t, err)
538-
defer os.Remove(certFile.Name())
539+
defer certFile.Close()
539540

540-
keyFile, err := os.CreateTemp("", "key")
541+
keyFile, err := os.CreateTemp(tempDir, "key")
541542
require.NoError(t, err)
542-
defer os.Remove(keyFile.Name())
543+
defer keyFile.Close()
543544

544545
fdc, err := os.Open(filepath.Join("testdata", "client-1.crt"))
545546
require.NoError(t, err)
546547
_, err = io.Copy(certFile, fdc)
547548
require.NoError(t, err)
549+
require.NoError(t, fdc.Close())
548550

549551
fdk, err := os.Open(filepath.Join("testdata", "client-1.key"))
550552
require.NoError(t, err)

confmap/internal/e2e/fuzz_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ func targetNested[T any](t *testing.T, value string) {
1919
resolver := NewResolver(t, "types_expand.yaml")
2020

2121
// Use os.Setenv so we can check the error and return instead of failing the fuzzing.
22-
os.Setenv("ENV", "${env:ENV2}") //nolint:tenv
22+
os.Setenv("ENV", "${env:ENV2}") //nolint:usetesting
2323
defer os.Unsetenv("ENV")
24-
err := os.Setenv("ENV2", value) //nolint:tenv
24+
err := os.Setenv("ENV2", value) //nolint:usetesting
2525
defer os.Unsetenv("ENV2")
2626
if err != nil {
2727
return
2828
}
2929
confNested, errResolveNested := resolver.Resolve(context.Background())
3030

31-
err = os.Setenv("ENV", value) //nolint:tenv
31+
err = os.Setenv("ENV", value) //nolint:usetesting
3232
if err != nil {
3333
return
3434
}

confmap/provider/internal/configurablehttpprovider/provider_test.go

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func answerGet(w http.ResponseWriter, _ *http.Request) {
5050

5151
// Generate a self signed certificate specific for the tests. Based on
5252
// https://go.dev/src/crypto/tls/generate_cert.go
53-
func generateCertificate(hostname string) (cert string, key string, err error) {
53+
func generateCertificate(t *testing.T, hostname string) (cert string, key string, err error) {
5454
priv, err := rsa.GenerateKey(rand.Reader, 2048)
5555
if err != nil {
5656
return "", "", fmt.Errorf("Failed to generate private key: %w", err)
@@ -83,23 +83,23 @@ func generateCertificate(hostname string) (cert string, key string, err error) {
8383
return "", "", fmt.Errorf("Failed to create certificate: %w", err)
8484
}
8585

86-
certOut, err := os.CreateTemp("", "cert*.pem")
86+
tempDir := t.TempDir()
87+
certOut, err := os.CreateTemp(tempDir, "cert*.pem")
8788
if err != nil {
8889
return "", "", fmt.Errorf("Failed to open cert.pem for writing: %w", err)
8990
}
9091

92+
defer certOut.Close()
93+
9194
if err = pem.Encode(certOut, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes}); err != nil {
9295
return "", "", fmt.Errorf("Failed to write data to cert.pem: %w", err)
9396
}
9497

95-
if err = certOut.Close(); err != nil {
96-
return "", "", fmt.Errorf("Error closing cert.pem: %w", err)
97-
}
98-
99-
keyOut, err := os.CreateTemp("", "key*.pem")
98+
keyOut, err := os.CreateTemp(tempDir, "key*.pem")
10099
if err != nil {
101100
return "", "", fmt.Errorf("Failed to open key.pem for writing: %w", err)
102101
}
102+
defer keyOut.Close()
103103

104104
privBytes, err := x509.MarshalPKCS8PrivateKey(priv)
105105
if err != nil {
@@ -110,10 +110,6 @@ func generateCertificate(hostname string) (cert string, key string, err error) {
110110
return "", "", fmt.Errorf("Failed to write data to key.pem: %w", err)
111111
}
112112

113-
if err := keyOut.Close(); err != nil {
114-
return "", "", fmt.Errorf("Error closing key.pem: %w", err)
115-
}
116-
117113
return certOut.Name(), keyOut.Name(), nil
118114
}
119115

@@ -127,10 +123,11 @@ func TestFunctionalityDownloadFileHTTP(t *testing.T) {
127123
}
128124

129125
func TestFunctionalityDownloadFileHTTPS(t *testing.T) {
130-
certPath, keyPath, err := generateCertificate("localhost")
126+
certPath, keyPath, err := generateCertificate(t, "localhost")
131127
require.NoError(t, err)
132128

133-
invalidCert, err := os.CreateTemp("", "cert*.crt")
129+
invalidCert, err := os.CreateTemp(t.TempDir(), "cert*.crt")
130+
defer func() { require.NoError(t, invalidCert.Close()) }()
134131
require.NoError(t, err)
135132
_, err = invalidCert.Write([]byte{0, 1, 2})
136133
require.NoError(t, err)
@@ -141,9 +138,6 @@ func TestFunctionalityDownloadFileHTTPS(t *testing.T) {
141138
ts.TLS = &tls.Config{Certificates: []tls.Certificate{cert}}
142139
ts.StartTLS()
143140

144-
defer os.Remove(certPath)
145-
defer os.Remove(keyPath)
146-
defer os.Remove(invalidCert.Name())
147141
defer ts.Close()
148142

149143
tests := []struct {

confmap/resolver_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,14 +489,14 @@ func runScenario(t *testing.T, path string) {
489489
for _, c := range tt.Configs {
490490
// store configs into a temp file. This makes it easier for us to test feature gate functionality
491491
file, err := os.CreateTemp(t.TempDir(), "*.yaml")
492+
defer func() { require.NoError(t, file.Close()) }()
492493
require.NoError(t, err)
493494
b, err := json.Marshal(c)
494495
require.NoError(t, err)
495496
n, err := file.Write(b)
496497
require.NoError(t, err)
497498
require.Positive(t, n, 0)
498499
configFiles = append(configFiles, file.Name())
499-
file.Close()
500500
}
501501

502502
resolver, err := NewResolver(ResolverSettings{

0 commit comments

Comments
 (0)