nzinkevich/frostfs-s3-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-s3-gw
Code Pull requests Activity

[#324] Drop default container name

Browse source 
Signed-off-by: Denis Kirillov <denis@nspcc.ru>
This commit is contained in:
Denis Kirillov 2022-01-20 16:42:13 +03:00 committed by Angira Kekteeva
parent bffc09167a
commit f19c9315ea
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
authmate/authmate.go
View file

@ -110,12 +110,19 @@ func (a *Agent) checkContainer(ctx context.Context, cid *cid.ID, friendlyName st
return nil, fmt.Errorf("failed to build placement policy: %w", err) return nil, fmt.Errorf("failed to build placement policy: %w", err)
} }
cnr := container.New( cnrOptions := []container.Option{
container.WithPolicy(pp), container.WithPolicy(pp),
container.WithCustomBasicACL(defaultAuthContainerBasicACL), container.WithCustomBasicACL(defaultAuthContainerBasicACL),
container.WithAttribute(container.AttributeName, friendlyName), container.WithAttribute(container.AttributeTimestamp, strconv.FormatInt(time.Now().Unix(), 10)),
container.WithAttribute(container.AttributeTimestamp, strconv.FormatInt(time.Now().Unix(), 10))) }
if friendlyName != "" {
cnrOptions = append(cnrOptions, container.WithAttribute(container.AttributeName, friendlyName))
}
cnr := container.New(cnrOptions...)
if friendlyName != "" {
container.SetNativeName(cnr, friendlyName) container.SetNativeName(cnr, friendlyName)
}
cid, err = a.pool.PutContainer(ctx, cnr) cid, err = a.pool.PutContainer(ctx, cnr)
if err != nil { if err != nil {

1
cmd/authmate/main.go
View file

@ -197,7 +197,6 @@ func issueSecret() *cli.Command {
Usage: "friendly name of auth container to put the secret into", Usage: "friendly name of auth container to put the secret into",
Required: false, Required: false,
Destination: &containerFriendlyName, Destination: &containerFriendlyName,
Value: "auth-container",
}, },
&cli.BoolFlag{ &cli.BoolFlag{
Name: "create-session-token", Name: "create-session-token",