aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorasmyasnikov <asmyasnikov@ydb.tech>2022-12-21 14:50:35 +0300
committerasmyasnikov <asmyasnikov@ydb.tech>2022-12-21 14:50:35 +0300
commit10c915d6deca5ce9d5a6902f69b719d89402ffa5 (patch)
tree22c584f1b9316da0d2a2e3f17395620be76a823a
parentc57b812b9ff208ecf1af77096bff0eae7dfe0c03 (diff)
downloadydb-10c915d6deca5ce9d5a6902f69b719d89402ffa5.tar.gz
added static credentials man + fix links
added static credentials man + fix links
-rw-r--r--library/python/pytest/ut/test_tools.py35
-rw-r--r--ydb/docs/en/core/reference/ydb-sdk/_includes/auth.md11
-rw-r--r--ydb/docs/ru/core/reference/ydb-sdk/_includes/auth.md11
3 files changed, 37 insertions, 20 deletions
diff --git a/library/python/pytest/ut/test_tools.py b/library/python/pytest/ut/test_tools.py
index fa6db5164f..6368b9c2fa 100644
--- a/library/python/pytest/ut/test_tools.py
+++ b/library/python/pytest/ut/test_tools.py
@@ -9,28 +9,42 @@ def parameters(request):
return request.param
-@pytest.mark.parametrize("node_id,expected_class_name,expected_test_name",
+@pytest.mark.parametrize(
+ "node_id,expected_class_name,expected_test_name",
(
("package.test_script.py::test_name", "package.test_script.py", "test_name"),
("package.test_script.py", "package.test_script.py", "package.test_script.py"),
("package.test_script.py::class_name::test_name", "package.test_script.py::class_name", "test_name"),
- ("package.test_script.py::class_name::subclass_name::test_name", "package.test_script.py::class_name", "test_name"),
- )
+ (
+ "package.test_script.py::class_name::subclass_name::test_name",
+ "package.test_script.py::class_name",
+ "test_name",
+ ),
+ ),
)
def test_split_node_id_without_path(parameters, node_id, expected_class_name, expected_test_name):
got = split_node_id(node_id + parameters)
assert (expected_class_name, expected_test_name + parameters) == got
-@pytest.mark.parametrize("node_id,expected_class_name,expected_test_name",
+@pytest.mark.parametrize(
+ "node_id,expected_class_name,expected_test_name",
(
("/arcadia/root/package/test_script.py", "package.test_script.py", "package.test_script.py"),
- ("/arcadia/root/package/test_script.py::test_name","package.test_script.py", "test_name"),
- ("/arcadia/root/package/test_script.py::class_name::test_name", "package.test_script.py::class_name", "test_name"),
- ("/arcadia/root/package/test_script.py::class_name::subclass_name::test_name", "package.test_script.py::class_name", "test_name"),
+ ("/arcadia/root/package/test_script.py::test_name", "package.test_script.py", "test_name"),
+ (
+ "/arcadia/root/package/test_script.py::class_name::test_name",
+ "package.test_script.py::class_name",
+ "test_name",
+ ),
+ (
+ "/arcadia/root/package/test_script.py::class_name::subclass_name::test_name",
+ "package.test_script.py::class_name",
+ "test_name",
+ ),
# If module is not found in sys.extra_modules use basename as a class name
("/arcadia/root/package/test_script2.py::test_name", "test_script2.py", "test_name"),
- )
+ ),
)
def test_split_node_id_with_path(mocker, parameters, node_id, expected_class_name, expected_test_name):
mocker.patch.object(sys, 'extra_modules', sys.extra_modules | {'__tests__.package.test_script'})
@@ -38,13 +52,14 @@ def test_split_node_id_with_path(mocker, parameters, node_id, expected_class_nam
assert (expected_class_name, expected_test_name + parameters) == got
-@pytest.mark.parametrize("node_id,expected_class_name,expected_test_name",
+@pytest.mark.parametrize(
+ "node_id,expected_class_name,expected_test_name",
(
("package.test_script.py::test_name", "package.test_script.py", "test_suffix"),
("package.test_script.py", "package.test_script.py", "test_suffix"),
("package.test_script.py::class_name::test_name", "package.test_script.py", "test_suffix"),
("package.test_script.py::class_name::subclass_name::test_name", "package.test_script.py", "test_suffix"),
- )
+ ),
)
def test_split_node_id_with_test_suffix(mocker, parameters, node_id, expected_class_name, expected_test_name):
got = split_node_id(node_id + parameters, "test_suffix")
diff --git a/ydb/docs/en/core/reference/ydb-sdk/_includes/auth.md b/ydb/docs/en/core/reference/ydb-sdk/_includes/auth.md
index 1509030b79..1e42c7560c 100644
--- a/ydb/docs/en/core/reference/ydb-sdk/_includes/auth.md
+++ b/ydb/docs/en/core/reference/ydb-sdk/_includes/auth.md
@@ -31,11 +31,12 @@ You can click any of the methods below to go to the source code of an example in
| Mode | Package | Method |
----- | ----- | ----
- | Anonymous | [ydb-go-sdk/v3](https://github.com/ydb-platform/ydb-go-sdk/blob/master/go.mod) | [ydb.WithAnonymousCredentials()](https://github.com/ydb-platform/ydb-go-examples/tree/master/cmd/auth/anonymous_credentials) |
- | Access Token | [ydb-go-sdk/v3](https://github.com/ydb-platform/ydb-go-sdk/blob/master/go.mod) | [ydb.WithAccessTokenCredentials( token )](https://github.com/ydb-platform/ydb-go-examples/tree/master/cmd/auth/access_token_credentials) |
- | Metadata | [ydb-go-yc](https://github.com/ydb-platform/ydb-go-yc/blob/master/go.mod) | [yc.WithMetadataCredentials( ctx )](https://github.com/ydb-platform/ydb-go-examples/tree/master/cmd/auth/metadata_credentials) |
- | Service Account Key | [ydb-go-yc](https://github.com/ydb-platform/ydb-go-yc/blob/master/go.mod) | [yc.WithServiceAccountKeyFileCredentials( key_file )](https://github.com/ydb-platform/ydb-go-examples/tree/master/cmd/auth/service_account_credentials) |
- | Determined by environment variables | [ydb-go-sdk-auth-environ](https://github.com/ydb-platform/ydb-go-sdk-auth-environ/blob/master/go.mod) | [environ.WithEnvironCredentials(ctx)](https://github.com/ydb-platform/ydb-go-examples/tree/master/cmd/auth/environ) |
+ | Anonymous | [ydb-go-sdk/v3](https://github.com/ydb-platform/ydb-go-sdk/) | [ydb.WithAnonymousCredentials()](https://github.com/ydb-platform/ydb-go-examples/tree/master/auth/anonymous_credentials)
+ | User+Password | [ydb-go-sdk/v3](https://github.com/ydb-platform/ydb-go-sdk/) | [ydb.WithStaticCredentials(user, password)](https://github.com/ydb-platform/ydb-go-examples/tree/master/auth/static_credentials)
+ | Access Token | [ydb-go-sdk/v3](https://github.com/ydb-platform/ydb-go-sdk/) | [ydb.WithAccessTokenCredentials(token)](https://github.com/ydb-platform/ydb-go-examples/tree/master/auth/access_token_credentials)
+ | Metadata | [ydb-go-yc](https://github.com/ydb-platform/ydb-go-yc/) | [yc.WithMetadataCredentials(ctx)](https://github.com/ydb-platform/ydb-go-examples/tree/master/auth/metadata_credentials)
+ | Service Account Key | [ydb-go-yc](https://github.com/ydb-platform/ydb-go-yc/) | [yc.WithServiceAccountKeyFileCredentials(key_file)](https://github.com/ydb-platform/ydb-go-examples/tree/master/auth/service_account_credentials)
+ | Determined by environment variables | [ydb-go-sdk-auth-environ](https://github.com/ydb-platform/ydb-go-sdk-auth-environ/) | [environ.WithEnvironCredentials(ctx)](https://github.com/ydb-platform/ydb-go-examples/tree/master/auth/environ)
- Java
diff --git a/ydb/docs/ru/core/reference/ydb-sdk/_includes/auth.md b/ydb/docs/ru/core/reference/ydb-sdk/_includes/auth.md
index 809c9e019d..9f1f2224ad 100644
--- a/ydb/docs/ru/core/reference/ydb-sdk/_includes/auth.md
+++ b/ydb/docs/ru/core/reference/ydb-sdk/_includes/auth.md
@@ -31,11 +31,12 @@
Режим | Пакет | Метод
----- | ----- | ----
- Anonymous | [ydb-go-sdk/v3](https://github.com/ydb-platform/ydb-go-sdk/blob/master/go.mod) | [ydb.WithAnonymousCredentials()](https://github.com/ydb-platform/ydb-go-examples/tree/master/cmd/auth/anonymous_credentials)
- Access Token | [ydb-go-sdk/v3](https://github.com/ydb-platform/ydb-go-sdk/blob/master/go.mod) | [ydb.WithAccessTokenCredentials( token )](https://github.com/ydb-platform/ydb-go-examples/tree/master/cmd/auth/access_token_credentials)
- Metadata | [ydb-go-yc](https://github.com/ydb-platform/ydb-go-yc/blob/master/go.mod) | [yc.WithMetadataCredentials( ctx )](https://github.com/ydb-platform/ydb-go-examples/tree/master/cmd/auth/metadata_credentials)
- Service Account Key | [ydb-go-yc](https://github.com/ydb-platform/ydb-go-yc/blob/master/go.mod) | [yc.WithServiceAccountKeyFileCredentials( key_file )](https://github.com/ydb-platform/ydb-go-examples/tree/master/cmd/auth/service_account_credentials)
- Определяется по переменным окружения | [ydb-go-sdk-auth-environ](https://github.com/ydb-platform/ydb-go-sdk-auth-environ/blob/master/go.mod) | [environ.WithEnvironCredentials(ctx)](https://github.com/ydb-platform/ydb-go-examples/tree/master/cmd/auth/environ)
+ Anonymous | [ydb-go-sdk/v3](https://github.com/ydb-platform/ydb-go-sdk/)| [ydb.WithAnonymousCredentials()](https://github.com/ydb-platform/ydb-go-examples/tree/master/auth/anonymous_credentials)
+ User+Password | [ydb-go-sdk/v3](https://github.com/ydb-platform/ydb-go-sdk/) | [ydb.WithStaticCredentials(user, password)](https://github.com/ydb-platform/ydb-go-examples/tree/master/auth/static_credentials)
+ Access Token | [ydb-go-sdk/v3](https://github.com/ydb-platform/ydb-go-sdk/) | [ydb.WithAccessTokenCredentials(token)](https://github.com/ydb-platform/ydb-go-examples/tree/master/auth/access_token_credentials)
+ Metadata | [ydb-go-yc](https://github.com/ydb-platform/ydb-go-yc/) | [yc.WithMetadataCredentials(ctx)](https://github.com/ydb-platform/ydb-go-examples/tree/master/auth/metadata_credentials)
+ Service Account Key | [ydb-go-yc](https://github.com/ydb-platform/ydb-go-yc/) | [yc.WithServiceAccountKeyFileCredentials(key_file)](https://github.com/ydb-platform/ydb-go-examples/tree/master/auth/service_account_credentials)
+ Определяется по переменным окружения | [ydb-go-sdk-auth-environ](https://github.com/ydb-platform/ydb-go-sdk-auth-environ/) | [environ.WithEnvironCredentials(ctx)](https://github.com/ydb-platform/ydb-go-examples/tree/master/auth/environ)
- Java