From d649d8ec9235be5d02e782e77aefb224520feb3c Mon Sep 17 00:00:00 2001 From: Kyle Herock Date: Mon, 6 Jan 2025 03:40:39 -0500 Subject: [PATCH] prevent force replacing resources when `import` value in state is nil (#1054) Signed-off-by: Kyle Herock --- provider/resource_keycloak_openid_client.go | 4 ++++ provider/resource_keycloak_role.go | 4 ++++ provider/resource_keycloak_user.go | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/provider/resource_keycloak_openid_client.go b/provider/resource_keycloak_openid_client.go index 3e2bf6e5..af33d52e 100644 --- a/provider/resource_keycloak_openid_client.go +++ b/provider/resource_keycloak_openid_client.go @@ -571,6 +571,10 @@ func resourceKeycloakOpenidClientRead(ctx context.Context, data *schema.Resource return diag.FromErr(err) } + if _, ok := data.GetOk("import"); !ok { + data.Set("import", false) + } + return nil } diff --git a/provider/resource_keycloak_role.go b/provider/resource_keycloak_role.go index 6994f919..03464fdb 100644 --- a/provider/resource_keycloak_role.go +++ b/provider/resource_keycloak_role.go @@ -213,6 +213,10 @@ func resourceKeycloakRoleRead(ctx context.Context, data *schema.ResourceData, me data.Set("composite_roles", compositeRoleIds) } + if _, ok := data.GetOk("import"); !ok { + data.Set("import", false) + } + return nil } diff --git a/provider/resource_keycloak_user.go b/provider/resource_keycloak_user.go index b79c2685..0bf91fde 100644 --- a/provider/resource_keycloak_user.go +++ b/provider/resource_keycloak_user.go @@ -264,6 +264,10 @@ func resourceKeycloakUserRead(ctx context.Context, data *schema.ResourceData, me mapFromUserToData(data, user) + if _, ok := data.GetOk("import"); !ok { + data.Set("import", false) + } + return nil }