TrueCloudLab
/
frostfs-s3-gw
15
2
Fork 16
Code Issues 21 Pull Requests 9 Actions Packages Projects Releases 9 Activity

Rename GetNeoFSKey(Public/Private)Key to GetNeoFS(Public/Private)Key

remotes/KirillovDenis/bugfix/681-fix_acl_parsing
Pavel Korotkov 2020-07-21 12:44:25 +03:00
parent ea7286c875
commit 3870f59484
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
auth/center.go
View File

@ -73,11 +73,11 @@ func (center *Center) SetNeoFSKeys(key *ecdsa.PrivateKey) error {
return nil return nil
} }
func (center *Center) GetNeoFSKeyPrivateKey() *ecdsa.PrivateKey { func (center *Center) GetNeoFSPrivateKey() *ecdsa.PrivateKey {
return center.neofsKeys.PrivateKey return center.neofsKeys.PrivateKey
} }
func (center *Center) GetNeoFSKeyPublicKey() *ecdsa.PublicKey { func (center *Center) GetNeoFSPublicKey() *ecdsa.PublicKey {
return center.neofsKeys.PublicKey return center.neofsKeys.PublicKey
} }

2
cmd/gate/app.go
View File

@ -83,7 +83,7 @@ func newApp(l *zap.Logger, v *viper.Viper) *App {
Peers: fetchPeers(l, v), Peers: fetchPeers(l, v),
Logger: l, Logger: l,
PrivateKey: center.GetNeoFSKeyPrivateKey(), PrivateKey: center.GetNeoFSPrivateKey(),
GRPCLogger: gRPCLogger(l), GRPCLogger: gRPCLogger(l),
GRPCVerbose: v.GetBool(cfgGRPCVerbose), GRPCVerbose: v.GetBool(cfgGRPCVerbose),

4
neofs/layer/gateway-neofs.go
View File

@ -48,7 +48,7 @@ func NewLayer(log *zap.Logger, cli pool.Client, center *s3auth.Center) (minio.Ob
defer cancel() defer cancel()
token, err := generateToken(ctx, tokenParams{ token, err := generateToken(ctx, tokenParams{
cli: cli, cli: cli,
key: center.GetNeoFSKeyPrivateKey(), key: center.GetNeoFSPrivateKey(),
until: math.MaxInt64, until: math.MaxInt64,
}) })
if err != nil { if err != nil {
@ -56,7 +56,7 @@ func NewLayer(log *zap.Logger, cli pool.Client, center *s3auth.Center) (minio.Ob
} }
return &neofsObject{ return &neofsObject{
cli: cli, cli: cli,
key: center.GetNeoFSKeyPrivateKey(), key: center.GetNeoFSPrivateKey(),
log: log, log: log,
owner: center.GetOwnerID(), owner: center.GetOwnerID(),
token: token, token: token,