fix: Update GDP resources to handle UnifiedClient type (#55)

roveicy93 · web-flow · commit 161e0cfbd4c9 · 2026-03-31T09:44:31.000-04:00
Signed-off-by: Reza Roveicy &lt;roveicy@ibm.com&gt;
Signed-off-by: Reza Rasolroveicy &lt;roveicy@ibm.com&gt;
diff --git a/internal/provider/authentication_data_source.go b/internal/provider/authentication_data_source.go
@@ -88,17 +88,17 @@ func (d *AuthenticationDataSource) Configure(ctx context.Context, req datasource
 		return
 	}
 
-	client, ok := req.ProviderData.(*gdp.Client)
+	unifiedClient, ok := req.ProviderData.(*UnifiedClient)
 	if !ok {
 		resp.Diagnostics.AddError(
 			"Unexpected Data Source Configure Type",
-			fmt.Sprintf("Expected *gdp.Client, got: %T.", req.ProviderData),
+			fmt.Sprintf("Expected *UnifiedClient, got: %T.", req.ProviderData),
 		)
 
 		return
 	}
 
-	d.client = client
+	d.client = unifiedClient.GDPClient
 }
 
 type AuthenticationResponse struct {
diff --git a/internal/provider/aws_secrets_manager_resource.go b/internal/provider/aws_secrets_manager_resource.go
@@ -101,13 +101,13 @@ func (r *AWSSecretsManagerResource) Configure(ctx context.Context, req resource.
 		return
 	}
 
-	client, ok := req.ProviderData.(*gdp.Client)
+	unifiedClient, ok := req.ProviderData.(*UnifiedClient)
 	if !ok {
-		resp.Diagnostics.AddError("Unexpected Resource Configure Type", fmt.Sprintf("Expected *gdp.Client, got: %T", req.ProviderData))
+		resp.Diagnostics.AddError("Unexpected Resource Configure Type", fmt.Sprintf("Expected *UnifiedClient, got: %T", req.ProviderData))
 		return
 	}
 
-	r.client = client
+	r.client = unifiedClient.GDPClient
 }
 
 // Create creates the resource and sets the initial Terraform state
diff --git a/internal/provider/configure_va_datasource_resource.go b/internal/provider/configure_va_datasource_resource.go
@@ -109,16 +109,16 @@ func (r *configureVADatasourceResource) Configure(ctx context.Context, req resou
 		return
 	}
 
-	client, ok := req.ProviderData.(*gdp.Client)
+	unifiedClient, ok := req.ProviderData.(*UnifiedClient)
 	if !ok {
 		resp.Diagnostics.AddError(
 			"Unexpected Resource Configure Type",
-			fmt.Sprintf("Expected *gdp.Client, got: %T. Please report this issue to the provider developers.", req.ProviderData),
+			fmt.Sprintf("Expected *UnifiedClient, got: %T. Please report this issue to the provider developers.", req.ProviderData),
 		)
 		return
 	}
 
-	r.client = client
+	r.client = unifiedClient.GDPClient
 }
 
 func (r *configureVADatasourceResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
diff --git a/internal/provider/configure_va_notifications_resource.go b/internal/provider/configure_va_notifications_resource.go
@@ -112,16 +112,16 @@ func (r *configureVANotificationsResource) Configure(ctx context.Context, req re
 		return
 	}
 
-	client, ok := req.ProviderData.(*gdp.Client)
+	unifiedClient, ok := req.ProviderData.(*UnifiedClient)
 	if !ok {
 		resp.Diagnostics.AddError(
 			"Unexpected Resource Configure Type",
-			fmt.Sprintf("Expected *gdp.Client, got: %T. Please report this issue to the provider developers.", req.ProviderData),
+			fmt.Sprintf("Expected *UnifiedClient, got: %T. Please report this issue to the provider developers.", req.ProviderData),
 		)
 		return
 	}
 
-	r.client = client
+	r.client = unifiedClient.GDPClient
 }
 
 func (r *configureVANotificationsResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
diff --git a/internal/provider/import_profiles_resource.go b/internal/provider/import_profiles_resource.go
@@ -77,13 +77,13 @@ func (r *ImportProfilesResource) Configure(ctx context.Context, req resource.Con
 		return
 	}
 
-	client, ok := req.ProviderData.(*gdp.Client)
+	unifiedClient, ok := req.ProviderData.(*UnifiedClient)
 	if !ok {
-		resp.Diagnostics.AddError("Unexpected Resource Configure Type", fmt.Sprintf("Expected *gdp.Client, got: %T", req.ProviderData))
+		resp.Diagnostics.AddError("Unexpected Resource Configure Type", fmt.Sprintf("Expected *UnifiedClient, got: %T", req.ProviderData))
 		return
 	}
 
-	r.client = client
+	r.client = unifiedClient.GDPClient
 }
 
 // Create creates the resource and sets the initial Terraform state
