github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-11-21 14:44:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

lib/backup/s3remote: fix error checking for alternative S3 providers (#3191)

Browse source
This commit is contained in:
Zakhar Bessarab 2022-10-06 13:36:40 +03:00 committed by Aliaksandr Valialkin
parent f7af86d48e
commit db791a254b
No known key found for this signature in database
GPG key ID: A72BEC6CD3D0DED1
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/backup/s3remote/s3.go
View file

@ -3,7 +3,6 @@ package s3remote
import ( import (
"bytes" "bytes"
"context" "context"
"errors"
"fmt" "fmt"
"io" "io"
"strings" "strings"
@ -12,7 +11,6 @@ import (
"github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/config"
"github.com/aws/aws-sdk-go-v2/feature/s3/manager" "github.com/aws/aws-sdk-go-v2/feature/s3/manager"
"github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/s3"
"github.com/aws/aws-sdk-go-v2/service/s3/types"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/backup/common" "github.com/VictoriaMetrics/VictoriaMetrics/lib/backup/common"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/backup/fscommon" "github.com/VictoriaMetrics/VictoriaMetrics/lib/backup/fscommon"
@ -307,7 +305,7 @@ func (fs *FS) HasFile(filePath string) (bool, error) {
} }
o, err := fs.s3.GetObject(context.Background(), input) o, err := fs.s3.GetObject(context.Background(), input)
if err != nil { if err != nil {
if errors.Is(err, &types.NoSuchKey{}) { if strings.Contains(err.Error(), "NoSuchKey") {
return false, nil return false, nil
} }
return false, fmt.Errorf("cannot open %q at %s (remote path %q): %w", filePath, fs, path, err) return false, fmt.Errorf("cannot open %q at %s (remote path %q): %w", filePath, fs, path, err)