fix: some naming conflicts with ydb CLI

ydb-platform · Jun 25, 2024 · a41cd39 · a41cd39
1 parent c619c02
commit a41cd39
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/pkg/options/auth.go b/pkg/options/auth.go
@@ -79,15 +79,15 @@ func (a *AuthStatic) DefineFlags(fs *pflag.FlagSet) {
 User name search order:
   1. This option
   2. "%s" environment variable
-  3. active profile, see --config-file`, DefaultStaticUserEnvVar))
+  3. active profile, see --profile-file`, DefaultStaticUserEnvVar))
 
 	profile.PopulateFromProfileLater(
 		fs.StringVar, &a.PasswordFile, "password-file", "",
 		fmt.Sprintf(`File with password to authenticate with.
 Password search order:
   1. This option
   2. "%s" environment variable (interpreted as password, not as a filepath)
-  3. active profile, see --config-file`, DefaultStaticPasswordEnvVar))
+  3. active profile, see --profile-file`, DefaultStaticPasswordEnvVar))
 
 	fs.BoolVar(&a.NoPassword, "no-password", false,
 		"TODO NOT IMPLEMENTED Do not ask for user password (if empty) (default: false)")
@@ -121,7 +121,7 @@ func (a *AuthIAMToken) DefineFlags(fs *pflag.FlagSet) {
 Token search order:
   1. This option
   2. "YDB_TOKEN" environment variable (interpreted as token, not as a filepath)
-  3. active profile, see --config-file`)
+  3. active profile, see --profile-file`)
 }
 
 func (a *AuthIAMToken) Validate() error {
@@ -154,7 +154,7 @@ func (a *AuthIAMCreds) DefineFlags(fs *pflag.FlagSet) {
 Definition priority:
   1. This option
   2. "%s" environment variable (interpreted as path to the file)
-  3. active profile, see --config-file`, DefaultServiceAccountKeyFile))
+  3. active profile, see --profile-file`, DefaultServiceAccountKeyFile))
 	fs.StringVarP(&a.Endpoint, "iam-endpoint", "", DefaultAuthIAMEndpoint,
 		"Authentication iam endpoint")
 }

diff --git a/pkg/options/root.go b/pkg/options/root.go
@@ -2,8 +2,8 @@ package options
 
 import (
 	"errors"
-	"fmt"
 	"os"
+	"path/filepath"
 
 	"github.com/spf13/pflag"
 )
@@ -35,7 +35,7 @@ func (o *RootOptions) DefineFlags(fs *pflag.FlagSet) {
 
 	defaultProfileLocation := ""
 	if home, present := os.LookupEnv("HOME"); present {
-		defaultProfileLocation = fmt.Sprintf("%s/ydb/ydbops/config/config.yaml", home)
+		defaultProfileLocation = filepath.Join(home, "ydb", "ydbops", "config", "config.yaml")
 	}
 
 	_, err := os.Stat(defaultProfileLocation)
@@ -46,14 +46,14 @@ func (o *RootOptions) DefineFlags(fs *pflag.FlagSet) {
 	}
 
 	fs.StringVar(
-		&o.ProfileFile, "config-file",
+		&o.ProfileFile, "profile-file",
 		defaultProfileLocation,
 		"Path to config file with profile data in yaml format. Default: $HOME/ydb/ydbops/config/config.yaml")
 
 	fs.StringVar(
 		&o.ActiveProfile, "profile",
 		"",
-		"Override currently set profile name from --config-file")
+		"Override currently set profile name from --profile-file")
 
 	fs.BoolVar(&o.Verbose, "verbose", false, "Switches log level from INFO to DEBUG")
 }
diff --git a/tests/profile_test.go b/tests/profile_test.go
@@ -26,7 +26,7 @@ var _ = Describe("Test Profile", func() {
 			steps: []StepData{
 				{
 					ydbopsInvocation: Command{
-						"--config-file",
+						"--profile-file",
 						filepath.Join(".", "test-data", "config_with_active_profile.yaml"),
 						"--availability-mode", "strong",
 						"--cms-query-interval", "1",
@@ -101,7 +101,7 @@ var _ = Describe("Test Profile", func() {
 			steps: []StepData{
 				{
 					ydbopsInvocation: Command{
-						"--config-file",
+						"--profile-file",
 						filepath.Join(".", "test-data", "config_without_active_profile.yaml"),
 						"--profile",
 						"my-profile",