Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
asmyasnikov committed Dec 2, 2024
1 parent 3b1a14f commit ce28c86
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
* Upgraded `ydb-go-sdk` dependency
* Added `CredentialsStaticLogin` and `CredentialsStaticPassword` configuration parameters
* Marked as deprecated `CredentialsStatic` configuration parameter
* Added `CredentialsStaticLogin` and `CredentialsStaticPassword` configuration parameters (alternatively for parameter `CredentialsStatic`)

## v1.3.0
* Upgraded `ydb-go-sdk` dependency
Expand Down
1 change: 1 addition & 0 deletions examples/tail2ydb.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# CredentialsYcServiceAccountKeyFile sa-key.json
# CredentialsYcServiceAccountKeyJson json-data
# CredentialsYcMetadata 1
# CredentialsStatic login:password
# CredentialsStaticLogin @login
# CredentialsStaticPassword :password
# CredentialsToken token-value
Expand Down
14 changes: 11 additions & 3 deletions internal/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,10 @@ var credentialsChooser = map[string]credentialsDescription{
},
about: func() string {
return fmt.Sprintf(
"(deprecated) value of parameter '%s' must be a string with template 'user:password'",
"value of parameter %q must be a string with template 'user:password'. Alternatively parameter for splitted parameters %q and %q", //nolint:lll
ParamCredentialsStatic,
ParamCredentialsStaticLogin,
ParamCredentialsStaticPassword,
)
},
},
Expand All @@ -100,7 +102,10 @@ var credentialsChooser = map[string]credentialsDescription{
},
about: func() string {
return fmt.Sprintf(
"value of parameter '%s' must be a string with static credentials login",
"value of parameter %q must be a string with static credentials login. %q uses with %q. Alternatively you can use parameter %q", //nolint:lll
ParamCredentialsStaticLogin,
ParamCredentialsStaticLogin,
ParamCredentialsStaticPassword,
ParamCredentialsStatic,
)
},
Expand All @@ -111,7 +116,10 @@ var credentialsChooser = map[string]credentialsDescription{
},
about: func() string {
return fmt.Sprintf(
"value of parameter '%s' must be a string with static credentials password",
"value of parameter %q must be a string with static credentials password. %q uses with %q. Alternatively you can use parameter %q", //nolint:lll
ParamCredentialsStaticPassword,
ParamCredentialsStaticPassword,
ParamCredentialsStaticLogin,
ParamCredentialsStatic,
)
},
Expand Down

0 comments on commit ce28c86

Please sign in to comment.