restore original validation error message during reconcile

mrparkers · May 18, 2023 · e18f3cd · e18f3cd
1 parent 3ac4c81
commit e18f3cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git 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
@@ -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)
  }