Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sources/scim: fix duplicate groups and invalid schema #9466

Merged
merged 5 commits into from
May 6, 2024

Conversation

BeryJu
Copy link
Member

@BeryJu BeryJu commented Apr 26, 2024

Details

REPLACE ME


Checklist

  • Local tests pass (ak test authentik/)
  • The code has been formatted (make lint-fix)

If an API change has been made

  • The API schema has been updated (make gen-build)

If changes to the frontend have been made

  • The code has been formatted (make web)

If applicable

  • The documentation has been updated
  • The documentation has been formatted (make website)

@BeryJu BeryJu added the deploy_me Deploy the PR changes on a test environment label Apr 26, 2024
@BeryJu BeryJu requested a review from a team as a code owner April 26, 2024 14:46
Copy link

netlify bot commented Apr 26, 2024

Deploy Preview for authentik-docs canceled.

Name Link
🔨 Latest commit 0651d70
🔍 Latest deploy log https://app.netlify.com/sites/authentik-docs/deploys/662bfa89d937740008e99057

Copy link

netlify bot commented Apr 26, 2024

Deploy Preview for authentik-storybook canceled.

Name Link
🔨 Latest commit 0651d70
🔍 Latest deploy log https://app.netlify.com/sites/authentik-storybook/deploys/662bfa892275f900088d640a

Copy link

codecov bot commented Apr 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 92.41%. Comparing base (dde9960) to head (0651d70).
Report is 3 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #9466      +/-   ##
==========================================
- Coverage   92.42%   92.41%   -0.02%     
==========================================
  Files         668      668              
  Lines       32667    32677      +10     
==========================================
+ Hits        30193    30198       +5     
- Misses       2474     2479       +5     
Flag Coverage Δ
e2e 50.71% <100.00%> (+0.01%) ⬆️
integration 26.02% <25.00%> (-0.01%) ⬇️
unit 89.68% <50.00%> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@BeryJu BeryJu force-pushed the sources/scim/fix-duplicate-groups branch from a5a8838 to c53302c Compare April 26, 2024 15:10
Signed-off-by: Jens Langhammer <jens@goauthentik.io>
@BeryJu BeryJu force-pushed the sources/scim/fix-duplicate-groups branch from c53302c to 43c1710 Compare April 26, 2024 15:55
Copy link
Contributor

github-actions bot commented Apr 26, 2024

authentik PR Installation instructions

Instructions for docker-compose

Add the following block to your .env file:

AUTHENTIK_IMAGE=ghcr.io/goauthentik/dev-server
AUTHENTIK_TAG=gh-ghcr.io/goauthentik/dev-server:gh-0651d7066d7fe94c3253b2e92a78c97200258c1f
AUTHENTIK_OUTPOSTS__CONTAINER_IMAGE_BASE=ghcr.io/goauthentik/dev-%(type)s:gh-%(build_hash)s

For arm64, use these values:

AUTHENTIK_IMAGE=ghcr.io/goauthentik/dev-server
AUTHENTIK_TAG=gh-ghcr.io/goauthentik/dev-server:gh-0651d7066d7fe94c3253b2e92a78c97200258c1f-arm64
AUTHENTIK_OUTPOSTS__CONTAINER_IMAGE_BASE=ghcr.io/goauthentik/dev-%(type)s:gh-%(build_hash)s

Afterwards, run the upgrade commands from the latest release notes.

Instructions for Kubernetes

Add the following block to your values.yml file:

authentik:
    outposts:
        container_image_base: ghcr.io/goauthentik/dev-%(type)s:gh-%(build_hash)s
image:
    repository: ghcr.io/goauthentik/dev-server
    tag: gh-ghcr.io/goauthentik/dev-server:gh-0651d7066d7fe94c3253b2e92a78c97200258c1f

For arm64, use these values:

authentik:
    outposts:
        container_image_base: ghcr.io/goauthentik/dev-%(type)s:gh-%(build_hash)s
image:
    repository: ghcr.io/goauthentik/dev-server
    tag: gh-ghcr.io/goauthentik/dev-server:gh-0651d7066d7fe94c3253b2e92a78c97200258c1f-arm64

Afterwards, run the upgrade commands from the latest release notes.

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
Signed-off-by: Jens Langhammer <jens@goauthentik.io>
Signed-off-by: Jens Langhammer <jens@goauthentik.io>
@BeryJu BeryJu removed the deploy_me Deploy the PR changes on a test environment label Apr 26, 2024
Signed-off-by: Jens Langhammer <jens@goauthentik.io>
@BeryJu BeryJu changed the title sources/scim: fix duplicate groups sources/scim: fix duplicate groups and invalid schema Apr 26, 2024
@BeryJu
Copy link
Member Author

BeryJu commented Apr 27, 2024

/cherry-pick version-2024.4

@BeryJu BeryJu merged commit 74d29e2 into main May 6, 2024
70 of 71 checks passed
@BeryJu BeryJu deleted the sources/scim/fix-duplicate-groups branch May 6, 2024 12:55
gcp-cherry-pick-bot bot pushed a commit that referenced this pull request May 6, 2024
* sources/scim: fix duplicate groups

Signed-off-by: Jens Langhammer <jens@goauthentik.io>

* fix missing schema in response

Signed-off-by: Jens Langhammer <jens@goauthentik.io>

* fix members missing in returned group

Signed-off-by: Jens Langhammer <jens@goauthentik.io>

* optimise queries

Signed-off-by: Jens Langhammer <jens@goauthentik.io>

* fix

Signed-off-by: Jens Langhammer <jens@goauthentik.io>

---------

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
BeryJu added a commit that referenced this pull request May 6, 2024
) (#9606)

sources/scim: fix duplicate groups and invalid schema (#9466)

* sources/scim: fix duplicate groups



* fix missing schema in response



* fix members missing in returned group



* optimise queries



* fix



---------

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
Co-authored-by: Jens L <jens@goauthentik.io>
kensternberg-authentik added a commit that referenced this pull request May 8, 2024
* main: (42 commits)
  website/docs: prepare 2024.4.2 release notes (#9555)
  web: bump the esbuild group in /web with 2 updates (#9616)
  translate: Updates for file locale/en/LC_MESSAGES/django.po in ru (#9611)
  translate: Updates for file locale/en/LC_MESSAGES/django.po in zh_CN (#9560)
  translate: Updates for file locale/en/LC_MESSAGES/django.po in zh-Hans (#9563)
  ci: bump golangci/golangci-lint-action from 5 to 6 (#9615)
  web: bump esbuild from 0.20.2 to 0.21.0 in /web (#9617)
  core: bump cryptography from 42.0.6 to 42.0.7 (#9618)
  core: bump sentry-sdk from 2.0.1 to 2.1.1 (#9619)
  core: bump django from 5.0.4 to 5.0.5 (#9620)
  core, web: update translations (#9613)
  website/docs: move Sources from Integrations into Docs (#9515)
  website/docs: add procedurals to flow inspector docs (#9556)
  core: bump jinja2 from 3.1.3 to 3.1.4 (#9610)
  web: clean up the options rendering in PromptForm (#9564)
  translate: Updates for file locale/en/LC_MESSAGES/django.po in ru (#9608)
  website/docs: add instructions for deploying radius manually with docker compose (#9605)
  sources/scim: fix duplicate groups and invalid schema (#9466)
  core: fix condition in task clean_expiring_models (#9603)
  translate: Updates for file web/xliff/en.xlf in fr (#9600)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant