Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit a77f94a

Browse files
a8ma8m
committed
go: upgrade to 1.17
1 parent ea67be1 commit a77f94a

File tree

14 files changed

+51
-35
lines changed

14 files changed

+51
-35
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ on:
1212
jobs:
1313
lint:
1414
runs-on: ubuntu-latest
15+
strategy:
16+
matrix:
17+
go: ['1.17']
1518
steps:
1619
- uses: actions/[email protected]
1720
- name: Run linters
@@ -23,7 +26,7 @@ jobs:
2326
runs-on: ubuntu-latest
2427
strategy:
2528
matrix:
26-
go: ['1.16', '1.15']
29+
go: ['1.17', '1.16']
2730
steps:
2831
- uses: actions/[email protected]
2932
- uses: actions/setup-go@v2
@@ -53,6 +56,9 @@ jobs:
5356

5457
generate:
5558
runs-on: ubuntu-latest
59+
strategy:
60+
matrix:
61+
go: ['1.17', '1.16']
5662
steps:
5763
- uses: actions/[email protected]
5864
- uses: actions/setup-go@v2
@@ -214,6 +220,8 @@ jobs:
214220
steps:
215221
- uses: actions/[email protected]
216222
- uses: actions/setup-go@v2
223+
with:
224+
go-version: '1.17'
217225
- uses: actions/[email protected]
218226
with:
219227
path: ~/go/pkg/mod
@@ -368,6 +376,8 @@ jobs:
368376
with:
369377
fetch-depth: 0
370378
- uses: actions/setup-go@v2
379+
with:
380+
go-version: '1.17'
371381
- uses: actions/[email protected]
372382
with:
373383
path: ~/go/pkg/mod

‎cmd/entc/entc.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ package main
66

77
import (
88
"bytes"
9-
"io/ioutil"
109
"log"
10+
"os"
1111
"path/filepath"
1212

1313
"entgo.io/ent/cmd/internal/base"
@@ -32,9 +32,9 @@ func migrate(c *gen.Config) {
3232
target = filepath.Join(c.Target, "generate.go")
3333
oldCmd = []byte("entgo.io/ent/cmd/entc")
3434
)
35-
buf, err := ioutil.ReadFile(target)
35+
buf, err := os.ReadFile(target)
3636
if err != nil || !bytes.Contains(buf, oldCmd) {
3737
return
3838
}
39-
_ = ioutil.WriteFile(target, bytes.ReplaceAll(buf, oldCmd, []byte("entgo.io/ent/cmd/ent")), 0644)
39+
_ = os.WriteFile(target, bytes.ReplaceAll(buf, oldCmd, []byte("entgo.io/ent/cmd/ent")), 0644)
4040
}