diff --git a/internal/provider/install_connector_resource.go b/internal/provider/install_connector_resource.go
@@ -72,16 +72,16 @@ func (r *InstallConnectorResource) Configure(ctx context.Context, req resource.C
 		return
 	}
 
-	client, ok := req.ProviderData.(*gdp.Client)
+	unifiedClient, ok := req.ProviderData.(*UnifiedClient)
 	if !ok {
 		resp.Diagnostics.AddError(
 			"Unexpected Resource Configure Type",
-			fmt.Sprintf("Expected *gdp.Client, got: %T", req.ProviderData),
+			fmt.Sprintf("Expected *UnifiedClient, got: %T", req.ProviderData),
 		)
 		return
 	}
 
-	r.client = client
+	r.client = unifiedClient.GDPClient
 }
 
 // Create creates the resource and sets the initial Terraform state
diff --git a/internal/provider/register_va_datasource_resource.go b/internal/provider/register_va_datasource_resource.go
@@ -7,10 +7,11 @@ import (
 	"context"
 	"crypto/sha256"
 	"fmt"
-	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"strconv"
 	"time"
 
+	"github.com/hashicorp/terraform-plugin-log/tflog"
+
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
@@ -92,16 +93,16 @@ func (r *registerVADatasourceResource) Configure(ctx context.Context, req resour
 		return
 	}
 
-	client, ok := req.ProviderData.(*gdp.Client)
+	unifiedClient, ok := req.ProviderData.(*UnifiedClient)
 	if !ok {
 		resp.Diagnostics.AddError(
 			"Unexpected Resource Configure Type",
-			fmt.Sprintf("Expected *gdp.Client, got: %T. Please report this issue to the provider developers.", req.ProviderData),
+			fmt.Sprintf("Expected *UnifiedClient, got: %T. Please report this issue to the provider developers.", req.ProviderData),
 		)
 		return
 	}
 
-	r.client = client
+	r.client = unifiedClient.GDPClient
 }
 
 func (r *registerVADatasourceResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {

Original file line number	Diff line number	Diff line change
`@@ -88,17 +88,17 @@ func (d *AuthenticationDataSource) Configure(ctx context.Context, req datasource`
`88`	`88`	`return`
`89`	`89`	`}`
`90`	`90`
`91`		`- client, ok := req.ProviderData.(*gdp.Client)`
	`91`	`+ unifiedClient, ok := req.ProviderData.(*UnifiedClient)`
`92`	`92`	`if !ok {`
`93`	`93`	`resp.Diagnostics.AddError(`
`94`	`94`	`"Unexpected Data Source Configure Type",`
`95`		`- fmt.Sprintf("Expected *gdp.Client, got: %T.", req.ProviderData),`
	`95`	`+ fmt.Sprintf("Expected *UnifiedClient, got: %T.", req.ProviderData),`
`96`	`96`	`)`
`97`	`97`
`98`	`98`	`return`
`99`	`99`	`}`
`100`	`100`
`101`		`- d.client = client`
	`101`	`+ d.client = unifiedClient.GDPClient`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`type AuthenticationResponse struct {`
Original file line number	Diff line number	Diff line change
`@@ -101,13 +101,13 @@ func (r *AWSSecretsManagerResource) Configure(ctx context.Context, req resource.`
`101`	`101`	`return`
`102`	`102`	`}`
`103`	`103`
`104`		`- client, ok := req.ProviderData.(*gdp.Client)`
	`104`	`+ unifiedClient, ok := req.ProviderData.(*UnifiedClient)`
`105`	`105`	`if !ok {`
`106`		`- resp.Diagnostics.AddError("Unexpected Resource Configure Type", fmt.Sprintf("Expected *gdp.Client, got: %T", req.ProviderData))`
	`106`	`+ resp.Diagnostics.AddError("Unexpected Resource Configure Type", fmt.Sprintf("Expected *UnifiedClient, got: %T", req.ProviderData))`
`107`	`107`	`return`
`108`	`108`	`}`
`109`	`109`
`110`		`- r.client = client`
	`110`	`+ r.client = unifiedClient.GDPClient`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`// Create creates the resource and sets the initial Terraform state`
Original file line number	Diff line number	Diff line change
`@@ -109,16 +109,16 @@ func (r *configureVADatasourceResource) Configure(ctx context.Context, req resou`
`109`	`109`	`return`
`110`	`110`	`}`
`111`	`111`
`112`		`- client, ok := req.ProviderData.(*gdp.Client)`
	`112`	`+ unifiedClient, ok := req.ProviderData.(*UnifiedClient)`
`113`	`113`	`if !ok {`
`114`	`114`	`resp.Diagnostics.AddError(`
`115`	`115`	`"Unexpected Resource Configure Type",`
`116`		`- fmt.Sprintf("Expected *gdp.Client, got: %T. Please report this issue to the provider developers.", req.ProviderData),`
	`116`	`+ fmt.Sprintf("Expected *UnifiedClient, got: %T. Please report this issue to the provider developers.", req.ProviderData),`
`117`	`117`	`)`
`118`	`118`	`return`
`119`	`119`	`}`
`120`	`120`
`121`		`- r.client = client`
	`121`	`+ r.client = unifiedClient.GDPClient`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`func (r configureVADatasourceResource) Create(ctx context.Context, req resource.CreateRequest, resp resource.CreateResponse) {`
Original file line number	Diff line number	Diff line change
`@@ -112,16 +112,16 @@ func (r *configureVANotificationsResource) Configure(ctx context.Context, req re`
`112`	`112`	`return`
`113`	`113`	`}`
`114`	`114`
`115`		`- client, ok := req.ProviderData.(*gdp.Client)`
	`115`	`+ unifiedClient, ok := req.ProviderData.(*UnifiedClient)`
`116`	`116`	`if !ok {`
`117`	`117`	`resp.Diagnostics.AddError(`
`118`	`118`	`"Unexpected Resource Configure Type",`
`119`		`- fmt.Sprintf("Expected *gdp.Client, got: %T. Please report this issue to the provider developers.", req.ProviderData),`
	`119`	`+ fmt.Sprintf("Expected *UnifiedClient, got: %T. Please report this issue to the provider developers.", req.ProviderData),`
`120`	`120`	`)`
`121`	`121`	`return`
`122`	`122`	`}`
`123`	`123`
`124`		`- r.client = client`
	`124`	`+ r.client = unifiedClient.GDPClient`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`func (r configureVANotificationsResource) Create(ctx context.Context, req resource.CreateRequest, resp resource.CreateResponse) {`
Original file line number	Diff line number	Diff line change
`@@ -77,13 +77,13 @@ func (r *ImportProfilesResource) Configure(ctx context.Context, req resource.Con`
`77`	`77`	`return`
`78`	`78`	`}`
`79`	`79`
`80`		`- client, ok := req.ProviderData.(*gdp.Client)`
	`80`	`+ unifiedClient, ok := req.ProviderData.(*UnifiedClient)`
`81`	`81`	`if !ok {`
`82`		`- resp.Diagnostics.AddError("Unexpected Resource Configure Type", fmt.Sprintf("Expected *gdp.Client, got: %T", req.ProviderData))`
	`82`	`+ resp.Diagnostics.AddError("Unexpected Resource Configure Type", fmt.Sprintf("Expected *UnifiedClient, got: %T", req.ProviderData))`
`83`	`83`	`return`
`84`	`84`	`}`
`85`	`85`
`86`		`- r.client = client`
	`86`	`+ r.client = unifiedClient.GDPClient`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`// Create creates the resource and sets the initial Terraform state`
Original file line number	Diff line number	Diff line change
`@@ -72,16 +72,16 @@ func (r *InstallConnectorResource) Configure(ctx context.Context, req resource.C`
`72`	`72`	`return`
`73`	`73`	`}`
`74`	`74`
`75`		`- client, ok := req.ProviderData.(*gdp.Client)`
	`75`	`+ unifiedClient, ok := req.ProviderData.(*UnifiedClient)`
`76`	`76`	`if !ok {`
`77`	`77`	`resp.Diagnostics.AddError(`
`78`	`78`	`"Unexpected Resource Configure Type",`
`79`		`- fmt.Sprintf("Expected *gdp.Client, got: %T", req.ProviderData),`
	`79`	`+ fmt.Sprintf("Expected *UnifiedClient, got: %T", req.ProviderData),`
`80`	`80`	`)`
`81`	`81`	`return`
`82`	`82`	`}`
`83`	`83`
`84`		`- r.client = client`
	`84`	`+ r.client = unifiedClient.GDPClient`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`// Create creates the resource and sets the initial Terraform state`