Merge pull request #373 from bojand/remove_ioutil

remove usage of deprecated ioutil package
bojand · Sep 5, 2022 · fc8eca5 · fc8eca5
2 parents d5b9a60 + 571c27b
commit fc8eca5
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 45 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -57,7 +57,7 @@ jobs:
         key: ${{ runner.os }}-go-bin-${{ env.GOLANGCI_LINT_VERSION }}
     - name: Install tparse
       if: steps.cache-go-bin.outputs.cache-hit != 'true'
-      run: go get github.com/mfridman/tparse
+      run: go install github.com/mfridman/tparse
     - name: Install golangci-lint
       if: steps.cache-go-bin.outputs.cache-hit != 'true'
       run: curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $HOME/go/bin $GOLANGCI_LINT_VERSION

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -120,7 +120,7 @@ jobs:
         run: |
           # Temporary fix for https://github.com/actions/setup-go/issues/14
           export PATH=$PATH:$(go env GOPATH)/bin
-          go get -u github.com/git-chglog/git-chglog/cmd/git-chglog
+          go install github.com/git-chglog/git-chglog/cmd/git-chglog
           # git-chglog -c .chglog/config.yml $(git describe --tags $(git rev-list --tags --max-count=1))
           git-chglog -c .chglog/config.yml ${{ env.RELEASE_VERSION }} > RELEASE-${{ env.RELEASE_VERSION }}.md
       - name: Create GitHub release ${{ matrix.target }}

diff --git a/.golangci.yml b/.golangci.yml
@@ -36,3 +36,7 @@ issues:
     - path: protodesc/
       text: "SA1019: package github.com/golang/protobuf"
 
+    # TODO fix protobuf deprecated
+    - path: runner/
+      text: "SA1019: \"github.com/golang/protobuf/jsonpb\" is deprecated"
+
diff --git a/cmd/ghz/main.go b/cmd/ghz/main.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"runtime"
 	"strconv"
@@ -396,7 +396,7 @@ func createConfigFromArgs(cfg *runner.Config) error {
 
 	var binaryData []byte
 	if *binData {
-		b, err := ioutil.ReadAll(os.Stdin)
+		b, err := io.ReadAll(os.Stdin)
 		if err != nil {
 			return err
 		}

diff --git a/protodesc/protodesc.go b/protodesc/protodesc.go
@@ -3,7 +3,7 @@ package protodesc
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"strings"
 
@@ -43,7 +43,7 @@ func GetMethodDescFromProto(call, proto string, imports []string) (*desc.MethodD
 
 // GetMethodDescFromProtoSet gets method descriptor for the given call symbol from protoset file given my path protoset
 func GetMethodDescFromProtoSet(call, protoset string) (*desc.MethodDescriptor, error) {
-	b, err := ioutil.ReadFile(protoset)
+	b, err := os.ReadFile(protoset)
 	if err != nil {
 		return nil, fmt.Errorf("could not load protoset file %q: %v", protoset, err)
 	}
@@ -157,10 +157,11 @@ func findServiceSymbol(resolved map[string]*desc.FileDescriptor, fullyQualifiedN
 // and the method name from the input string.
 //
 // valid inputs:
-//   package.Service.Method
-//   .package.Service.Method
-//   package.Service/Method
-//   .package.Service/Method
+//
+//	package.Service.Method
+//	.package.Service.Method
+//	package.Service/Method
+//	.package.Service/Method
 func parseServiceMethod(svcAndMethod string) (string, string, error) {
 	if len(svcAndMethod) == 0 {
 		return "", "", errNoMethodNameSpecified