EliChin/frostfs-s3-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-s3-gw
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#46] authmate: Rename s3 package to authmate

Browse source 
Signed-off-by: Angira Kekteeva <kira@nspcc.ru>
This commit is contained in:
Angira Kekteeva 2021-05-19 12:28:17 +03:00
parent acc84a6464
commit 3c61c69f44
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
authmate/s3.go
View file

@ -1,4 +1,4 @@
package s3 package authmate
import ( import (
"context" "context"

10
cmd/authmate/main.go
View file

@ -8,13 +8,13 @@ import (
"os" "os"
"time" "time"
"github.com/nspcc-dev/cdn-authmate/agents/s3"
sdk "github.com/nspcc-dev/cdn-sdk" sdk "github.com/nspcc-dev/cdn-sdk"
"github.com/nspcc-dev/cdn-sdk/creds/hcs" "github.com/nspcc-dev/cdn-sdk/creds/hcs"
"github.com/nspcc-dev/cdn-sdk/creds/neofs" "github.com/nspcc-dev/cdn-sdk/creds/neofs"
"github.com/nspcc-dev/cdn-sdk/grace" "github.com/nspcc-dev/cdn-sdk/grace"
"github.com/nspcc-dev/cdn-sdk/pool" "github.com/nspcc-dev/cdn-sdk/pool"
"github.com/nspcc-dev/neofs-api-go/pkg/container" "github.com/nspcc-dev/neofs-api-go/pkg/container"
"github.com/nspcc-dev/neofs-s3-gw/authmate"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"go.uber.org/zap" "go.uber.org/zap"
@ -247,7 +247,7 @@ func issueSecret() *cli.Command {
return cli.Exit(fmt.Sprintf("failed to create sdk client: %s", err), 2) return cli.Exit(fmt.Sprintf("failed to create sdk client: %s", err), 2)
} }
agent := s3.New(log, client) agent := authmate.New(log, client)
var cid *container.ID var cid *container.ID
if len(containerIDFlag) > 0 { if len(containerIDFlag) > 0 {
cid = container.NewID() cid = container.NewID()
@ -270,7 +270,7 @@ func issueSecret() *cli.Command {
gatesPublicKeys = append(gatesPublicKeys, gpk) gatesPublicKeys = append(gatesPublicKeys, gpk)
} }
issueSecretOptions := &s3.IssueSecretOptions{ issueSecretOptions := &authmate.IssueSecretOptions{
ContainerID: cid, ContainerID: cid,
ContainerFriendlyName: containerFriendlyName, ContainerFriendlyName: containerFriendlyName,
NEOFSCreds: neofsCreds, NEOFSCreds: neofsCreds,
@ -336,7 +336,7 @@ func obtainSecret() *cli.Command {
return cli.Exit(fmt.Sprintf("failed to create sdk client: %s", err), 2) return cli.Exit(fmt.Sprintf("failed to create sdk client: %s", err), 2)
} }
agent := s3.New(log, client) agent := authmate.New(log, client)
var _ = agent var _ = agent
@ -345,7 +345,7 @@ func obtainSecret() *cli.Command {
return cli.Exit(fmt.Sprintf("failed to create owner's private key: %s", err), 4) return cli.Exit(fmt.Sprintf("failed to create owner's private key: %s", err), 4)
} }
obtainSecretOptions := &s3.ObtainSecretOptions{ obtainSecretOptions := &authmate.ObtainSecretOptions{
SecretAddress: secretAddressFlag, SecretAddress: secretAddressFlag,
GatePrivateKey: gateCreds.PrivateKey(), GatePrivateKey: gateCreds.PrivateKey(),
} }