fix: avoid validation errors during plan for missing realm and openid…

… client resources (#841)
keycloak · Jun 8, 2023 · bac7360 · bac7360
1 parent b6060a0
commit bac7360
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/keycloak/openid_client.go b/keycloak/openid_client.go
@@ -241,9 +241,7 @@ func (keycloakClient *KeycloakClient) getOpenidClientScopes(ctx context.Context,
 	var scopes []*OpenidClientScope
 
 	err := keycloakClient.get(ctx, fmt.Sprintf("/realms/%s/clients/%s/%s-client-scopes", realmId, clientId, t), &scopes, nil)
-	if err != nil && ErrorIs404(err) {
-		return nil, fmt.Errorf("validation error: client with id %s does not exist", clientId)
-	} else if err != nil {
+	if err != nil {
 		return nil, err
 	}
 

diff --git a/provider/resource_keycloak_generic_role_mapper.go b/provider/resource_keycloak_generic_role_mapper.go
@@ -86,7 +86,7 @@ func resourceKeycloakGenericRoleMapperRead(ctx context.Context, data *schema.Res
 
 	role, err := keycloakClient.GetRole(ctx, realmId, roleId)
 	if err != nil {
-		return diag.FromErr(err)
+		return handleNotFoundError(ctx, err, data)
 	}
 
 	mappedRole, err := keycloakClient.GetRoleScopeMapping(ctx, realmId, clientId, clientScopeId, role)

diff --git a/provider/resource_keycloak_openid_client_default_scopes.go b/provider/resource_keycloak_openid_client_default_scopes.go
@@ -3,6 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/mrparkers/terraform-provider-keycloak/keycloak"
@@ -70,6 +71,9 @@ func resourceKeycloakOpenidClientDefaultScopesReconcile(ctx context.Context, dat
 
 	keycloakOpenidClientDefaultScopes, err := keycloakClient.GetOpenidClientDefaultScopes(ctx, realmId, clientId)
 	if err != nil {
+		if keycloak.ErrorIs404(err) {
+			return diag.FromErr(fmt.Errorf("validation error: client with id %s does not exist", clientId))
+		}
 		return diag.FromErr(err)
 	}
 

diff --git a/provider/resource_keycloak_openid_client_optional_scopes.go b/provider/resource_keycloak_openid_client_optional_scopes.go
@@ -3,6 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/mrparkers/terraform-provider-keycloak/keycloak"
@@ -70,6 +71,9 @@ func resourceKeycloakOpenidClientOptionalScopesReconcile(ctx context.Context, da
 
 	keycloakOpenidClientOptionalScopes, err := keycloakClient.GetOpenidClientOptionalScopes(ctx, realmId, clientId)
 	if err != nil {
+		if keycloak.ErrorIs404(err) {
+			return diag.FromErr(fmt.Errorf("validation error: client with id %s does not exist", clientId))
+		}
 		return diag.FromErr(err)
 	}