Skip to content

Commit

Permalink
fix lints and remove ioutils deprecations (#681)
Browse files Browse the repository at this point in the history
Signed-off-by: cpanato <ctadeu@gmail.com>

Signed-off-by: cpanato <ctadeu@gmail.com>
  • Loading branch information
cpanato committed Sep 13, 2022
1 parent 4f84053 commit 6c7cc8d
Show file tree
Hide file tree
Showing 29 changed files with 48 additions and 40 deletions.
1 change: 1 addition & 0 deletions pkg/cryptoutils/certificate.go
Expand Up @@ -13,6 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Package cryptoutils TODO: add meaningfull description
package cryptoutils

import (
Expand Down
4 changes: 2 additions & 2 deletions pkg/cryptoutils/password.go
Expand Up @@ -18,7 +18,7 @@ package cryptoutils
import (
"errors"
"fmt"
"io/ioutil"
"io"
"os"

"golang.org/x/term"
Expand Down Expand Up @@ -50,7 +50,7 @@ func readPasswordFn() func() ([]byte, error) {
}
// Handle piped in passwords.
return func() ([]byte, error) {
return ioutil.ReadAll(os.Stdin)
return io.ReadAll(os.Stdin)
}
}

Expand Down
1 change: 1 addition & 0 deletions pkg/fulcioroots/fulcioroots.go
Expand Up @@ -13,6 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Package fulcioroots TODO: add meaningfull description
package fulcioroots

import (
Expand Down
1 change: 1 addition & 0 deletions pkg/oauth/interactive.go
Expand Up @@ -12,6 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Package oauth TODO: add meaningfull description
package oauth

const (
Expand Down
4 changes: 2 additions & 2 deletions pkg/oauth/internal/token.go
Expand Up @@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Package internal TODO: add meaningfull description
package internal

import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"mime"
"net/http"
"net/url"
Expand Down Expand Up @@ -136,7 +136,7 @@ func parseAccessTokenError(body []byte, contentType string) (respErr *ErrorToken
// ParseAccessTokenResponse parses an RFC6749 access token response and returns either an `*oauth2.Token` on success, an `*ErrorTokenResponse` on failure, or any other error if the response cannot be parsed.
// See: https://datatracker.ietf.org/doc/html/rfc6749#section-5
func ParseAccessTokenResponse(tokenResp *http.Response) (token *oauth2.Token, err error) {
body, err := ioutil.ReadAll(io.LimitReader(tokenResp.Body, 1<<20))
body, err := io.ReadAll(io.LimitReader(tokenResp.Body, 1<<20))
if err != nil {
return nil, err
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/oauth/internal/token_test.go
Expand Up @@ -18,7 +18,7 @@ import (
"bytes"
"errors"
"fmt"
"io/ioutil"
"io"
"net/http"
"net/url"
"reflect"
Expand Down Expand Up @@ -119,7 +119,7 @@ func TestParseAccessTokenSuccessResponse(t *testing.T) {
t.Run(tc.desc, func(t *testing.T) {
testResp := &http.Response{
StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader(tc.respBody)),
Body: io.NopCloser(bytes.NewReader(tc.respBody)),
}
if tc.respContentType != "" {
testResp.Header = make(http.Header, 1)
Expand Down Expand Up @@ -208,7 +208,7 @@ func TestParseAccessTokenFailResponse(t *testing.T) {
t.Run(tc.desc, func(t *testing.T) {
testResp := &http.Response{
StatusCode: tc.respStatusCode,
Body: ioutil.NopCloser(bytes.NewReader(tc.respBody)),
Body: io.NopCloser(bytes.NewReader(tc.respBody)),
}
if tc.respContentType != "" {
testResp.Header = make(http.Header, 1)
Expand Down
1 change: 1 addition & 0 deletions pkg/oauth/oidc/interactive.go
Expand Up @@ -12,6 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Package oidc TODO: add meaningfull description
package oidc

import (
Expand Down
9 changes: 5 additions & 4 deletions pkg/oauthflow/device.go
Expand Up @@ -13,13 +13,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Package oauthflow TODO: add meaningfull description
package oauthflow

import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"net/url"
"strings"
Expand Down Expand Up @@ -111,7 +112,7 @@ func (d *DeviceFlowTokenGetter) deviceFlow(p *oidc.Provider, clientID, redirectU
}
defer resp.Body.Close()

b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
if err != nil {
return "", err
}
Expand Down Expand Up @@ -146,7 +147,7 @@ func (d *DeviceFlowTokenGetter) deviceFlow(p *oidc.Provider, clientID, redirectU
}
defer resp.Body.Close()

b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
if err != nil {
return "", err
}
Expand Down Expand Up @@ -213,7 +214,7 @@ func (d *DeviceFlowTokenGetter) CodeURL() (string, error) {
}
defer resp.Body.Close()

body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
if err != nil {
return "", fmt.Errorf("unable to read response body: %w", err)
}
Expand Down
1 change: 1 addition & 0 deletions pkg/signature/dsse/adapters.go
Expand Up @@ -13,6 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Package dsse TODO: add meaningfull description
package dsse

import (
Expand Down
5 changes: 2 additions & 3 deletions pkg/signature/dsse/dsse.go
Expand Up @@ -21,7 +21,6 @@ import (
"encoding/base64"
"encoding/json"
"io"
"io/ioutil"

"github.com/secure-systems-lab/go-securesystemslib/dsse"
"github.com/sigstore/sigstore/pkg/signature"
Expand All @@ -47,7 +46,7 @@ func (w *wrappedSigner) PublicKey(opts ...signature.PublicKeyOption) (crypto.Pub

// SignMessage signs the provided stream in the reader using the DSSE encoding format
func (w *wrappedSigner) SignMessage(r io.Reader, opts ...signature.SignOption) ([]byte, error) {
p, err := ioutil.ReadAll(r)
p, err := io.ReadAll(r)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -87,7 +86,7 @@ func (w *wrappedVerifier) PublicKey(opts ...signature.PublicKeyOption) (crypto.P

// VerifySignature verifies the signature specified in an DSSE envelope
func (w *wrappedVerifier) VerifySignature(s, _ io.Reader, opts ...signature.VerifyOption) error {
sig, err := ioutil.ReadAll(s)
sig, err := io.ReadAll(s)
if err != nil {
return err
}
Expand Down
5 changes: 2 additions & 3 deletions pkg/signature/dsse/multidsse.go
Expand Up @@ -20,7 +20,6 @@ import (
"encoding/json"
"errors"
"io"
"io/ioutil"

"github.com/secure-systems-lab/go-securesystemslib/dsse"
"github.com/sigstore/sigstore/pkg/signature"
Expand Down Expand Up @@ -67,7 +66,7 @@ func (wL *wrappedMultiSigner) PublicKey(opts ...signature.PublicKeyOption) (cryp

// SignMessage signs the provided stream in the reader using the DSSE encoding format
func (wL *wrappedMultiSigner) SignMessage(r io.Reader, opts ...signature.SignOption) ([]byte, error) {
p, err := ioutil.ReadAll(r)
p, err := io.ReadAll(r)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -129,7 +128,7 @@ func (wL *wrappedMultiVerifier) PublicKey(opts ...signature.PublicKeyOption) (cr

// VerifySignature verifies the signature specified in an DSSE envelope
func (wL *wrappedMultiVerifier) VerifySignature(s, _ io.Reader, opts ...signature.VerifyOption) error {
sig, err := ioutil.ReadAll(s)
sig, err := io.ReadAll(s)
if err != nil {
return err
}
Expand Down
1 change: 1 addition & 0 deletions pkg/signature/kms/aws/client.go
Expand Up @@ -13,6 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Package aws implement the interface with amazon aws kms service
package aws

import (
Expand Down
1 change: 1 addition & 0 deletions pkg/signature/kms/azure/client.go
Expand Up @@ -13,6 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Package azure implement the interface with microsoft azure kms service
package azure

import (
Expand Down
1 change: 1 addition & 0 deletions pkg/signature/kms/fake/signer.go
Expand Up @@ -12,6 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Package fake implements fake signer to be used in tests
package fake

import (
Expand Down
1 change: 1 addition & 0 deletions pkg/signature/kms/gcp/client.go
Expand Up @@ -13,6 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Package gcp implement the interface with google cloud kms service
package gcp

import (
Expand Down
1 change: 1 addition & 0 deletions pkg/signature/kms/hashivault/client.go
Expand Up @@ -13,6 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Package hashivault implement the interface with hashivault kms service
package hashivault

import (
Expand Down
1 change: 1 addition & 0 deletions pkg/signature/kms/kms.go
Expand Up @@ -13,6 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Package kms implements the interface to access various ksm services
package kms

import (
Expand Down
1 change: 1 addition & 0 deletions pkg/signature/options/context.go
Expand Up @@ -13,6 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Package options TODO: add meaningfull description
package options

import (
Expand Down
1 change: 1 addition & 0 deletions pkg/signature/payload/payload.go
Expand Up @@ -13,6 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Package payload TODO: add meaningfull description
package payload

import (
Expand Down
4 changes: 2 additions & 2 deletions pkg/signature/signer.go
Expand Up @@ -22,7 +22,7 @@ import (
"crypto/rsa"
"errors"
"io"
"io/ioutil"
"os"
"path/filepath"

// these ensure we have the implementations loaded
Expand Down Expand Up @@ -77,7 +77,7 @@ func LoadSigner(privateKey crypto.PrivateKey, hashFunc crypto.Hash) (Signer, err
// RSAPSSSigner is desired instead, use the LoadRSAPSSSigner() and
// cryptoutils.UnmarshalPEMToPrivateKey() methods directly.
func LoadSignerFromPEMFile(path string, hashFunc crypto.Hash, pf cryptoutils.PassFunc) (Signer, error) {
fileBytes, err := ioutil.ReadFile(filepath.Clean(path))
fileBytes, err := os.ReadFile(filepath.Clean(path))
if err != nil {
return nil, err
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/signature/signerverifier.go
Expand Up @@ -21,7 +21,7 @@ import (
"crypto/ed25519"
"crypto/rsa"
"errors"
"io/ioutil"
"os"
"path/filepath"

"github.com/sigstore/sigstore/pkg/cryptoutils"
Expand Down Expand Up @@ -57,7 +57,7 @@ func LoadSignerVerifier(privateKey crypto.PrivateKey, hashFunc crypto.Hash) (Sig
// RSAPSSSignerVerifier is desired instead, use the LoadRSAPSSSignerVerifier() and
// cryptoutils.UnmarshalPEMToPrivateKey() methods directly.
func LoadSignerVerifierFromPEMFile(path string, hashFunc crypto.Hash, pf cryptoutils.PassFunc) (SignerVerifier, error) {
fileBytes, err := ioutil.ReadFile(filepath.Clean(path))
fileBytes, err := os.ReadFile(filepath.Clean(path))
if err != nil {
return nil, err
}
Expand Down
1 change: 1 addition & 0 deletions pkg/signature/ssh/armor.go
Expand Up @@ -13,6 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Package ssh TODO: add meaningfull description
package ssh

import (
Expand Down
3 changes: 1 addition & 2 deletions pkg/signature/ssh/sign.go
Expand Up @@ -22,7 +22,6 @@ import (
"crypto/sha512"
"hash"
"io"
"io/ioutil"

"github.com/sigstore/sigstore/pkg/signature"
"golang.org/x/crypto/ssh"
Expand Down Expand Up @@ -99,7 +98,7 @@ func (s *Signer) PublicKey(opts ...signature.PublicKeyOption) (crypto.PublicKey,

// SignMessage signs the supplied message.
func (s *Signer) SignMessage(message io.Reader, opts ...signature.SignOption) ([]byte, error) {
b, err := ioutil.ReadAll(message)
b, err := io.ReadAll(message)
if err != nil {
return nil, err
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/signature/ssh/sign_test.go
Expand Up @@ -17,7 +17,7 @@ package ssh

import (
"bytes"
"io/ioutil"
"os"
"os/exec"
"path/filepath"
"strings"
Expand Down Expand Up @@ -168,7 +168,7 @@ func TestFromOpenSSH(t *testing.T) {
sigPath := dataPath + ".sig"
run(t, nil, "ssh-keygen", "-Y", "sign", "-n", "file", "-f", privPath, dataPath)

sigBytes, err := ioutil.ReadFile(sigPath)
sigBytes, err := os.ReadFile(sigPath)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -322,7 +322,7 @@ func TestRoundTrip(t *testing.T) {

func write(t *testing.T, d []byte, fp ...string) string {
p := filepath.Join(fp...)
if err := ioutil.WriteFile(p, d, 0o600); err != nil {
if err := os.WriteFile(p, d, 0o600); err != nil {
t.Fatal(err)
}
return p
Expand Down
3 changes: 1 addition & 2 deletions pkg/signature/ssh/verify.go
Expand Up @@ -17,7 +17,6 @@ package ssh

import (
"io"
"io/ioutil"

"github.com/sigstore/sigstore/pkg/signature"
"golang.org/x/crypto/ssh"
Expand Down Expand Up @@ -51,7 +50,7 @@ var _ signature.Verifier = (*Signer)(nil)

// VerifySignature verifies a suppled signature.
func (s *Signer) VerifySignature(signature, message io.Reader, opts ...signature.VerifyOption) error {
b, err := ioutil.ReadAll(signature)
b, err := io.ReadAll(signature)
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/signature/verifier.go
Expand Up @@ -22,7 +22,7 @@ import (
"crypto/rsa"
"errors"
"io"
"io/ioutil"
"os"
"path/filepath"

"github.com/sigstore/sigstore/pkg/cryptoutils"
Expand Down Expand Up @@ -86,7 +86,7 @@ func LoadUnsafeVerifier(publicKey crypto.PublicKey) (Verifier, error) {
// If the publickey is an RSA key, a RSAPKCS1v15Verifier will be returned. If a
// RSAPSSVerifier is desired instead, use the LoadRSAPSSVerifier() and cryptoutils.UnmarshalPEMToPublicKey() methods directly.
func LoadVerifierFromPEMFile(path string, hashFunc crypto.Hash) (Verifier, error) {
fileBytes, err := ioutil.ReadFile(filepath.Clean(path))
fileBytes, err := os.ReadFile(filepath.Clean(path))
if err != nil {
return nil, err
}
Expand Down

0 comments on commit 6c7cc8d

Please sign in to comment.