Skip to content

Conversation

@lucymcphail
Copy link
Contributor

This patch leaves the auth argument to smtp_server as it is, but adds a new token_auth block to let users configure an auth token through Terraform.

Implements #1162

@lucymcphail
Copy link
Contributor Author

I've tested this locally and everything seems to work, except the ConflictsWith on auth and token_auth: Terraform seems happy to allow both of them to exist together, so I suspect something's wrong with the attribute paths, but I'm not sure what.

@lucymcphail
Copy link
Contributor Author

Looks like the ConflictsWith was actually working fine all along, I think something must have been doing something wrong with my testing. Should be ready to review now.

@thomasdarimont
Copy link
Contributor

Thanks for your PR.

I updated your branch, accidentially pressed merge main instead of rebasing it on main. Feel free to rebase the branch on your side on latest main, then we can see if we can. integrate it this week.

@thomasdarimont
Copy link
Contributor

Just saw the PR #1266, which overlaps a bit with this PR. How about integrating #1266 first and adding this PR after?

@thomasdarimont
Copy link
Contributor

This patch leaves the `auth` argument to `smtp_server` as it is, but
adds a new `token_auth` block to let users configure an auth token
through Terraform.

Implements keycloak#1162

Signed-off-by: Lucy McPhail <[email protected]>
Signed-off-by: Lucy McPhail <[email protected]>
@lucymcphail
Copy link
Contributor Author

Rebased onto main, and I've added those test cases. Let me know if there's anything else we need :)

@thomasdarimont
Copy link
Contributor

Thanks @lucymcphail! I'll take it from here and try to get this merged this week.

Copy link
Contributor

@thomasdarimont thomasdarimont left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for adding the tests. I just gave this a spin. Looks good to me :)

I'll retrigger the build and merge if it passes.

This also fixes #1194.

@thomasdarimont thomasdarimont merged commit e87dacd into keycloak:main Sep 25, 2025
20 of 21 checks passed
@lucymcphail lucymcphail deleted the add-smtp-oauth branch September 26, 2025 08:23
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.

3 participants