From de9424f58b10b10ab4db2babbc4ff6fcb41292a8 Mon Sep 17 00:00:00 2001 From: Marko Mikulicic Date: Wed, 30 Aug 2023 22:28:27 +0200 Subject: [PATCH] Go 1.21 --- .github/workflows/go.yml | 2 +- cmd/knot8/file.go | 3 +-- cmd/knot8/main.go | 2 +- go.mod | 2 +- go.sum | 3 +++ pkg/lensed/base64.go | 4 ++-- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 17ad5e8..2cf3d4f 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -15,7 +15,7 @@ jobs: - name: Set up Go uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4 with: - go-version: "1.20" + go-version: "1.21" id: go - name: Check out code into the Go module directory diff --git a/cmd/knot8/file.go b/cmd/knot8/file.go index f3584eb..97f925e 100644 --- a/cmd/knot8/file.go +++ b/cmd/knot8/file.go @@ -6,7 +6,6 @@ package main import ( "fmt" "io" - "io/ioutil" "os" "path/filepath" "sort" @@ -132,5 +131,5 @@ func onlyFiles(paths []string) ([]string, error) { // (which are the supported encodings of YAML), func readAllTranscode(r io.Reader) ([]byte, error) { t := unicode.BOMOverride(runes.ReplaceIllFormed()) - return ioutil.ReadAll(transform.NewReader(r, t)) + return io.ReadAll(transform.NewReader(r, t)) } diff --git a/cmd/knot8/main.go b/cmd/knot8/main.go index 1e4f524..db39bee 100644 --- a/cmd/knot8/main.go +++ b/cmd/knot8/main.go @@ -176,7 +176,7 @@ func settersFromFiles(paths []string) ([]Setter, error) { } func parseSimplifiedValues(path string) (map[string]string, error) { - b, err := ioutil.ReadFile(path) + b, err := os.ReadFile(path) if err != nil { return nil, err } diff --git a/go.mod b/go.mod index a39070f..f77875b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module knot8.io -go 1.19 +go 1.21 require ( github.com/alecthomas/kong v0.7.1 diff --git a/go.sum b/go.sum index 15163c3..27c921c 100644 --- a/go.sum +++ b/go.sum @@ -183,9 +183,11 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/alecthomas/assert/v2 v2.1.0 h1:tbredtNcQnoSd3QBhQWI7QZ3XHOVkw1Moklp2ojoH/0= +github.com/alecthomas/assert/v2 v2.1.0/go.mod h1:b/+1DI2Q6NckYi+3mXyH3wFb8qG37K/DuK80n7WefXA= github.com/alecthomas/kong v0.7.1 h1:azoTh0IOfwlAX3qN9sHWTxACE2oV8Bg2gAwBsMwDQY4= github.com/alecthomas/kong v0.7.1/go.mod h1:n1iCIO2xS46oE8ZfYCNDqdR0b0wZNrXAIAqro/2132U= github.com/alecthomas/repr v0.1.0 h1:ENn2e1+J3k09gyj2shc0dHr/yjaWSHRlrJ4DPMevDqE= +github.com/alecthomas/repr v0.1.0/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/atomatt/yaml v0.0.0-20200228174225-55c5cf55e3ee h1:vOFcdf/Iqih81E224SKRoFCkgJJ/CqPW+DkkgXrVJ90= github.com/atomatt/yaml v0.0.0-20200228174225-55c5cf55e3ee/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= @@ -344,6 +346,7 @@ github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= +github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= diff --git a/pkg/lensed/base64.go b/pkg/lensed/base64.go index b44af0e..f600cec 100644 --- a/pkg/lensed/base64.go +++ b/pkg/lensed/base64.go @@ -7,7 +7,7 @@ import ( "bytes" "encoding/base64" "fmt" - "io/ioutil" + "io" ) // Base64Lens implements the "base64" lens. @@ -17,7 +17,7 @@ type Base64Lens struct{} func (Base64Lens) Apply(src []byte, vals []Setter) ([]byte, error) { enc := base64.StdEncoding - b, err := ioutil.ReadAll(base64.NewDecoder(enc, bytes.NewReader(src))) + b, err := io.ReadAll(base64.NewDecoder(enc, bytes.NewReader(src))) if err != nil { return nil, err }