From 732b6a3556b69fafe2144563e7ef93586138dee6 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Tue, 16 Mar 2021 17:38:01 +0100 Subject: [PATCH 1/2] root: fix typo in bumpversion Signed-off-by: Jens Langhammer --- .bumpversion.cfg | 4 ++-- web/rollup.config.js | 5 +++-- .../docs/outposts/manual-deploy-docker-compose.md | 2 +- website/docs/outposts/manual-deploy-kubernetes.md | 14 +++++++------- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 49bf7d956..8c3c1c351 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -37,6 +37,6 @@ values = [bumpversion:file:web/src/constants.ts] -[bumpversion:file:website/docs/outpusts/manual-deploy-docker-compose.md] +[bumpversion:file:website/docs/outposts/manual-deploy-docker-compose.md] -[bumpversion:file:website/docs/outpusts/manual-deploy-kubernetes.md] +[bumpversion:file:website/docs/outposts/manual-deploy-kubernetes.md] diff --git a/web/rollup.config.js b/web/rollup.config.js index b39a777c1..94b90c0f0 100644 --- a/web/rollup.config.js +++ b/web/rollup.config.js @@ -15,9 +15,10 @@ const resources = [ { src: "./icons/*", dest: "dist/assets/icons" }, ]; +// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types function manualChunks(id) { - if (id.includes('node_modules')) { - return 'vendor'; + if (id.includes("node_modules")) { + return "vendor"; } if (id.includes("src/api/")) { return "api"; diff --git a/website/docs/outposts/manual-deploy-docker-compose.md b/website/docs/outposts/manual-deploy-docker-compose.md index 22cca7eb1..a71a2a112 100644 --- a/website/docs/outposts/manual-deploy-docker-compose.md +++ b/website/docs/outposts/manual-deploy-docker-compose.md @@ -11,7 +11,7 @@ version: "3.5" services: authentik_proxy: - image: beryju/authentik-proxy:2021.3.2 + image: beryju/authentik-proxy:2021.3.3 ports: - 4180:4180 - 4443:4443 diff --git a/website/docs/outposts/manual-deploy-kubernetes.md b/website/docs/outposts/manual-deploy-kubernetes.md index 8f164db61..b78804536 100644 --- a/website/docs/outposts/manual-deploy-kubernetes.md +++ b/website/docs/outposts/manual-deploy-kubernetes.md @@ -14,7 +14,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.3.2 + app.kubernetes.io/version: 2021.3.3 name: authentik-outpost-api stringData: authentik_host: "__AUTHENTIK_URL__" @@ -29,7 +29,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.3.2 + app.kubernetes.io/version: 2021.3.3 name: authentik-outpost spec: ports: @@ -54,7 +54,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.3.2 + app.kubernetes.io/version: 2021.3.3 name: authentik-outpost spec: selector: @@ -62,14 +62,14 @@ spec: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.3.2 + app.kubernetes.io/version: 2021.3.3 template: metadata: labels: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.3.2 + app.kubernetes.io/version: 2021.3.3 spec: containers: - env: @@ -88,7 +88,7 @@ spec: secretKeyRef: key: authentik_host_insecure name: authentik-outpost-api - image: beryju/authentik-proxy:2021.3.2 + image: beryju/authentik-proxy:2021.3.3 name: proxy ports: - containerPort: 4180 @@ -110,7 +110,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.3.2 + app.kubernetes.io/version: 2021.3.3 name: authentik-outpost spec: rules: From 9784c6c828a494816dfb43cfc33ca2ec5908c365 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Tue, 16 Mar 2021 18:24:31 +0100 Subject: [PATCH 2/2] tests/e2e: fix checks for ak-sidebar since ak-interface uses shadowdom now Signed-off-by: Jens Langhammer --- tests/e2e/test_flows_enroll.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/e2e/test_flows_enroll.py b/tests/e2e/test_flows_enroll.py index 6f09f642d..f3dad005c 100644 --- a/tests/e2e/test_flows_enroll.py +++ b/tests/e2e/test_flows_enroll.py @@ -93,7 +93,10 @@ class TestFlowsEnroll(SeleniumTestCase): self.initial_stages() - self.wait.until(ec.presence_of_element_located((By.CSS_SELECTOR, "ak-sidebar"))) + interface_admin = self.get_shadow_root("ak-interface-admin") + wait = WebDriverWait(interface_admin, self.wait_timeout) + + wait.until(ec.presence_of_element_located((By.CSS_SELECTOR, "ak-sidebar"))) self.driver.get(self.shell_url("authentik_core:user-settings")) user = User.objects.get(username="foo") @@ -188,7 +191,11 @@ class TestFlowsEnroll(SeleniumTestCase): self.driver.switch_to.window(self.driver.window_handles[0]) # We're now logged in - self.wait.until(ec.presence_of_element_located((By.CSS_SELECTOR, "ak-sidebar"))) + wait = WebDriverWait( + self.get_shadow_root("ak-interface-admin"), self.wait_timeout + ) + + wait.until(ec.presence_of_element_located((By.CSS_SELECTOR, "ak-sidebar"))) self.driver.get(self.shell_url("authentik_core:user-settings")) self.assert_user(User.objects.get(username="foo"))