refactor: extract datasource and resource ConfigureClient

internal/datacenter/data_source.go

@@ -135,21 +135,13 @@ func (d *datacenterDataSource) Metadata(_ context.Context, _ datasource.Metadata
 // provider-defined DataSource type. It is separately executed for each
 // ReadDataSource RPC.
 func (d *datacenterDataSource) Configure(_ context.Context, req datasource.ConfigureRequest, resp *datasource.ConfigureResponse) {
-	if req.ProviderData == nil {
-		return
-	}
+	var newDiags diag.Diagnostics
 
-	// TODO: refactor to a reusable function
-	client, ok := req.ProviderData.(*hcloud.Client)
-	if !ok {
-		resp.Diagnostics.AddError(
-			"Unexpected Data Source Configure Type",
-			fmt.Sprintf("Expected *hcloud.Client, got: %T. Please report this issue to the provider developers.", req.ProviderData),
-		)
+	d.client, newDiags = hcclient.ConfigureClient(req.ProviderData)
+	resp.Diagnostics.Append(newDiags...)
+	if resp.Diagnostics.HasError() {
 		return
 	}
-
-	d.client = client
 }
 
 // Schema should return the schema for this data source.
@@ -254,21 +246,13 @@ func (d *datacenterListDataSource) Metadata(_ context.Context, _ datasource.Meta
 // provider-defined DataSource type. It is separately executed for each
 // ReadDataSource RPC.
 func (d *datacenterListDataSource) Configure(_ context.Context, req datasource.ConfigureRequest, resp *datasource.ConfigureResponse) {
-	if req.ProviderData == nil {
-		return
-	}
+	var newDiags diag.Diagnostics
 
-	// TODO: refactor to a reusable function
-	client, ok := req.ProviderData.(*hcloud.Client)
-	if !ok {
-		resp.Diagnostics.AddError(
-			"Unexpected Data Source Configure Type",
-			fmt.Sprintf("Expected *hcloud.Client, got: %T. Please report this issue to the provider developers.", req.ProviderData),
-		)
+	d.client, newDiags = hcclient.ConfigureClient(req.ProviderData)
+	resp.Diagnostics.Append(newDiags...)
+	if resp.Diagnostics.HasError() {
 		return
 	}
-
-	d.client = client
 }
 
 // Schema should return the schema for this data source.

internal/hcclient/provider.go

@@ -0,0 +1,28 @@
+package hcclient
+
+import (
+	"fmt"
+
+	"github.com/hashicorp/terraform-plugin-framework/diag"
+
+	"github.com/hetznercloud/hcloud-go/hcloud"
+)
+
+func ConfigureClient(providerData any) (*hcloud.Client, diag.Diagnostics) {
+	var diagnostics diag.Diagnostics
+
+	if providerData == nil {
+		return nil, diagnostics
+	}
+
+	client, ok := providerData.(*hcloud.Client)
+	if !ok {
+		diagnostics.AddError(
+			"Unexpected Configure Type",
+			fmt.Sprintf("Expected *hcloud.Client, got: %T. Please report this issue to the provider developers.", providerData),
+		)
+		return nil, diagnostics
+	}
+
+	return client, diagnostics
+}