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

[#1889] Move netmap.go and exit.go from cli to cmd/internal/common

Browse source 
Signed-off-by: Anton Nikiforov <an.nikiforov@yadro.com>
This commit is contained in:
Anton Nikiforov 2023-01-16 12:20:16 +03:00 • committed by fyrchik
parent 5a9d6a09d8
commit 2b09564355
62 changed files with 269 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cmd/frostfs-cli/modules/util/convert_eacl.go
View file

@ -5,6 +5,7 @@ import (
"github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common"
"github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags"
commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common"
"github.com/spf13/cobra"
)
@ -36,10 +37,10 @@ func convertEACLTable(cmd *cobra.Command, _ []string) {
var err error
if jsonFlag || len(to) == 0 {
data, err = table.MarshalJSON()
common.ExitOnErr(cmd, "can't JSON encode extended ACL table: %w", err)
commonCmd.ExitOnErr(cmd, "can't JSON encode extended ACL table: %w", err)
} else {
data, err = table.Marshal()
common.ExitOnErr(cmd, "can't binary encode extended ACL table: %w", err)
commonCmd.ExitOnErr(cmd, "can't binary encode extended ACL table: %w", err)
}
if len(to) == 0 {
@ -48,7 +49,7 @@ func convertEACLTable(cmd *cobra.Command, _ []string) {
}
err = os.WriteFile(to, data, 0644)
common.ExitOnErr(cmd, "can't write exteded ACL table to file: %w", err)
commonCmd.ExitOnErr(cmd, "can't write exteded ACL table to file: %w", err)
cmd.Printf("extended ACL table was successfully dumped to %s\n", to)
}

6
cmd/frostfs-cli/modules/util/keyer.go
View file

@ -6,7 +6,7 @@ import (
"fmt"
"os"
"github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common"
commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common"
"github.com/TrueCloudLab/frostfs-node/pkg/util/keyer"
"github.com/spf13/cobra"
)
@ -41,7 +41,7 @@ func processKeyer(cmd *cobra.Command, args []string) {
err = result.ParseMultiSig(args)
} else {
if len(args) > 1 {
common.ExitOnErr(cmd, "", errKeyerSingleArgument)
commonCmd.ExitOnErr(cmd, "", errKeyerSingleArgument)
}
var argument string
@ -59,7 +59,7 @@ func processKeyer(cmd *cobra.Command, args []string) {
}
}
common.ExitOnErr(cmd, "", err)
commonCmd.ExitOnErr(cmd, "", err)
result.PrettyPrint(uncompressed, useHex)
}

6
cmd/frostfs-cli/modules/util/locode_generate.go
View file

@ -1,7 +1,7 @@
package util
import (
"github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common"
commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common"
locodedb "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db"
airportsdb "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db/airports"
locodebolt "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db/boltdb"
@ -58,7 +58,7 @@ var (
})
err := targetDB.Open()
common.ExitOnErr(cmd, "", err)
commonCmd.ExitOnErr(cmd, "", err)
defer targetDB.Close()
@ -68,7 +68,7 @@ var (
}
err = locodedb.FillDatabase(locodeDB, airportDB, continentsDB, names, targetDB)
common.ExitOnErr(cmd, "", err)
commonCmd.ExitOnErr(cmd, "", err)
},
}
)

6
cmd/frostfs-cli/modules/util/locode_info.go
View file

@ -1,7 +1,7 @@
package util
import (
"github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common"
commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common"
locodedb "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db"
locodebolt "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db/boltdb"
"github.com/spf13/cobra"
@ -25,12 +25,12 @@ var (
}, locodebolt.ReadOnly())
err := targetDB.Open()
common.ExitOnErr(cmd, "", err)
commonCmd.ExitOnErr(cmd, "", err)
defer targetDB.Close()
record, err := locodedb.LocodeRecord(targetDB, locodeInfoCode)
common.ExitOnErr(cmd, "", err)
commonCmd.ExitOnErr(cmd, "", err)
cmd.Printf("Country: %s\n", record.CountryName())
cmd.Printf("Location: %s\n", record.LocationName())

7
cmd/frostfs-cli/modules/util/sign_bearer.go
View file

@ -6,6 +6,7 @@ import (
"github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common"
"github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags"
"github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key"
commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common"
"github.com/spf13/cobra"
)
@ -37,7 +38,7 @@ func signBearerToken(cmd *cobra.Command, _ []string) {
pk := key.GetOrGenerate(cmd)
err := btok.Sign(*pk)
common.ExitOnErr(cmd, "", err)
commonCmd.ExitOnErr(cmd, "", err)
to := cmd.Flag(signToFlag).Value.String()
jsonFlag, _ := cmd.Flags().GetBool(signBearerJSONFlag)
@ -45,7 +46,7 @@ func signBearerToken(cmd *cobra.Command, _ []string) {
var data []byte
if jsonFlag || len(to) == 0 {
data, err = btok.MarshalJSON()
common.ExitOnErr(cmd, "can't JSON encode bearer token: %w", err)
commonCmd.ExitOnErr(cmd, "can't JSON encode bearer token: %w", err)
} else {
data = btok.Marshal()
}
@ -56,7 +57,7 @@ func signBearerToken(cmd *cobra.Command, _ []string) {
}
err = os.WriteFile(to, data, 0644)
common.ExitOnErr(cmd, "can't write signed bearer token to file: %w", err)
commonCmd.ExitOnErr(cmd, "can't write signed bearer token to file: %w", err)
cmd.Printf("signed bearer token was successfully dumped to %s\n", to)
}

13
cmd/frostfs-cli/modules/util/sign_session.go
View file

@ -10,6 +10,7 @@ import (
"github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common"
"github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags"
"github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key"
commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common"
"github.com/TrueCloudLab/frostfs-sdk-go/session"
"github.com/spf13/cobra"
)
@ -34,10 +35,10 @@ func initSignSessionCmd() {
func signSessionToken(cmd *cobra.Command, _ []string) {
fPath, err := cmd.Flags().GetString(signFromFlag)
common.ExitOnErr(cmd, "", err)
commonCmd.ExitOnErr(cmd, "", err)
if fPath == "" {
common.ExitOnErr(cmd, "", errors.New("missing session token flag"))
commonCmd.ExitOnErr(cmd, "", errors.New("missing session token flag"))
}
type iTokenSession interface {
@ -59,15 +60,15 @@ func signSessionToken(cmd *cobra.Command, _ []string) {
}
}
common.ExitOnErr(cmd, "decode session: %v", errLast)
commonCmd.ExitOnErr(cmd, "decode session: %v", errLast)
pk := key.GetOrGenerate(cmd)
err = stok.Sign(*pk)
common.ExitOnErr(cmd, "can't sign token: %w", err)
commonCmd.ExitOnErr(cmd, "can't sign token: %w", err)
data, err := stok.MarshalJSON()
common.ExitOnErr(cmd, "can't encode session token: %w", err)
commonCmd.ExitOnErr(cmd, "can't encode session token: %w", err)
to := cmd.Flag(signToFlag).Value.String()
if len(to) == 0 {
@ -77,7 +78,7 @@ func signSessionToken(cmd *cobra.Command, _ []string) {
err = os.WriteFile(to, data, 0644)
if err != nil {
common.ExitOnErr(cmd, "", fmt.Errorf("can't write signed session token to %s: %w", to, err))
commonCmd.ExitOnErr(cmd, "", fmt.Errorf("can't write signed session token to %s: %w", to, err))
}
cmd.Printf("signed session token saved in %s\n", to)