Skip to content

keycloak_openid_client remove merge with existing config on import #1008

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.

Sign up for GitHub

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

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

keycloak_openid_client remove merge with existing config on import #1008

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
62591f8
Remove merge with existing keycloak cilent
chrismilson Oct 22, 2024
b4b36b9
Add Id to client object
chrismilson Feb 26, 2025
4ee9e8f
Handle error for missing client correctly
chrismilson Mar 1, 2025
9b135ff
Merge branch 'main' into master
chrismilson Mar 4, 2025
5a397d8
Merge branch 'main' into master
chrismilson Mar 13, 2025
a00043e
Merge branch 'main' into master
chrismilson Mar 13, 2025
0f33aae
Merge branch 'main' into master
chrismilson Mar 17, 2025
75233f2
Merge branch 'main' into master
chrismilson Mar 26, 2025
d445525
Merge branch 'main' into master
chrismilson Mar 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions provider/resource_keycloak_openid_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"reflect"
"strings"

"dario.cat/mergo"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
Expand Down Expand Up @@ -544,10 +543,7 @@ func resourceKeycloakOpenidClientCreate(ctx context.Context, data *schema.Resour
if err != nil {
return diag.FromErr(err)
}

if err = mergo.Merge(client, existingClient); err != nil {
return diag.FromErr(err)
}
client.Id = existingClient.Id

err = keycloakClient.UpdateOpenidClient(ctx, client)
if err != nil {
Expand Down
Loading