From a0819b7fb29404b8a5b795ea6dd0e2a050cab8cc Mon Sep 17 00:00:00 2001 From: julien mounier Date: Wed, 17 Jul 2024 14:37:17 +0200 Subject: [PATCH 1/2] fix(tests): migrate fake-oidc endpoints to /issuers/fake-oidc --- test/test_tanker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_tanker.py b/test/test_tanker.py index e6d906c..aa14b76 100644 --- a/test/test_tanker.py +++ b/test/test_tanker.py @@ -69,7 +69,7 @@ def read_test_config() -> Dict[str, Any]: "clientSecret": assert_env("TANKER_OIDC_CLIENT_SECRET"), "provider": assert_env("TANKER_OIDC_PROVIDER"), "issuer": assert_env("TANKER_OIDC_ISSUER"), - "fakeOidcIssuerUrl": assert_env("TANKER_FAKE_OIDC_URL") + "/issuer", + "fakeOidcIssuerUrl": assert_env("TANKER_FAKE_OIDC_URL") + "/issuers/main", } res["oidc"]["users"] = { "martine": { From 82093c4578297fd07bf597049505d66879a803f7 Mon Sep 17 00:00:00 2001 From: julien mounier Date: Fri, 19 Jul 2024 12:26:24 +0200 Subject: [PATCH 2/2] maint(ci): bump sdk-admin-python --- poetry.lock | 10 +++++----- pyproject.toml | 2 +- test/test_tanker.py | 10 ++++++++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/poetry.lock b/poetry.lock index 0eb4fbb..08a530a 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. [[package]] name = "attrs" @@ -1659,13 +1659,13 @@ widechars = ["wcwidth"] [[package]] name = "tankeradminsdk" -version = "5.0.0" +version = "6.0.0" description = "Tanker Python Admin SDK" optional = false python-versions = ">=3.12,<4.0" files = [ - {file = "tankeradminsdk-5.0.0-py3-none-any.whl", hash = "sha256:93fdf92c15387a991d55e8aa96f03e4f8ae68e18fa4d5c2c72338b8d10ea3f4f"}, - {file = "tankeradminsdk-5.0.0.tar.gz", hash = "sha256:cf8de98449da95a22194414e9ec82870b313dc6f51ede1b09db6d3b11bd1bcab"}, + {file = "tankeradminsdk-6.0.0-py3-none-any.whl", hash = "sha256:01d3108b00962aabf4141a774b084fabea6743bc3ef5a169e211838238015b0a"}, + {file = "tankeradminsdk-6.0.0.tar.gz", hash = "sha256:3665fae54962201c761fac53fdc29617239ec3016a1769cfdcdf5a732c30cdf0"}, ] [package.dependencies] @@ -1870,4 +1870,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.12" -content-hash = "7b1ff56e0e00395701f380d3c62465239734fa077df73268b30531af160a3926" +content-hash = "709626c65e34e6a3dbea76a0ce9823e2207fe20ce6097153de6476709957e5ab" diff --git a/pyproject.toml b/pyproject.toml index 4fbd72e..6582349 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,7 +46,7 @@ pytest = "7.2.0" pytest-cov = "4.0.0" pytest-asyncio = "0.20.2" pytest-xdist = "3.0.2" -tankeradminsdk = { version = "^5.0.0", source = "gitlab" } +tankeradminsdk = { version = "^6.0.0", source = "gitlab" } tankersdk-identity = "3.3.2" [tool.poetry.build] diff --git a/test/test_tanker.py b/test/test_tanker.py index aa14b76..14706e9 100644 --- a/test/test_tanker.py +++ b/test/test_tanker.py @@ -1540,7 +1540,10 @@ def set_up_oidc(app: Dict[str, str], admin: Admin) -> Dict[str, str]: app["id"], oidc_providers=[ AppOidcProvider( - client_id=oidc_client_id, display_name=oidc_provider, issuer=oidc_issuer + client_id=oidc_client_id, + display_name=oidc_provider, + issuer=oidc_issuer, + provider_group_id="WXMnNsPtVsMmP-4frYkCVK7DKC1HrsfFjW_CC7kQ8Jg", ) ], ) @@ -1558,7 +1561,10 @@ def set_up_fake_oidc(app: Dict[str, str], admin: Admin) -> Dict[str, str]: app["id"], oidc_providers=[ AppOidcProvider( - client_id=oidc_client_id, display_name=oidc_provider, issuer=oidc_issuer + client_id=oidc_client_id, + display_name=oidc_provider, + issuer=oidc_issuer, + provider_group_id="zHH4ySkOPdKbgLYD-e-ypGxGekJqp7Wl6zNB6KKPPjk", ) ], )