diff options
author | 2024-04-29 10:44:11 +0000 | |
---|---|---|
committer | 2024-04-29 10:44:11 +0000 | |
commit | d3bac8bbec263175fb8190918993af192b842065 (patch) | |
tree | 59230d2096f236959248e1656826d4d73f905686 /vendor/github.com/minio/minio-go/v7/pkg/credentials | |
parent | [chore] Fix conflict in workers tests (#2880) (diff) | |
download | gotosocial-d3bac8bbec263175fb8190918993af192b842065.tar.xz |
[chore]: Bump github.com/minio/minio-go/v7 from 7.0.69 to 7.0.70 (#2877)
Diffstat (limited to 'vendor/github.com/minio/minio-go/v7/pkg/credentials')
-rw-r--r-- | vendor/github.com/minio/minio-go/v7/pkg/credentials/file_minio_client.go | 4 | ||||
-rw-r--r-- | vendor/github.com/minio/minio-go/v7/pkg/credentials/iam_aws.go | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/vendor/github.com/minio/minio-go/v7/pkg/credentials/file_minio_client.go b/vendor/github.com/minio/minio-go/v7/pkg/credentials/file_minio_client.go index eb777675b..f1c165b79 100644 --- a/vendor/github.com/minio/minio-go/v7/pkg/credentials/file_minio_client.go +++ b/vendor/github.com/minio/minio-go/v7/pkg/credentials/file_minio_client.go @@ -22,7 +22,7 @@ import ( "path/filepath" "runtime" - jsoniter "github.com/json-iterator/go" + "github.com/goccy/go-json" ) // A FileMinioClient retrieves credentials from the current user's home @@ -121,8 +121,6 @@ type config struct { // returned if it fails to read from the file. func loadAlias(filename, alias string) (hostConfig, error) { cfg := &config{} - json := jsoniter.ConfigCompatibleWithStandardLibrary - configBytes, err := os.ReadFile(filename) if err != nil { return hostConfig{}, err diff --git a/vendor/github.com/minio/minio-go/v7/pkg/credentials/iam_aws.go b/vendor/github.com/minio/minio-go/v7/pkg/credentials/iam_aws.go index 7322948ec..ea4b3ef93 100644 --- a/vendor/github.com/minio/minio-go/v7/pkg/credentials/iam_aws.go +++ b/vendor/github.com/minio/minio-go/v7/pkg/credentials/iam_aws.go @@ -31,7 +31,7 @@ import ( "strings" "time" - jsoniter "github.com/json-iterator/go" + "github.com/goccy/go-json" ) // DefaultExpiryWindow - Default expiry window. @@ -308,7 +308,7 @@ func getEcsTaskCredentials(client *http.Client, endpoint, token string) (ec2Role } respCreds := ec2RoleCredRespBody{} - if err := jsoniter.NewDecoder(resp.Body).Decode(&respCreds); err != nil { + if err := json.NewDecoder(resp.Body).Decode(&respCreds); err != nil { return ec2RoleCredRespBody{}, err } @@ -418,7 +418,7 @@ func getCredentials(client *http.Client, endpoint string) (ec2RoleCredRespBody, } respCreds := ec2RoleCredRespBody{} - if err := jsoniter.NewDecoder(resp.Body).Decode(&respCreds); err != nil { + if err := json.NewDecoder(resp.Body).Decode(&respCreds); err != nil { return ec2RoleCredRespBody{}, err } |