Skip to content

Commit 0eecfe2

Browse files
committed
transport/ca/localca: remove uses of deprecated io/ioutil
Using their replacements instead. Also making use of t.TempDir(), to let Go's testing take care of cleaning up. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent b069c86 commit 0eecfe2

File tree

1 file changed

+6
-25
lines changed

1 file changed

+6
-25
lines changed

transport/ca/localca/signer_test.go

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,15 @@ package localca
33
import (
44
"encoding/pem"
55
"errors"
6-
"io/ioutil"
76
"os"
7+
"path/filepath"
88
"testing"
99

1010
"github.com/cloudflare/cfssl/csr"
1111
"github.com/cloudflare/cfssl/helpers"
1212
"github.com/cloudflare/cfssl/initca"
1313
)
1414

15-
func tempName() (string, error) {
16-
tmpf, err := ioutil.TempFile("", "transport_cachedkp_")
17-
if err != nil {
18-
return "", err
19-
}
20-
21-
name := tmpf.Name()
22-
tmpf.Close()
23-
return name, nil
24-
}
25-
2615
func TestEncodePEM(t *testing.T) {
2716
p := &pem.Block{
2817
Type: "CERTIFICATE REQUEST",
@@ -48,24 +37,16 @@ func TestLoadSigner(t *testing.T) {
4837
t.Fatalf("expected an errNotSetup (%v), got: %v", errNotSetup, err)
4938
}
5039

51-
lca.KeyFile, err = tempName()
52-
if err != nil {
53-
t.Fatal(err)
54-
}
55-
defer os.Remove(lca.KeyFile)
56-
57-
lca.CertFile, err = tempName()
58-
if err != nil {
59-
t.Fatal(err)
60-
}
61-
defer os.Remove(lca.CertFile)
40+
tmpDir := t.TempDir()
41+
lca.KeyFile = filepath.Join(tmpDir, "KeyFile")
42+
lca.CertFile = filepath.Join(tmpDir, "CertFile")
6243

63-
err = ioutil.WriteFile(lca.KeyFile, keyPEM, 0644)
44+
err = os.WriteFile(lca.KeyFile, keyPEM, 0644)
6445
if err != nil {
6546
t.Fatal(err)
6647
}
6748

68-
err = ioutil.WriteFile(lca.CertFile, certPEM, 0644)
49+
err = os.WriteFile(lca.CertFile, certPEM, 0644)
6950
if err != nil {
7051
t.Fatal(err)
7152
}

0 commit comments

Comments
 (0)