From e18f3cd7b12dff8e078d0ac303a6af6a548af1e2 Mon Sep 17 00:00:00 2001 From: Kyle Herock Date: Thu, 18 May 2023 12:37:21 -0400 Subject: [PATCH] restore original validation error message during reconcile --- provider/resource_keycloak_openid_client_default_scopes.go | 2 ++ provider/resource_keycloak_openid_client_optional_scopes.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/provider/resource_keycloak_openid_client_default_scopes.go b/provider/resource_keycloak_openid_client_default_scopes.go index d2e73d4ba..cf59628cb 100644 --- a/provider/resource_keycloak_openid_client_default_scopes.go +++ b/provider/resource_keycloak_openid_client_default_scopes.go @@ -70,6 +70,8 @@ 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 index 85dfa7a59..c5341feb5 100644 --- a/provider/resource_keycloak_openid_client_optional_scopes.go +++ b/provider/resource_keycloak_openid_client_optional_scopes.go @@ -70,6 +70,8 @@ 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) }