TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 100 Pull requests 4 Projects Releases 1 Activity Actions

[#532] cli: Respect XDG directory spec
All checks were successful
DCO action / DCO (pull_request) Successful in 2m13s
Details
Tests and linters / Run gofumpt (pull_request) Successful in 2m14s
Details
Vulncheck / Vulncheck (pull_request) Successful in 2m19s
Details
Pre-commit hooks / Pre-commit (pull_request) Successful in 2m57s
Details
Build / Build Components (pull_request) Successful in 3m19s
Details
Tests and linters / Staticcheck (pull_request) Successful in 3m20s
Details
Tests and linters / gopls check (pull_request) Successful in 3m48s
Details
Tests and linters / Lint (pull_request) Successful in 3m56s
Details
Tests and linters / Tests (pull_request) Successful in 5m18s
Details
Tests and linters / Tests with -race (pull_request) Successful in 6m26s
Details

Browse source 
Close #532
Refs #1455

Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
Evgenii Stratonikov 2024-11-05 16:15:59 +03:00
parent 6c45a17af6
commit e71a430e8a
Signed by: fyrchik
SSH key fingerprint: SHA256:m/TTwCzjnRkXgnzEx9X92ccxy1CcVeinOgDb3NPWWmg
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cmd/frostfs-cli/modules/root.go
View file

@ -21,7 +21,6 @@ import (
"git.frostfs.info/TrueCloudLab/frostfs-node/misc" "git.frostfs.info/TrueCloudLab/frostfs-node/misc"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/config" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/config"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/gendoc" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/gendoc"
"github.com/mitchellh/go-homedir"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/spf13/viper" "github.com/spf13/viper"
) )
@ -113,12 +112,12 @@ func initConfig() {
viper.SetConfigFile(cfgFile) viper.SetConfigFile(cfgFile)
} else { } else {
// Find home directory. // Find home directory.
home, err := homedir.Dir() configDir, err := os.UserConfigDir()
if err != nil { if err != nil {
common.PrintVerbose(rootCmd, "Get homedir: %s", err) common.PrintVerbose(rootCmd, "Get config dir: %s", err)
} else { } else {
// Search config in `$HOME/.config/frostfs-cli/` with name "config.yaml" // Search config in `$HOME/.config/frostfs-cli/` with name "config.yaml"
viper.AddConfigPath(filepath.Join(home, ".config", "frostfs-cli")) viper.AddConfigPath(filepath.Join(configDir, "frostfs-cli"))
viper.SetConfigName("config") viper.SetConfigName("config")
viper.SetConfigType("yaml") viper.SetConfigType("yaml")
} }

1
go.mod
View file

@ -27,7 +27,6 @@ require (
github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/hashicorp/golang-lru/v2 v2.0.7
github.com/klauspost/compress v1.17.4 github.com/klauspost/compress v1.17.4
github.com/mailru/easyjson v0.7.7 github.com/mailru/easyjson v0.7.7
github.com/mitchellh/go-homedir v1.1.0
github.com/mr-tron/base58 v1.2.0 github.com/mr-tron/base58 v1.2.0
github.com/multiformats/go-multiaddr v0.12.1 github.com/multiformats/go-multiaddr v0.12.1
github.com/nspcc-dev/neo-go v0.106.3 github.com/nspcc-dev/neo-go v0.106.3

BIN
go.sum
View file

Binary file not shown.