Skip to content

Commit 4f3ae77

Browse files
author
Markus Westerlind
authored
fix: Remove the stacker dependency (#5229)
* fix: Remove the stacker dependency This seems to cause issues with cross-compilation downstream. * chore: make generate * chore: make staticcheck
1 parent dcb59c6 commit 4f3ae77

File tree

40 files changed

+79
-144
lines changed

40 files changed

+79
-144
lines changed

ast/testcase/testcase.go

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

33
import (
44
"context"
5-
"io/ioutil"
5+
"io"
66
"path/filepath"
77
"strings"
88

@@ -149,7 +149,7 @@ func extendTest(file *ast.File, extends string, modules TestModules) ([]*ast.Imp
149149
if err != nil {
150150
return nil, nil, nil, err
151151
}
152-
contents, err := ioutil.ReadAll(f)
152+
contents, err := io.ReadAll(f)
153153
_ = f.Close()
154154
if err != nil {
155155
return nil, nil, nil, err

cmd/flux/cmd/test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"encoding/json"
1111
"fmt"
1212
"io"
13-
"io/ioutil"
1413
"os"
1514
"path/filepath"
1615
"regexp"
@@ -571,7 +570,7 @@ func gatherFromTarArchive(filename string) ([]testFile, fs, testcase.TestModules
571570
continue
572571
}
573572

574-
source, err := ioutil.ReadAll(archive)
573+
source, err := io.ReadAll(archive)
575574
if err != nil {
576575
return nil, nil, nil, err
577576
}
@@ -830,7 +829,7 @@ func readTestRoot(f io.Reader, err error) (string, []string, error) {
830829
if rc, ok := f.(io.ReadCloser); ok {
831830
defer func() { _ = rc.Close() }()
832831
}
833-
data, err := ioutil.ReadAll(f)
832+
data, err := io.ReadAll(f)
834833
if err != nil {
835834
return "", nil, err
836835
}

cmd/flux/fmt.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package main
33
import (
44
"errors"
55
"fmt"
6-
"io/ioutil"
76
"os"
87
"path/filepath"
98

@@ -52,7 +51,7 @@ func formatFile(cmd *cobra.Command, args []string) error {
5251
}
5352

5453
func format(script string) (bool, error) {
55-
fromFile, err := ioutil.ReadFile(script)
54+
fromFile, err := os.ReadFile(script)
5655
if err != nil {
5756
return false, err
5857
}
@@ -86,7 +85,7 @@ func format(script string) (bool, error) {
8685
}
8786

8887
func updateScript(fname string, script string) error {
89-
err := ioutil.WriteFile(fname, []byte(script), 0644)
88+
err := os.WriteFile(fname, []byte(script), 0644)
9089
if err != nil {
9190
return err
9291
}

cmd/flux/main.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package main
33
import (
44
"context"
55
"fmt"
6-
"io/ioutil"
76
"os"
87

98
fluxcmd "github.com/influxdata/flux/cmd/flux/cmd"
@@ -35,7 +34,7 @@ func runE(cmd *cobra.Command, args []string) error {
3534
if flags.ExecScript {
3635
script = args[0]
3736
} else {
38-
content, err := ioutil.ReadFile(args[0])
37+
content, err := os.ReadFile(args[0])
3938
if err != nil {
4039
return err
4140
}

csv/result_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"bytes"
55
"context"
66
"errors"
7-
"io/ioutil"
7+
"io"
88
"regexp"
99
"strings"
1010
"testing"
@@ -2485,7 +2485,7 @@ func TestMultiResultDecoder(t *testing.T) {
24852485
tc := tc
24862486
t.Run(tc.name, func(t *testing.T) {
24872487
decoder := csv.NewMultiResultDecoder(tc.config)
2488-
results, err := decoder.Decode(ioutil.NopCloser(bytes.NewReader(tc.encoded)))
2488+
results, err := decoder.Decode(io.NopCloser(bytes.NewReader(tc.encoded)))
24892489
if err != nil {
24902490
t.Fatal(err)
24912491
}

dependencies/dependenciestest/dependencies.go

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

33
import (
44
"context"
5-
"io/ioutil"
5+
"io"
66
"net/http"
77

88
"github.com/influxdata/flux"
@@ -31,7 +31,7 @@ func defaultTestFunction(req *http.Request) *http.Response {
3131
Status: "Body generated by test client",
3232

3333
// Send response to be tested
34-
Body: ioutil.NopCloser(body),
34+
Body: io.NopCloser(body),
3535

3636
// Must be set to non-nil value or it panics
3737
Header: make(http.Header),

dependencies/filesystem/ioutil.go

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

33
import (
44
"context"
5-
"io/ioutil"
5+
"io"
66
"os"
77
)
88

@@ -18,7 +18,7 @@ func ReadFile(ctx context.Context, filename string) ([]byte, error) {
1818
return nil, err
1919
}
2020
defer func() { _ = f.Close() }()
21-
return ioutil.ReadAll(f)
21+
return io.ReadAll(f)
2222
}
2323

2424
// OpenFile will open the file from the service.

dependencies/filesystem/systemfs_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package filesystem_test
33
import (
44
"context"
55
"io"
6-
"io/ioutil"
76
"os"
87
"path/filepath"
98
"testing"
@@ -12,7 +11,7 @@ import (
1211
)
1312

1413
func TestSystemFS_Open(t *testing.T) {
15-
tmpfile, err := ioutil.TempFile("", "flux-systemfs-test")
14+
tmpfile, err := os.CreateTemp("", "flux-systemfs-test")
1615
if err != nil {
1716
t.Fatal(err)
1817
}
@@ -33,7 +32,7 @@ func TestSystemFS_Open(t *testing.T) {
3332
}
3433
defer func() { _ = f.Close() }()
3534

36-
data, err := ioutil.ReadAll(f)
35+
data, err := io.ReadAll(f)
3736
if err != nil {
3837
t.Fatal(err)
3938
}
@@ -48,7 +47,7 @@ func TestSystemFS_Open(t *testing.T) {
4847
}
4948

5049
func TestSystemFS_Stat(t *testing.T) {
51-
tmpfile, err := ioutil.TempFile("", "flux-systemfs-test")
50+
tmpfile, err := os.CreateTemp("", "flux-systemfs-test")
5251
if err != nil {
5352
t.Fatal(err)
5453
}
@@ -71,7 +70,7 @@ func TestSystemFS_Stat(t *testing.T) {
7170
}
7271

7372
func TestSystemFS_ReadFile(t *testing.T) {
74-
tmpfile, err := ioutil.TempFile("", "flux-systemfs-test")
73+
tmpfile, err := os.CreateTemp("", "flux-systemfs-test")
7574
if err != nil {
7675
t.Fatal(err)
7776
}

dependencies/http/http_test.go

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

33
import (
44
"bytes"
5-
"io/ioutil"
5+
"io"
66
"log"
77
"net"
88
"net/http"
@@ -75,7 +75,7 @@ func TestIpValidation(t *testing.T) {
7575
}
7676

7777
// Mock a dns server.
78-
dnsLogger := log.New(ioutil.Discard, "mockdns server: ", log.LstdFlags)
78+
dnsLogger := log.New(io.Discard, "mockdns server: ", log.LstdFlags)
7979
srv, _ := mockdns.NewServerWithLogger(bad, dnsLogger, false)
8080
defer srv.Close()
8181

@@ -125,7 +125,7 @@ func TestInvalidRedirects(t *testing.T) {
125125
}
126126

127127
// Mock a dns server.
128-
dnsLogger := log.New(ioutil.Discard, "mockdns server: ", log.LstdFlags)
128+
dnsLogger := log.New(io.Discard, "mockdns server: ", log.LstdFlags)
129129
srv, _ := mockdns.NewServerWithLogger(bad, dnsLogger, false)
130130
defer srv.Close()
131131

dependencies/influxdb/http.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"context"
66
"encoding/json"
77
"io"
8-
"io/ioutil"
98
stdhttp "net/http"
109
"net/url"
1110
"sort"
@@ -149,7 +148,7 @@ func (h *HttpClient) Query(ctx context.Context, f func(table flux.Table) error,
149148
if err != nil {
150149
return err
151150
} else if resp.StatusCode != 200 {
152-
data, err := ioutil.ReadAll(resp.Body)
151+
data, err := io.ReadAll(resp.Body)
153152
if err != nil {
154153
return errors.Newf(codes.Invalid, "error when reading response body: %s", err)
155154
}

0 commit comments

Comments
 (0)