Allow importing by clientId, not only clientUuid. Unblocks (#1267)

Signed-off-by: Mikhail Putilov <[email protected]>

Author: Mikhail Putilov

go.mod

@@ -3,6 +3,7 @@ module github.com/keycloak/terraform-provider-keycloak
 require (
 	dario.cat/mergo v1.0.2
 	github.com/golang-jwt/jwt/v5 v5.3.0
+	github.com/google/uuid v1.6.0
 	github.com/hashicorp/errwrap v1.1.0
 	github.com/hashicorp/go-cty v1.5.0
 	github.com/hashicorp/go-retryablehttp v0.7.8

keycloak/openid_client.go

@@ -161,6 +161,28 @@ func (keycloakClient *KeycloakClient) NewOpenidClient(ctx context.Context, clien
 	return nil
 }
 
+func (keycloakClient *KeycloakClient) SearchOpenidClientExact(ctx context.Context, realmId string, clientId string) (*OpenidClient, error) {
+	var clients []*OpenidClient
+
+	err := keycloakClient.get(ctx, fmt.Sprintf("/realms/%s/clients", realmId), &clients, map[string]string{
+		"first":    "0",
+		"max":      "101",
+		"clientId": clientId,
+		"search":   "true",
+	})
+	if err != nil {
+		return nil, err
+	}
+	for _, client := range clients {
+		client.RealmId = realmId
+		if client.ClientId == clientId {
+			return client, nil
+		}
+	}
+
+	return nil, fmt.Errorf("openid clientId %s does not exist in realm %s", clientId, realmId)
+}
+
 func (keycloakClient *KeycloakClient) GetOpenidClients(ctx context.Context, realmId string, withSecrets bool) ([]*OpenidClient, error) {
 	var clients []*OpenidClient
 	var clientSecret OpenidClientSecret

provider/resource_keycloak_openid_client.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/hashicorp/go-cty/cty"
 
-	"dario.cat/mergo"
+	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -661,18 +661,28 @@ func resourceKeycloakOpenidClientImport(ctx context.Context, d *schema.ResourceD
 
 	parts := strings.Split(d.Id(), "/")
 	if len(parts) != 2 {
-		return nil, fmt.Errorf("Invalid import. Supported import formats: {{realmId}}/{{openidClientId}}")
+		return nil, fmt.Errorf("invalid import. Supported import formats: {{realmId}}/{{openidClientId}} or {{realmId}}/{{clientUuid}}")
 	}
-
-	_, err := keycloakClient.GetOpenidClient(ctx, parts[0], parts[1])
+	if _, err := uuid.Parse(parts[1]); err == nil {
+		// {{realmId}}/{{clientUuid}}
+		_, err := keycloakClient.GetOpenidClient(ctx, parts[0], parts[1])
+		if err != nil {
+			return nil, err
+		}
+		d.SetId(parts[1])
+	} else {
+		// {{realmId}}/{{openidClientId}}
+		c, err := keycloakClient.SearchOpenidClientExact(ctx, parts[0], parts[1])
+		if err != nil {
+			return nil, err
+		}
+		d.SetId(c.Id)
+	}
+	err := d.Set("realm_id", parts[0])
 	if err != nil {
 		return nil, err
 	}
 
-	d.Set("realm_id", parts[0])
-	d.Set("import", false)
-	d.SetId(parts[1])
-
 	diagnostics := resourceKeycloakOpenidClientRead(ctx, d, meta)
 	if diagnostics.HasError() {
 		return nil, errors.New(diagnostics[0].Summary)