Skip to content

Commit 1aa9dce

Browse files
authored
Merge pull request #21 from ydb-platform/login-password
CredentialsStaticLogin+CredentialsStaticPassword
2 parents 0c890ea + ce28c86 commit 1aa9dce

File tree

5 files changed

+42
-5
lines changed

5 files changed

+42
-5
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
* Upgraded `ydb-go-sdk` dependency
2+
* Added `CredentialsStaticLogin` and `CredentialsStaticPassword` configuration parameters (alternatively for parameter `CredentialsStatic`)
3+
14
## v1.3.0
25
* Upgraded `ydb-go-sdk` dependency
36
* Set `info` as default log-level for fluent-bit ydb plugin

examples/tail2ydb.conf

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
# CredentialsYcServiceAccountKeyFile sa-key.json
1616
# CredentialsYcServiceAccountKeyJson json-data
1717
# CredentialsYcMetadata 1
18-
# CredentialsStatic username:password@
18+
# CredentialsStatic login:password
19+
# CredentialsStaticLogin @login
20+
# CredentialsStaticPassword :password
1921
# CredentialsToken token-value
2022
# Certificates ydb-ca.crt
2123
LogLevel disabled # optional parameter. Value must be one of "disabled", "trace", "debug", "info", "warn", "error", "fatal" or "panic"

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/rs/zerolog v1.32.0
1010
github.com/stretchr/testify v1.8.3
1111
github.com/surge/cityhash v0.0.0-20131128155616-cdd6a94144ab
12-
github.com/ydb-platform/ydb-go-sdk/v3 v3.92.6
12+
github.com/ydb-platform/ydb-go-sdk/v3 v3.93.0
1313
github.com/ydb-platform/ydb-go-yc v0.12.1
1414
golang.org/x/sync v0.9.0
1515
)

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -794,8 +794,8 @@ github.com/ydb-platform/ydb-go-genproto v0.0.0-20241112172322-ea1f63298f77 h1:LY
794794
github.com/ydb-platform/ydb-go-genproto v0.0.0-20241112172322-ea1f63298f77/go.mod h1:Er+FePu1dNUieD+XTMDduGpQuCPssK5Q4BjF+IIXJ3I=
795795
github.com/ydb-platform/ydb-go-sdk/v3 v3.44.0/go.mod h1:oSLwnuilwIpaF5bJJMAofnGgzPJusoI3zWMNb8I+GnM=
796796
github.com/ydb-platform/ydb-go-sdk/v3 v3.47.3/go.mod h1:bWnOIcUHd7+Sl7DN+yhyY1H/I61z53GczvwJgXMgvj0=
797-
github.com/ydb-platform/ydb-go-sdk/v3 v3.92.6 h1:4T6B1Mv1vZiq+08Jv/J5R5ZG4ManSEeaVRPHB2FrRH4=
798-
github.com/ydb-platform/ydb-go-sdk/v3 v3.92.6/go.mod h1:WiezFS4YCi2vHqbYGQkeu/2MDBYFLix6dIs/pd87Yck=
797+
github.com/ydb-platform/ydb-go-sdk/v3 v3.93.0 h1:CYPlnIAd6BnYt2EKrcf+swGWqtxEO0OwwDNKOKey7Cc=
798+
github.com/ydb-platform/ydb-go-sdk/v3 v3.93.0/go.mod h1:WiezFS4YCi2vHqbYGQkeu/2MDBYFLix6dIs/pd87Yck=
799799
github.com/ydb-platform/ydb-go-yc v0.12.1 h1:qw3Fa+T81+Kpu5Io2vYHJOwcrYrVjgJlT6t/0dOXJrA=
800800
github.com/ydb-platform/ydb-go-yc v0.12.1/go.mod h1:t/ZA4ECdgPWjAb4jyDe8AzQZB5dhpGbi3iCahFaNwBY=
801801
github.com/ydb-platform/ydb-go-yc-metadata v0.6.1 h1:9E5q8Nsy2RiJMZDNVy0A3KUrIMBPakJ2VgloeWbcI84=

internal/config/config.go

+33-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ const (
2525
ParamCredentialsYcServiceAccountKey = "CredentialsYcServiceAccountKey"
2626
ParamCredentialsYcMetadata = "CredentialsYcMetadata"
2727
ParamCredentialsStatic = "CredentialsStatic"
28+
ParamCredentialsStaticLogin = "CredentialsStaticLogin"
29+
ParamCredentialsStaticPassword = "CredentialsStaticPassword"
2830
ParamCredentialsToken = "CredentialsToken"
2931
ParamCredentialsAnonymous = "CredentialsAnonymous"
3032
ParamLogLevel = "LogLevel"
@@ -87,7 +89,37 @@ var credentialsChooser = map[string]credentialsDescription{
8789
},
8890
about: func() string {
8991
return fmt.Sprintf(
90-
"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
93+
ParamCredentialsStatic,
94+
ParamCredentialsStaticLogin,
95+
ParamCredentialsStaticPassword,
96+
)
97+
},
98+
},
99+
ParamCredentialsStaticLogin: {
100+
make: func(value string) (ydb.Option, error) {
101+
return ydb.WithStaticCredentialsLogin(value), nil
102+
},
103+
about: func() string {
104+
return fmt.Sprintf(
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,
109+
ParamCredentialsStatic,
110+
)
111+
},
112+
},
113+
ParamCredentialsStaticPassword: {
114+
make: func(value string) (ydb.Option, error) {
115+
return ydb.WithStaticCredentialsPassword(value), nil
116+
},
117+
about: func() string {
118+
return fmt.Sprintf(
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,
91123
ParamCredentialsStatic,
92124
)
93125
},

0 commit comments

Comments
 (0)