TrueCloudLab/frostfs-node
21
1
Fork 27
Code Issues 108 Pull requests 4 Projects Releases 2 Activity Actions

[#390] frostfs-cli: Pass bearer token to Tree srv #427

Merged
realloc merged 1 commit from aarifullin/frostfs-node:feature/390-bearer_tree_srv into master 2023-06-07 13:04:21 +00:00
Conversation 1 Commits 1 Files changed 5 +11 -4
5 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 189a367ef2 - Show all commits

3
cmd/frostfs-cli/modules/tree/add.go
View file

@ -5,6 +5,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common"
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags"
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key"
commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common"
@ -60,7 +61,7 @@ func add(cmd *cobra.Command, _ []string) {
TreeId: tid, TreeId: tid,
ParentId: pid, ParentId: pid,
Meta: meta, Meta: meta,
BearerToken: nil, // TODO: #1891 add token handling BearerToken: common.ReadBearerToken(cmd, bearerFlagKey).Marshal(),
} }
commonCmd.ExitOnErr(cmd, "message signing: %w", tree.SignMessage(req, pk)) commonCmd.ExitOnErr(cmd, "message signing: %w", tree.SignMessage(req, pk))

2
cmd/frostfs-cli/modules/tree/add_by_path.go
View file

@ -72,7 +72,7 @@ func addByPath(cmd *cobra.Command, _ []string) {
// PathAttribute: pAttr, // PathAttribute: pAttr,
Path: strings.Split(path, "/"), Path: strings.Split(path, "/"),
Meta: meta, Meta: meta,
BearerToken: nil, // TODO: #1891 add token handling BearerToken: common.ReadBearerToken(cmd, bearerFlagKey).Marshal(),
} }
commonCmd.ExitOnErr(cmd, "message signing: %w", tree.SignMessage(req, pk)) commonCmd.ExitOnErr(cmd, "message signing: %w", tree.SignMessage(req, pk))

2
cmd/frostfs-cli/modules/tree/get_by_path.go
View file

@ -71,7 +71,7 @@ func getByPath(cmd *cobra.Command, _ []string) {
Path: strings.Split(path, "/"), Path: strings.Split(path, "/"),
LatestOnly: latestOnly, LatestOnly: latestOnly,
AllAttributes: true, AllAttributes: true,
BearerToken: nil, // TODO: #1891 add token handling BearerToken: common.ReadBearerToken(cmd, bearerFlagKey).Marshal(),
} }
commonCmd.ExitOnErr(cmd, "message signing: %w", tree.SignMessage(req, pk)) commonCmd.ExitOnErr(cmd, "message signing: %w", tree.SignMessage(req, pk))

4
cmd/frostfs-cli/modules/tree/root.go
View file

@ -32,6 +32,8 @@ const (
pathAttributeFlagKey = "pattr" pathAttributeFlagKey = "pattr"
latestOnlyFlagKey = "latest" latestOnlyFlagKey = "latest"
bearerFlagKey = "bearer"
) )
func initCTID(cmd *cobra.Command) { func initCTID(cmd *cobra.Command) {
@ -42,4 +44,6 @@ func initCTID(cmd *cobra.Command) {
ff.String(treeIDFlagKey, "", "Tree ID") ff.String(treeIDFlagKey, "", "Tree ID")
_ = cmd.MarkFlagRequired(treeIDFlagKey) _ = cmd.MarkFlagRequired(treeIDFlagKey)
ff.StringP(bearerFlagKey, "", "", "Path to bearer token")
} }

4
cmd/internal/common/exit.go
View file

@ -46,6 +46,8 @@ func ExitOnErr(cmd *cobra.Command, errFmt string, err error) {
} }
cmd.PrintErrln(err) cmd.PrintErrln(err)
cmd.PersistentPostRun(cmd, nil) if cmd.PersistentPostRun != nil {
cmd.PersistentPostRun(cmd, nil)
}
os.Exit(code) os.Exit(code)
} }