-
Notifications
You must be signed in to change notification settings - Fork 2.7k
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
Improve the way OIDC tenants are grouped and their properties are generated #44374
Improve the way OIDC tenants are grouped and their properties are generated #44374
Conversation
extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcConfig.java
Show resolved
Hide resolved
extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcConfig.java
Show resolved
Hide resolved
🎊 PR Preview 81d5343 has been successfully built and deployed to https://quarkus-pr-main-44374-preview.surge.sh/version/main/guides/
|
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
When you use |
Great, thanks @radcortez. |
I'd like to tune some section descriptions. Update: just pushed some minor updates... |
f555e22
to
ac5016d
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please don't merge, the doc is missing for several of the entries. I'm having a look.
I think the regression was caused by #44140 . The doc probably wasn't checked after the change. |
I am sorry. I saw config properties were there and I didn't check if that was all of them. If I can help to fix docs generation I am ready. |
I think they are all there but the Javadoc is missing because not generated and the new config generation is a bit too lenient regarding that. I'm working on fixing that. The problem is by removing the I will do an independent PR with a fix and some more tooling. And also will fix the other cases that fell through the cracks due to us not having a big error when it happens. |
Thank you.
FYI, maybe I misunderstood that, but I reviewed other extensions |
OK, let's get #44388 in first. Then I think your Basically it should have failed earlier and this section case was the only one for which we had a hard error. What's nice is that this work allowed us to detect the problem. |
Thanks @gsmet |
ac5016d
to
48d61f7
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@sberyozkin I rebased and added the @ConfigDocSection
to credentials
. I was able to generate the output. I let you and @michalvavrik check that it's all fine.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks correct. I mentioned that quarkus.keycloak.devservices.create-client
needs to be fixed and that Sergey should probably follow with similar changes in OIDC Client, but that's not related.
48d61f7
to
3f10b51
Compare
Thanks for your help, @gsmet. I did tweak a bit the JavaDocs to try to describe the @michalvavrik, thanks for verifying, what did you mean about |
Status for workflow
|
Status for workflow
|
commit d1394b6 Merge: 52ebb92 c41dfd6 Author: RobinDM <de.mol.robin@gmail.com> Date: Tue Nov 12 08:56:25 2024 +0100 Merge branch 'quarkusio:main' into datasource-devservices-showLogs-squashed commit c41dfd6 Merge: 52286bf 0611099 Author: Georgios Andrianakis <geoand@gmail.com> Date: Tue Nov 12 09:32:18 2024 +0200 Merge pull request quarkusio#44431 from phillip-kruger/filename-openapi Add option to name stored openapi files commit 52286bf Merge: 81679eb 5a2d46c Author: Georgios Andrianakis <geoand@gmail.com> Date: Tue Nov 12 08:08:49 2024 +0200 Merge pull request quarkusio#44299 from Sgitario/41689_good REST Server/Client allows configuring the removal of trailing slashs commit 52ebb92 Merge: 0348db6 81679eb Author: RobinDM <de.mol.robin@gmail.com> Date: Tue Nov 12 06:59:08 2024 +0100 Merge branch 'main' into datasource-devservices-showLogs-squashed commit 0348db6 Author: RobinDM <de.mol.robin@gmail.com> Date: Tue Nov 12 06:58:50 2024 +0100 Update extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DevServicesBuildTimeConfig.java Co-authored-by: George Gastaldi <gegastaldi@gmail.com> commit 81679eb Merge: 10ed7b1 0878a19 Author: George Gastaldi <gegastaldi@gmail.com> Date: Tue Nov 12 00:10:40 2024 -0300 Merge pull request quarkusio#44415 from radcortez/quarkus-44400 Propagate Runtime properties in JBang Dev mode commit 0611099 Author: Phillip Kruger <phillip.kruger@gmail.com> Date: Tue Nov 12 13:54:41 2024 +1100 Add option to name stored openapi files Signed-off-by: Phillip Kruger <phillip.kruger@gmail.com> commit 10ed7b1 Merge: 6329fda f23faa2 Author: Georgios Andrianakis <geoand@gmail.com> Date: Mon Nov 11 19:53:21 2024 +0200 Merge pull request quarkusio#44421 from mariofusco/q44417 Fix deserialization of null maps in reflection-free Jackson deserializers commit 6329fda Merge: e7fb440 8ce3dc5 Author: Andy Damevin <ia3andy@gmail.com> Date: Mon Nov 11 18:36:35 2024 +0100 Merge pull request quarkusio#44416 from mkouba/issue-44412 QuteErrorPageSetup: support templates that are not backed by a file commit e7fb440 Merge: 7a6b0ee 95fea0b Author: Bruno Baptista <brunobat@gmail.com> Date: Mon Nov 11 16:48:59 2024 +0000 Merge pull request quarkusio#43983 from alesj/simplespanprocessor_i29448 Add SimpleSpanProcessor support commit f23faa2 Author: mariofusco <mario.fusco@gmail.com> Date: Mon Nov 11 17:47:29 2024 +0100 Fix deserialization of null maps in reflection-free Jackson deserializers commit 8ce3dc5 Author: Martin Kouba <mkouba@redhat.com> Date: Mon Nov 11 14:56:20 2024 +0100 QuteErrorPageSetup: support templates that are not backed by a file - fixes quarkusio#44412 commit 0878a19 Author: Roberto Cortez <radcortez@yahoo.com> Date: Mon Nov 11 13:37:42 2024 +0000 Propagate Runtime properties in JBang Dev mode commit 95fea0b Author: Ales Justin <ales.justin@gmail.com> Date: Thu Oct 17 12:50:53 2024 +0200 Add SimpleSpanProcessor support commit 7a6b0ee Merge: ddee2e0 686cc7d Author: Clement Escoffier <clement@apache.org> Date: Mon Nov 11 09:03:11 2024 +0100 Merge pull request quarkusio#44351 from cescoffier/workshop-structure-adr Propose ADR for restructuring Quarkus workshops organization commit 686cc7d Author: Clement Escoffier <clement.escoffier@gmail.com> Date: Wed Nov 6 16:28:07 2024 +0100 Propose ADR for restructuring Quarkus workshops organization - Suggests moving from a single repository to individual repositories per workshop - Aims to simplify management, improve discoverability, and enable GitHub Pages for documentation - Addresses limitations of current structure in hosting and maintaining multiple workshops commit ddee2e0 Merge: b3d5937 2ffe012 Author: Martin Kouba <mkouba@redhat.com> Date: Mon Nov 11 08:48:15 2024 +0100 Merge pull request quarkusio#44224 from mkouba/issue-44048 Quartz: introduce Nonconcurrent commit b3d5937 Merge: b5a1eac bd03e6c Author: Phillip Krüger <phillip.kruger@gmail.com> Date: Mon Nov 11 09:28:20 2024 +1100 Merge pull request quarkusio#44407 from michalvavrik/feature/add-roles-allowed-vals-to-openapi Include allowed roles in security scheme scopes when OpenApi version is 3.1.0 or greater commit bd03e6c Author: Michal Vavřík <mvavrik@redhat.com> Date: Sun Nov 10 12:57:36 2024 +0100 Include allowed roles in security scheme scopes in OpenApi 3.1+ commit b5a1eac Merge: 0782ecc 998c3ee Author: Sergey Beryozkin <sberyozkin@gmail.com> Date: Sun Nov 10 11:23:33 2024 +0000 Merge pull request quarkusio#44406 from michalvavrik/feature/handle-oidc-extension-deprecations Handle InjectionPointsTransformer deprecations in OIDC extension commit 998c3ee Author: Michal Vavřík <mvavrik@redhat.com> Date: Sun Nov 10 10:39:10 2024 +0100 Handle InjectionPointsTransformer deprecations in OIDC extension commit 0782ecc Merge: 1e2140d e5a21e4 Author: Georgios Andrianakis <geoand@gmail.com> Date: Sat Nov 9 19:28:37 2024 +0200 Merge pull request quarkusio#44273 from Vinche59/kubernetest-nodeSelector-without-dekorate-bump Add nodeSelector capability to kubernetes extension commit e5a21e4 Author: Vincent Sourin <sourin-v@bridgestone-bae.com> Date: Sun Oct 27 13:31:27 2024 +0100 Add nodeSelect capability to kubernetes extension. Fix quarkusio#44122 Signed-off-by: Vinche <sourin-v@bridgestone-bae.com> commit 1e2140d Merge: 00f271c 48d8fb7 Author: Guillaume Smet <guillaume.smet@gmail.com> Date: Sat Nov 9 16:53:01 2024 +0100 Merge pull request quarkusio#44394 from quarkusio/dependabot/maven/io.quarkus.bot-build-reporter-maven-extension-3.9.6 Bump io.quarkus.bot:build-reporter-maven-extension from 3.9.5 to 3.9.6 commit 00f271c Merge: ee2100b 9361944 Author: Guillaume Smet <guillaume.smet@gmail.com> Date: Sat Nov 9 16:52:27 2024 +0100 Merge pull request quarkusio#44396 from quarkusio/dependabot/maven/org.apache.groovy-groovy-4.0.24 Bump org.apache.groovy:groovy from 4.0.23 to 4.0.24 commit ee2100b Merge: 3321050 f983e20 Author: Sergey Beryozkin <sberyozkin@gmail.com> Date: Sat Nov 9 12:17:00 2024 +0000 Merge pull request quarkusio#44389 from michalvavrik/feature/kc-dev-svc-for-kc-admin-client Start Keycloak Dev Services for standalone Keycloak Admin REST/RESTEasy clients commit 3321050 Merge: 76cba8c 3f10b51 Author: Sergey Beryozkin <sberyozkin@gmail.com> Date: Sat Nov 9 11:29:52 2024 +0000 Merge pull request quarkusio#44374 from sberyozkin/optimize_oidc_tenants_grouping Improve the way OIDC tenants are grouped and their properties are generated commit 76cba8c Merge: 4221467 af78f41 Author: Sergey Beryozkin <sberyozkin@gmail.com> Date: Sat Nov 9 11:28:55 2024 +0000 Merge pull request quarkusio#44397 from quarkusio/dependabot/maven/com.nimbusds-nimbus-jose-jwt-9.46 Bump com.nimbusds:nimbus-jose-jwt from 9.45 to 9.46 commit 4221467 Merge: 81d5343 bfb59fc Author: George Gastaldi <gegastaldi@gmail.com> Date: Fri Nov 8 21:27:01 2024 -0300 Merge pull request quarkusio#44398 from sberyozkin/keycloak_devservice_prop_doc_typo Fix Keycloak DevService property doc typo commit bfb59fc Author: Sergey Beryozkin <sberyozkin@gmail.com> Date: Fri Nov 8 23:18:02 2024 +0000 Fix Keycloak DevService property doc typo commit af78f41 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Nov 8 22:28:30 2024 +0000 Bump com.nimbusds:nimbus-jose-jwt from 9.45 to 9.46 Bumps [com.nimbusds:nimbus-jose-jwt](https://bitbucket.org/connect2id/nimbus-jose-jwt) from 9.45 to 9.46. - [Changelog](https://bitbucket.org/connect2id/nimbus-jose-jwt/src/master/CHANGELOG.txt) - [Commits](https://bitbucket.org/connect2id/nimbus-jose-jwt/branches/compare/9.46..9.45) --- updated-dependencies: - dependency-name: com.nimbusds:nimbus-jose-jwt dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> commit 9361944 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Nov 8 22:27:26 2024 +0000 Bump org.apache.groovy:groovy from 4.0.23 to 4.0.24 Bumps [org.apache.groovy:groovy](https://github.com/apache/groovy) from 4.0.23 to 4.0.24. - [Commits](https://github.com/apache/groovy/commits) --- updated-dependencies: - dependency-name: org.apache.groovy:groovy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> commit 48d8fb7 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Nov 8 22:24:14 2024 +0000 Bump io.quarkus.bot:build-reporter-maven-extension from 3.9.5 to 3.9.6 Bumps [io.quarkus.bot:build-reporter-maven-extension](https://github.com/quarkusio/build-reporter) from 3.9.5 to 3.9.6. - [Commits](quarkusio/build-reporter@3.9.5...3.9.6) --- updated-dependencies: - dependency-name: io.quarkus.bot:build-reporter-maven-extension dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> commit 3f10b51 Author: Sergey Beryozkin <sberyozkin@gmail.com> Date: Thu Nov 7 19:12:09 2024 +0000 Improve the way OIDC tenants are grouped and their properties are generated commit 81d5343 Merge: 901675f a4d7e2f Author: Guillaume Smet <guillaume.smet@gmail.com> Date: Fri Nov 8 22:26:14 2024 +0100 Merge pull request quarkusio#44390 from gsmet/better-deployment-detection Fix runtime/deployment detection and propagate it commit 901675f Merge: d1c3ae8 3d110d1 Author: Clement Escoffier <clement@apache.org> Date: Fri Nov 8 19:34:29 2024 +0100 Merge pull request quarkusio#43232 from troosan/quarkusio#23127 Add support for Socket Logging Handler with basic ECS format logging commit d1c3ae8 Merge: 7603085 1813c5a Author: Sergey Beryozkin <sberyozkin@gmail.com> Date: Fri Nov 8 17:33:42 2024 +0000 Merge pull request quarkusio#44388 from gsmet/fix-config-generation Fix some invalid configuration cases for doc generation and fail the build if some description are missing commit 7603085 Merge: 30d733f 77747da Author: Georgios Andrianakis <geoand@gmail.com> Date: Fri Nov 8 17:37:21 2024 +0200 Merge pull request quarkusio#44373 from geoand/quarkusio#44231 Ensure that custom Jackson modules work in dev-mode commit a4d7e2f Author: Guillaume Smet <guillaume.smet@gmail.com> Date: Fri Nov 8 15:46:23 2024 +0100 Fix runtime/deployment detection and propagate it That way, we can assert if the module is a deployment module later in the process. Related to quarkusio#43513 commit f983e20 Author: Michal Vavřík <mvavrik@redhat.com> Date: Fri Nov 8 16:06:21 2024 +0100 Start Keycloak Dev Svc for standalone KC Admin client commit 1813c5a Author: Guillaume Smet <guillaume.smet@gmail.com> Date: Fri Nov 8 14:47:20 2024 +0100 Generate a report for missing Javadoc and fail the build if not empty commit bab4a5a Author: Guillaume Smet <guillaume.smet@gmail.com> Date: Fri Nov 8 14:46:20 2024 +0100 Fix some invalid configuration cases TransactionManagerConfiguration was just plain weird so fixed it. For the others, we need to mark the interfaces as being config or we won't generate the Javadoc for them. commit 30d733f Merge: 5be2257 959a2e1 Author: Martin Kouba <mkouba@redhat.com> Date: Fri Nov 8 11:28:14 2024 +0100 Merge pull request quarkusio#44385 from mkouba/issue-44366 Qute: fix generation of qute-i18n-examples commit 77747da Author: Georgios Andrianakis <geoand@gmail.com> Date: Thu Nov 7 20:22:31 2024 +0200 Ensure that custom Jackson modules work in dev-mode Fixes: quarkusio#44231 commit 959a2e1 Author: Martin Kouba <mkouba@redhat.com> Date: Fri Nov 8 08:43:36 2024 +0100 Qute: fix generation of qute-i18n-examples - handle localized enums correctly - fixes quarkusio#44366 commit 611f5e0 Author: Robin De Mol <de.mol.robin@gmail.com> Date: Thu Nov 7 22:04:13 2024 +0100 datasource devservices: showLogs Brings support for JBossLoggingConsumer to container-based datasource dev services, and adds a little section to the documentation about the new "showLogs" option. Also contains a minor correction to the AppCDS documentation. commit 5be2257 Merge: 9761a6e b0339bd Author: Georgios Andrianakis <geoand@gmail.com> Date: Fri Nov 8 08:25:50 2024 +0200 Merge pull request quarkusio#44377 from quarkusio/dependabot/maven/flyway.version-10.21.0 Bump flyway.version from 10.20.1 to 10.21.0 commit 9761a6e Merge: 5810fca dd2201e Author: Georgios Andrianakis <geoand@gmail.com> Date: Fri Nov 8 08:16:56 2024 +0200 Merge pull request quarkusio#44376 from dmlloyd/log-docs Clarify logging rotation docs a little bit commit 5a2d46c Author: Roberto Cortez <radcortez@yahoo.com> Date: Wed Nov 6 12:02:09 2024 +0000 Avoid possible concurrency issues with RestClientsConfig.RestClientKeysProvider.KEYS in build time commit 606143b Author: Jose <josecarvajalhilario@gmail.com> Date: Wed Nov 6 07:38:16 2024 +0100 REST Server/Client allows configuring the removal of trailing slashs Before these changes, the REST server and client extensions were removing the trailing slashes that were set by users in the `@Path` annotations. For example, when creating a resource like: ```java @path("/a/") @produces(MediaType.TEXT_PLAIN) public class HelloResource { @get public String echo() { // ... } } ``` The effective path was `/a` instead of `/a/`. Note that it does not matter whether we place the `@Path` annotation at method level because the behaviour will be the same. At the client side, when having the following client: ``` @RegisterRestClient(configKey = "test") @path("/a/") <1> public interface HelloClient { @get @produces(MediaType.TEXT_PLAIN) @path("/b/") <2> String echo(); } ``` In this case, the trailing slash will be removed from <1> but not from <2>. After these changes, we are adding the following properties: - `quarkus.rest.removes-trailing-slash` To configure the server extension to not remove any trailing slash from the `@Path` annotations. - `quarkus.rest-client.removes-trailing-slash` To configure the client extension to not remove any traling slash from the `@Path` annotations used at interface level. The annotations set at method level will behave the same. Note that this does not introduce any change in behaviour, so everything should keep working as before unless users use the new properties. commit ae36baf Author: Jose <josecarvajalhilario@gmail.com> Date: Wed Nov 6 07:36:36 2024 +0100 REST Client build time fix for DevServices commit b0339bd Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu Nov 7 22:55:05 2024 +0000 Bump flyway.version from 10.20.1 to 10.21.0 Bumps `flyway.version` from 10.20.1 to 10.21.0. Updates `org.flywaydb:flyway-core` from 10.20.1 to 10.21.0 - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](flyway/flyway@flyway-10.20.1...flyway-10.21.0) Updates `org.flywaydb:flyway-sqlserver` from 10.20.1 to 10.21.0 Updates `org.flywaydb:flyway-mysql` from 10.20.1 to 10.21.0 Updates `org.flywaydb:flyway-database-oracle` from 10.20.1 to 10.21.0 Updates `org.flywaydb:flyway-database-postgresql` from 10.20.1 to 10.21.0 Updates `org.flywaydb:flyway-database-db2` from 10.20.1 to 10.21.0 Updates `org.flywaydb:flyway-database-derby` from 10.20.1 to 10.21.0 Updates `org.flywaydb:flyway-database-mongodb` from 10.20.1 to 10.21.0 --- updated-dependencies: - dependency-name: org.flywaydb:flyway-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.flywaydb:flyway-sqlserver dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.flywaydb:flyway-mysql dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.flywaydb:flyway-database-oracle dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.flywaydb:flyway-database-postgresql dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.flywaydb:flyway-database-db2 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.flywaydb:flyway-database-derby dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.flywaydb:flyway-database-mongodb dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> commit dd2201e Author: David M. Lloyd <david.lloyd@redhat.com> Date: Thu Nov 7 15:32:47 2024 -0600 Clarify logging rotation docs a little bit Fixes quarkusio#44346 commit 2ffe012 Author: Martin Kouba <mkouba@redhat.com> Date: Thu Oct 31 13:56:39 2024 +0100 Quartz: introduce Nonconcurrent - the behavior is identical to a Job class annotated with DisallowConcurrentExecution - fixes quarkusio#44048 commit 3d110d1 Author: Antoine de Troostembergh <antoine.de.troostembergh@gmail.com> Date: Sun Nov 3 20:54:47 2024 +0100 add socket log appender and basic ECS json formatting
At the moment, OIDC configuration properties list about 310 properties if we count them one by one, first about 160 properties for the default tenant, and then approximately 150 properties are listed for named tenants.
This PR groups it together (thanks @radcortez for the hint), with about 160 properties grouped together.
Additionally,
@ConfigDocSection
is introduced with a few exceptions.Now it will look more organized, see the fragment of it:
This is only an initial, tactical PR to address a pretty bad situation with a massive number of properties generated.
Expanded config doc reference with the detailed explanations, recommendations, as well as a question tree will be looked at later.
Unfortunately it might be a breaking change for some users who are working directly with the
OidcConfig
group, but the pros of this update are too important for the OIDC simplification story for this update be avoided...My only concern is that
OidcConfig.getDefaultTenant(OidcConfig config)
static helper returnsnull
if no default tenant config is found, but I've tested it with emptyapplication.properties
and when only non-default named tenants are present and it works, so hopefully it can never be null... (CC @radcortez )