Skip to content
New issue

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

#

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

Already on GitHub? # to your account

fix(user,role,openid-client): No Default for Import property #1055

Closed
wants to merge 1 commit into from
Closed

fix(user,role,openid-client): No Default for Import property #1055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file added example/tfplan
View file
Open in desktop
Binary file not shown.
7 changes: 4 additions & 3 deletions provider/resource_keycloak_openid_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,6 @@ func resourceKeycloakOpenidClient() *schema.Resource {
"import": {
Type: schema.TypeBool,
Optional: true,
Default: false,
ForceNew: true,
},
},
Expand Down Expand Up @@ -526,7 +525,10 @@ func resourceKeycloakOpenidClientCreate(ctx context.Context, data *schema.Resour
return diag.FromErr(err)
}

if data.Get("import").(bool) {
importValue, importSpecified := data.GetOk("import")
imp := importSpecified && importValue.(bool)

if imp {
existingClient, err := keycloakClient.GetOpenidClientByClientId(ctx, client.RealmId, client.ClientId)
if err != nil {
return diag.FromErr(err)
Expand Down Expand Up @@ -626,7 +628,6 @@ func resourceKeycloakOpenidClientImport(ctx context.Context, d *schema.ResourceD
}

d.Set("realm_id", parts[0])
d.Set("import", false)
d.SetId(parts[1])

diagnostics := resourceKeycloakOpenidClientRead(ctx, d, meta)
Expand Down
7 changes: 4 additions & 3 deletions provider/resource_keycloak_role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ func resourceKeycloakRole() *schema.Resource {
"import": {
Type: schema.TypeBool,
Optional: true,
Default: false,
ForceNew: true,
},
},
Expand Down Expand Up @@ -104,7 +103,10 @@ func resourceKeycloakRoleCreate(ctx context.Context, data *schema.ResourceData,

role := mapFromDataToRole(data)

if data.Get("import").(bool) {
importValue, importSpecified := data.GetOk("import")
imp := importSpecified && importValue.(bool)

if imp {
realmId := data.Get("realm_id").(string)
name := data.Get("name").(string)
clientId := data.Get("client_id").(string)
Expand Down Expand Up @@ -313,7 +315,6 @@ func resourceKeycloakRoleImport(ctx context.Context, d *schema.ResourceData, met
}

d.Set("realm_id", parts[0])
d.Set("import", false)
d.SetId(parts[1])

diagnostics := resourceKeycloakRoleRead(ctx, d, meta)
Expand Down
7 changes: 4 additions & 3 deletions provider/resource_keycloak_user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ func resourceKeycloakUser() *schema.Resource {
"import": {
Type: schema.TypeBool,
Optional: true,
Default: false,
ForceNew: true,
},
},
Expand Down Expand Up @@ -211,7 +210,10 @@ func resourceKeycloakUserCreate(ctx context.Context, data *schema.ResourceData,

user := mapFromDataToUser(data)

if !data.Get("import").(bool) {
importValue, importSpecified := data.GetOk("import")
imp := importSpecified && importValue.(bool)

if !imp {
err := keycloakClient.NewUser(ctx, user)
if err != nil {
return diag.FromErr(err)
Expand Down Expand Up @@ -309,7 +311,6 @@ func resourceKeycloakUserImport(ctx context.Context, d *schema.ResourceData, met
}

d.Set("realm_id", parts[0])
d.Set("import", false)
d.SetId(parts[1])

diagnostics := resourceKeycloakUserRead(ctx, d, meta)
Expand Down
Loading