diff --git a/api/headers.go b/api/headers.go index ddee405d3..82fe81e62 100644 --- a/api/headers.go +++ b/api/headers.go @@ -66,6 +66,8 @@ const ( AccessControlRequestHeaders = "Access-Control-Request-Headers" Vary = "Vary" + + DefaultLocationConstraint = "default" ) // S3 request query params. diff --git a/api/layer/container.go b/api/layer/container.go index e726c2e79..d59b3facc 100644 --- a/api/layer/container.go +++ b/api/layer/container.go @@ -28,7 +28,6 @@ type ( const ( attributeLocationConstraint = ".s3-location-constraint" - DefaultLocationConstraint = "default" AttributeLockEnabled = "LockEnabled" ) @@ -125,7 +124,7 @@ func (n *layer) createContainer(ctx context.Context, p *CreateBucketParams) (*da var err error ownerID := n.Owner(ctx) if p.LocationConstraint == "" { - p.LocationConstraint = DefaultLocationConstraint // s3tests_boto3.functional.test_s3:test_bucket_get_location + p.LocationConstraint = api.DefaultLocationConstraint // s3tests_boto3.functional.test_s3:test_bucket_get_location } bktInfo := &data.BucketInfo{ Name: p.Name, diff --git a/cmd/authmate/main.go b/cmd/authmate/main.go index 22a168db9..def0300c4 100644 --- a/cmd/authmate/main.go +++ b/cmd/authmate/main.go @@ -12,7 +12,7 @@ import ( "time" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" + "github.com/nspcc-dev/neofs-s3-gw/api" "github.com/nspcc-dev/neofs-s3-gw/authmate" "github.com/nspcc-dev/neofs-s3-gw/internal/neofs" "github.com/nspcc-dev/neofs-s3-gw/internal/version" @@ -323,8 +323,8 @@ func parsePolicies(val string) (authmate.ContainerPolicies, error) { if err = json.Unmarshal(data, &policies); err != nil { return nil, err } - if _, ok := policies[layer.DefaultLocationConstraint]; ok { - return nil, fmt.Errorf("config overrides %s location constraint", layer.DefaultLocationConstraint) + if _, ok := policies[api.DefaultLocationConstraint]; ok { + return nil, fmt.Errorf("config overrides %s location constraint", api.DefaultLocationConstraint) } return policies, nil