Skip to content

Commit ce28c86

Browse files
committed
fixes
1 parent 3b1a14f commit ce28c86

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

CHANGELOG.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
* Upgraded `ydb-go-sdk` dependency
2-
* Added `CredentialsStaticLogin` and `CredentialsStaticPassword` configuration parameters
3-
* Marked as deprecated `CredentialsStatic` configuration parameter
2+
* Added `CredentialsStaticLogin` and `CredentialsStaticPassword` configuration parameters (alternatively for parameter `CredentialsStatic`)
43

54
## v1.3.0
65
* Upgraded `ydb-go-sdk` dependency

examples/tail2ydb.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
# CredentialsYcServiceAccountKeyFile sa-key.json
1616
# CredentialsYcServiceAccountKeyJson json-data
1717
# CredentialsYcMetadata 1
18+
# CredentialsStatic login:password
1819
# CredentialsStaticLogin @login
1920
# CredentialsStaticPassword :password
2021
# CredentialsToken token-value

internal/config/config.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,10 @@ var credentialsChooser = map[string]credentialsDescription{
8989
},
9090
about: func() string {
9191
return fmt.Sprintf(
92-
"(deprecated) value of parameter '%s' must be a string with template 'user:password'",
92+
"value of parameter %q must be a string with template 'user:password'. Alternatively parameter for splitted parameters %q and %q", //nolint:lll
9393
ParamCredentialsStatic,
94+
ParamCredentialsStaticLogin,
95+
ParamCredentialsStaticPassword,
9496
)
9597
},
9698
},
@@ -100,7 +102,10 @@ var credentialsChooser = map[string]credentialsDescription{
100102
},
101103
about: func() string {
102104
return fmt.Sprintf(
103-
"value of parameter '%s' must be a string with static credentials login",
105+
"value of parameter %q must be a string with static credentials login. %q uses with %q. Alternatively you can use parameter %q", //nolint:lll
106+
ParamCredentialsStaticLogin,
107+
ParamCredentialsStaticLogin,
108+
ParamCredentialsStaticPassword,
104109
ParamCredentialsStatic,
105110
)
106111
},
@@ -111,7 +116,10 @@ var credentialsChooser = map[string]credentialsDescription{
111116
},
112117
about: func() string {
113118
return fmt.Sprintf(
114-
"value of parameter '%s' must be a string with static credentials password",
119+
"value of parameter %q must be a string with static credentials password. %q uses with %q. Alternatively you can use parameter %q", //nolint:lll
120+
ParamCredentialsStaticPassword,
121+
ParamCredentialsStaticPassword,
122+
ParamCredentialsStaticLogin,
115123
ParamCredentialsStatic,
116124
)
117125
},

0 commit comments

Comments
 (0)