TrueCloudLab/frostfs-node
20
1
Fork 28
Code Issues 107 Pull requests 4 Projects Releases 2 Packages 4 Activity Actions

[#1074] neofs-cli: Move session preparation to modules/session package

Browse source 
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2022-05-30 16:43:02 +03:00 • committed by fyrchik
parent a2bcb3e0ce
commit 9efec21d34
6 changed files with 102 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

15
cmd/neofs-cli/modules/container.go
View file

@ -61,11 +61,6 @@ var wellKnownBasicACL = map[string]acl.BasicACL{
basicACLNoFinalAppend: acl.EACLPublicAppendRule,
}
const sessionTokenFlag = "session"
// path to a file with an encoded session token
var sessionTokenPath string
var (
containerOwner string
@ -163,6 +158,7 @@ It will be stored in sidechain when inner ring will accepts it.`,
cnr := container.New()
var tok *session.Container
sessionTokenPath, _ := cmd.Flags().GetString(commonflags.SessionToken)
if sessionTokenPath != "" {
tok = new(session.Container)
common.ReadSessionToken(cmd, tok, sessionTokenPath)
@ -232,6 +228,7 @@ Only owner of the container has a permission to remove container.`,
var tok *session.Container
sessionTokenPath, _ := cmd.Flags().GetString(commonflags.SessionToken)
if sessionTokenPath != "" {
tok = new(session.Container)
common.ReadSessionToken(cmd, tok, sessionTokenPath)
@ -424,6 +421,7 @@ Container ID in EACL table will be substituted with ID from the CLI.`,
var tok *session.Container
sessionTokenPath, _ := cmd.Flags().GetString(commonflags.SessionToken)
if sessionTokenPath != "" {
tok = new(session.Container)
common.ReadSessionToken(cmd, tok, sessionTokenPath)
@ -586,12 +584,7 @@ func init() {
deleteContainerCmd,
setExtendedACLCmd,
} {
cmd.Flags().StringVar(
&sessionTokenPath,
sessionTokenFlag,
"",
"path to a JSON-encoded container session token",
)
commonflags.InitSession(cmd)
}
}