‎cmd/internal/base/base.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"bytes"
1010
"errors"
1111
"fmt"
12-
"io/ioutil"
1312
"log"
1413
"os"
1514
"path/filepath"
@@ -190,7 +189,7 @@ func initEnv(target string, names []string) error {
190189
return fmt.Errorf("executing template %s: %w", name, err)
191190
}
192191
newFileTarget := filepath.Join(target, strings.ToLower(name+".go"))
193-
if err := ioutil.WriteFile(newFileTarget, b.Bytes(), 0644); err != nil {
192+
if err := os.WriteFile(newFileTarget, b.Bytes(), 0644); err != nil {
194193
return fmt.Errorf("writing file %s: %w", newFileTarget, err)
195194
}
196195
}
@@ -208,7 +207,7 @@ func createDir(target string) error {
208207
if target != defaultSchema {
209208
return nil
210209
}
211-
if err := ioutil.WriteFile("ent/generate.go", []byte(genFile), 0644); err != nil {
210+
if err := os.WriteFile("ent/generate.go", []byte(genFile), 0644); err != nil {
212211
return fmt.Errorf("creating generate.go file: %w", err)
213212
}
214213
return nil

‎dialect/gremlin/http.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"errors"
1010
"fmt"
1111
"io"
12-
"io/ioutil"
1312
"net/http"
1413
"net/url"
1514

@@ -69,7 +68,7 @@ func (t *httpTransport) RoundTrip(ctx context.Context, req *Request) (*Response,
6968
defer rsp.Body.Close()
7069

7170
if rsp.StatusCode < http.StatusOK || rsp.StatusCode > http.StatusPartialContent {
72-
body, _ := ioutil.ReadAll(rsp.Body)
71+
body, _ := io.ReadAll(rsp.Body)
7372
return nil, fmt.Errorf("gremlin/http: status=%q, body=%q", rsp.Status, body)
7473
}
7574
if rsp.ContentLength > MaxResponseSize {

‎dialect/gremlin/http_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ package gremlin
77
import (
88
"context"
99
"io"
10-
"io/ioutil"
1110
"net/http"
1211
"net/http/httptest"
1312
"testing"
@@ -22,7 +21,7 @@ import (
2221
func TestHTTPTransportRoundTripper(t *testing.T) {
2322
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
2423
assert.Equal(t, r.Header.Get("Content-Type"), "application/json")
25-
got, err := ioutil.ReadAll(r.Body)
24+
got, err := io.ReadAll(r.Body)
2625
require.NoError(t, err)
2726
assert.JSONEq(t, `{"gremlin": "g.V(1)", "language": "gremlin-groovy"}`, string(got))
2827

‎entc/gen/feature.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
package gen
66

77
import (
8-
"io/ioutil"
98
"os"
109
"path/filepath"
1110
)
@@ -164,7 +163,7 @@ func remove(dir, file string) error {
164163
}
165164
return err
166165
}
167-
infos, err := ioutil.ReadDir(dir)
166+
infos, err := os.ReadDir(dir)
168167
if err != nil {
169168
return err
170169
}

‎entc/gen/graph.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"fmt"
1212
"go/parser"
1313
"go/token"
14-
"io/ioutil"
1514
"os"
1615
"path/filepath"
1716
"runtime/debug"
@@ -693,7 +692,7 @@ func PrepareEnv(c *Config) (undo func() error, err error) {
693692
nop = func() error { return nil }
694693
path = filepath.Join(c.Target, "runtime.go")
695694
)
696-
out, err := ioutil.ReadFile(path)
695+
out, err := os.ReadFile(path)
697696
if err != nil {
698697
if os.IsNotExist(err) {
699698
return nop, nil
@@ -708,10 +707,10 @@ func PrepareEnv(c *Config) (undo func() error, err error) {
708707
if len(fi.Imports) == 0 {
709708
return nop, nil
710709
}
711-
if err := ioutil.WriteFile(path, append([]byte("// +build tools\n"), out...), 0644); err != nil {
710+
if err := os.WriteFile(path, append([]byte("// +build tools\n"), out...), 0644); err != nil {
712711
return nil, err
713712
}
714-
return func() error { return ioutil.WriteFile(path, out, 0644) }, nil
713+
return func() error { return os.WriteFile(path, out, 0644) }, nil
715714
}
716715

717716
type (
@@ -733,7 +732,7 @@ func (a assets) write() error {
733732
}
734733
}
735734
for _, file := range a.files {
736-
if err := ioutil.WriteFile(file.path, file.content, 0644); err != nil {
735+
if err := os.WriteFile(file.path, file.content, 0644); err != nil {
737736
return fmt.Errorf("write file %q: %w", file.path, err)
738737
}
739738
}
@@ -748,7 +747,7 @@ func (a assets) format() error {
748747
if err != nil {
749748
return fmt.Errorf("format file %s: %w", path, err)
750749
}
751-
if err := ioutil.WriteFile(path, src, 0644); err != nil {
750+
if err := os.WriteFile(path, src, 0644); err != nil {
752751
return fmt.Errorf("write file %s: %w", path, err)
753752
}
754753
}

‎entc/internal/snapshot.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"bytes"
99
"encoding/json"
1010
"fmt"
11-
"io/ioutil"
11+
"os"
1212
"strings"
1313

1414
"entgo.io/ent/entc/gen"
@@ -25,7 +25,7 @@ type Snapshot struct {
2525
// If there is a conflict between upstream and local snapshots, it is merged
2626
// before running the code generation.
2727
func (s *Snapshot) Restore() error {
28-
buf, err := ioutil.ReadFile(s.Path)
28+
buf, err := os.ReadFile(s.Path)
2929
if err != nil {
3030
return fmt.Errorf("unable to read snapshot schema %w", err)
3131
}

‎entc/internal/snapshot_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
package internal
66

77
import (
8-
"io/ioutil"
98
"math/rand"
109
"os"
1110
"os/exec"
@@ -47,7 +46,7 @@ func TestSnapshot_Restore(t *testing.T) {
4746
// addConflicts adds VCS conflicts to the files that match the given patterns.
4847
func addConflicts(dir string) error {
4948
rand.Seed(time.Now().UnixNano())
50-
infos, err := ioutil.ReadDir(dir)
49+
infos, err := os.ReadDir(dir)
5150
if err != nil {
5251
return err
5352
}

‎entc/internal/vcs_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package internal
66

77
import (
88
"fmt"
9-
"io/ioutil"
109
"os"
1110
"path/filepath"
1211
"testing"
@@ -18,9 +17,9 @@ func TestCheckDir(t *testing.T) {
1817
target := filepath.Join(os.TempDir(), "entvcs")
1918
require.NoError(t, os.MkdirAll(target, os.ModePerm), "creating tmpdir")
2019
defer os.RemoveAll(target)
21-
err := ioutil.WriteFile(filepath.Join(target, "a.go"), []byte(`package schema`), 0644)
20+
err := os.WriteFile(filepath.Join(target, "a.go"), []byte(`package schema`), 0644)
2221
require.NoError(t, err)
23-
err = ioutil.WriteFile(filepath.Join(target, "b.go"), []byte(`package schema
22+
err = os.WriteFile(filepath.Join(target, "b.go"), []byte(`package schema
2423
2524
type User struct {
2625
<<<<<<< local

0 commit comments

Comments
 (0)