From 3c61c69f44746a3462af854e59eb0c2b3ef15772 Mon Sep 17 00:00:00 2001 From: Angira Kekteeva Date: Wed, 19 May 2021 12:28:17 +0300 Subject: [PATCH] [#46] authmate: Rename s3 package to authmate Signed-off-by: Angira Kekteeva --- authmate/s3.go | 2 +- cmd/authmate/main.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/authmate/s3.go b/authmate/s3.go index c36b4c4e..b3c37f80 100644 --- a/authmate/s3.go +++ b/authmate/s3.go @@ -1,4 +1,4 @@ -package s3 +package authmate import ( "context" diff --git a/cmd/authmate/main.go b/cmd/authmate/main.go index b87e9668..982c3afe 100644 --- a/cmd/authmate/main.go +++ b/cmd/authmate/main.go @@ -8,13 +8,13 @@ import ( "os" "time" - "github.com/nspcc-dev/cdn-authmate/agents/s3" sdk "github.com/nspcc-dev/cdn-sdk" "github.com/nspcc-dev/cdn-sdk/creds/hcs" "github.com/nspcc-dev/cdn-sdk/creds/neofs" "github.com/nspcc-dev/cdn-sdk/grace" "github.com/nspcc-dev/cdn-sdk/pool" "github.com/nspcc-dev/neofs-api-go/pkg/container" + "github.com/nspcc-dev/neofs-s3-gw/authmate" "github.com/pkg/errors" "github.com/urfave/cli/v2" "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) } - agent := s3.New(log, client) + agent := authmate.New(log, client) var cid *container.ID if len(containerIDFlag) > 0 { cid = container.NewID() @@ -270,7 +270,7 @@ func issueSecret() *cli.Command { gatesPublicKeys = append(gatesPublicKeys, gpk) } - issueSecretOptions := &s3.IssueSecretOptions{ + issueSecretOptions := &authmate.IssueSecretOptions{ ContainerID: cid, ContainerFriendlyName: containerFriendlyName, NEOFSCreds: neofsCreds, @@ -336,7 +336,7 @@ func obtainSecret() *cli.Command { 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 @@ -345,7 +345,7 @@ func obtainSecret() *cli.Command { return cli.Exit(fmt.Sprintf("failed to create owner's private key: %s", err), 4) } - obtainSecretOptions := &s3.ObtainSecretOptions{ + obtainSecretOptions := &authmate.ObtainSecretOptions{ SecretAddress: secretAddressFlag, GatePrivateKey: gateCreds.PrivateKey(), }