From ac604bcd2ca2e4e1368ca3ed364eb5e7475ec9fe Mon Sep 17 00:00:00 2001 From: David Christofas Date: Fri, 16 Jul 2021 15:27:21 +0200 Subject: [PATCH] resolve merge conflicts --- go.mod | 2 +- go.sum | 2 ++ pkg/storage/utils/eosfs/eosfs.go | 10 +++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 7e8a20ee9bb..06343ba887f 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/Masterminds/sprig v2.22.0+incompatible github.com/ReneKroon/ttlcache/v2 v2.7.0 github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect - github.com/aws/aws-sdk-go v1.40.0 + github.com/aws/aws-sdk-go v1.40.1 github.com/bluele/gcache v0.0.2 github.com/c-bata/go-prompt v0.2.5 github.com/cheggaaa/pb v1.0.29 diff --git a/go.sum b/go.sum index e07ae259ea6..b3611b9e1e7 100644 --- a/go.sum +++ b/go.sum @@ -68,6 +68,8 @@ github.com/aws/aws-sdk-go v1.20.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.40.0 h1:nTCSQAeahNt15SOYxuDwJ8XvMhOU3Uqe7eJUPv7+Vsk= github.com/aws/aws-sdk-go v1.40.0/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= +github.com/aws/aws-sdk-go v1.40.1 h1:MlWasxqPLnFKZLPdEFzlEtzIdV7044o44YILe6A9zys= +github.com/aws/aws-sdk-go v1.40.1/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= diff --git a/pkg/storage/utils/eosfs/eosfs.go b/pkg/storage/utils/eosfs/eosfs.go index 6d5c777cb35..05fcb19408b 100644 --- a/pkg/storage/utils/eosfs/eosfs.go +++ b/pkg/storage/utils/eosfs/eosfs.go @@ -1114,16 +1114,16 @@ func (fs *eosfs) CreateDir(ctx context.Context, ref *provider.Reference, name st if err != nil { return errors.Wrap(err, "eosfs: no user in ctx") } - auth, err := fs.getUserAuth(ctx, u, p) + dir, err := fs.resolve(ctx, ref) if err != nil { - return err + return nil } - dir, err := fs.resolve(ctx, u, ref) + p := path.Join(dir, name) + auth, err := fs.getUserAuth(ctx, u, p) if err != nil { - return nil + return err } - p := path.Join(dir, name) log.Info().Msgf("eosfs: createdir: path=%s", p)