Skip to content

Commit e20a0dd

Browse files
committed
Replace deprecated functions
1 parent abf4a68 commit e20a0dd

File tree

5 files changed

+13
-17
lines changed

5 files changed

+13
-17
lines changed

cmd/compile.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ limitations under the License.
1818

1919
import (
2020
"encoding/json"
21-
"io/ioutil"
2221
"os"
2322

2423
"github.com/semaphoreci/test-results/pkg/cli"
@@ -51,7 +50,7 @@ var compileCmd = &cobra.Command{
5150
return err
5251
}
5352

54-
dirPath, err := ioutil.TempDir("", "test-results-*")
53+
dirPath, err := os.MkdirTemp("", "test-results-*")
5554

5655
if err != nil {
5756
return err
@@ -75,7 +74,7 @@ var compileCmd = &cobra.Command{
7574
return err
7675
}
7776

78-
tmpFile, err := ioutil.TempFile(dirPath, "result-*.json")
77+
tmpFile, err := os.CreateTemp(dirPath, "result-*.json")
7978
if err != nil {
8079
return err
8180
}

cmd/gen-pipeline-report.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ limitations under the License.
1818

1919
import (
2020
"encoding/json"
21-
"io/ioutil"
2221
"os"
2322
"path"
2423

@@ -53,7 +52,7 @@ var genPipelineReportCmd = &cobra.Command{
5352
}
5453

5554
if len(args) == 0 {
56-
dir, err = ioutil.TempDir("", "test-results")
55+
dir, err = os.MkdirTemp("", "test-results")
5756
if err != nil {
5857
logger.Error("Creating temporary directory failed %v", err)
5958
return err

cmd/publish.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ limitations under the License.
1919
import (
2020
"encoding/json"
2121
"fmt"
22-
"io/ioutil"
2322
"os"
2423
"path"
2524

@@ -50,7 +49,7 @@ var publishCmd = &cobra.Command{
5049
return err
5150
}
5251

53-
dirPath, err := ioutil.TempDir("", "test-results-*")
52+
dirPath, err := os.MkdirTemp("", "test-results-*")
5453

5554
if err != nil {
5655
return err
@@ -74,7 +73,7 @@ var publishCmd = &cobra.Command{
7473
return err
7574
}
7675

77-
tmpFile, err := ioutil.TempFile(dirPath, "result-*.json")
76+
tmpFile, err := os.CreateTemp(dirPath, "result-*.json")
7877
if err != nil {
7978
return err
8079
}

pkg/cli/cli.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package cli
33
import (
44
"encoding/json"
55
"fmt"
6+
"io"
67
"io/fs"
7-
"io/ioutil"
88
"os"
99
"os/exec"
1010
"path/filepath"
@@ -390,7 +390,7 @@ func Load(path string) (*parser.Result, error) {
390390
if err != nil {
391391
return nil, err
392392
}
393-
bytes, err := ioutil.ReadAll(jsonFile)
393+
bytes, err := io.ReadAll(jsonFile)
394394
if err != nil {
395395
return nil, err
396396
}

pkg/cli/cli_test.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package cli_test
22

33
import (
44
"fmt"
5-
"io/ioutil"
65
"os"
76
"testing"
87

@@ -44,7 +43,7 @@ func Test_LoadFiles(t *testing.T) {
4443
}
4544

4645
func generateFile(t *testing.T) string {
47-
filePath, err := ioutil.TempFile("", "file-*.xml")
46+
filePath, err := os.CreateTemp("", "file-*.xml")
4847
if err != nil {
4948
t.Errorf("Failed to create temporary file: %v", err)
5049
}
@@ -53,20 +52,20 @@ func generateFile(t *testing.T) string {
5352
}
5453

5554
func generateDir(t *testing.T) string {
56-
dirPath, err := ioutil.TempDir("", "")
55+
dirPath, err := os.MkdirTemp("", "")
5756
assert.Nil(t, err)
5857

59-
nestedDir, err := ioutil.TempDir(dirPath, "xml-*")
58+
nestedDir, err := os.MkdirTemp(dirPath, "xml-*")
6059
assert.Nil(t, err)
6160

6261
for i := 0; i < 5; i++ {
63-
_, err = ioutil.TempFile(nestedDir, "file-*.xml")
62+
_, err = os.CreateTemp(nestedDir, "file-*.xml")
6463
assert.Nil(t, err)
6564
}
6665

67-
nestedDir, _ = ioutil.TempDir(dirPath, "json-*")
66+
nestedDir, _ = os.MkdirTemp(dirPath, "json-*")
6867
for i := 0; i < 3; i++ {
69-
_, err := ioutil.TempFile(nestedDir, "file-*.json")
68+
_, err := os.MkdirTemp(nestedDir, "file-*.json")
7069
assert.Nil(t, err)
7170
}
7271

0 commit comments

Comments
 (0)