data sources fix

Author: oarbusi

internal/service/encryptionatrestprivateendpoint/data_source.go

@@ -31,7 +31,7 @@ func (d *encryptionAtRestPrivateEndpointDS) Schema(ctx context.Context, req data
 }
 
 func (d *encryptionAtRestPrivateEndpointDS) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
-	var earPrivateEndpointConfig TFEarPrivateEndpointModel
+	var earPrivateEndpointConfig TFEarPrivateEndpointModelDS
 	resp.Diagnostics.Append(req.Config.Get(ctx, &earPrivateEndpointConfig)...)
 	if resp.Diagnostics.HasError() {
 		return
@@ -48,5 +48,5 @@ func (d *encryptionAtRestPrivateEndpointDS) Read(ctx context.Context, req dataso
 		return
 	}
 
-	resp.Diagnostics.Append(resp.State.Set(ctx, NewTFEarPrivateEndpoint(*endpointModel, projectID))...)
+	resp.Diagnostics.Append(resp.State.Set(ctx, NewTFEarPrivateEndpointDS(*endpointModel, projectID))...)
 }

internal/service/encryptionatrestprivateendpoint/data_source_schema.go

@@ -41,8 +41,19 @@ func DSAttributes(withArguments bool) map[string]schema.Attribute {
 	}
 }
 
+// TFEarPrivateEndpointModelDS represents the model for data sources (without timeout fields)
+type TFEarPrivateEndpointModelDS struct {
+	CloudProvider                 types.String `tfsdk:"cloud_provider"`
+	ErrorMessage                  types.String `tfsdk:"error_message"`
+	ProjectID                     types.String `tfsdk:"project_id"`
+	ID                            types.String `tfsdk:"id"`
+	PrivateEndpointConnectionName types.String `tfsdk:"private_endpoint_connection_name"`
+	RegionName                    types.String `tfsdk:"region_name"`
+	Status                        types.String `tfsdk:"status"`
+}
+
 type TFEncryptionAtRestPrivateEndpointsDSModel struct {
-	CloudProvider types.String                `tfsdk:"cloud_provider"`
-	ProjectID     types.String                `tfsdk:"project_id"`
-	Results       []TFEarPrivateEndpointModel `tfsdk:"results"`
+	CloudProvider types.String                  `tfsdk:"cloud_provider"`
+	ProjectID     types.String                  `tfsdk:"project_id"`
+	Results       []TFEarPrivateEndpointModelDS `tfsdk:"results"`
 }

internal/service/encryptionatrestprivateendpoint/model.go

@@ -31,9 +31,9 @@ func NewEarPrivateEndpointReq(tfPlan *TFEarPrivateEndpointModel) *admin.EARPriva
 }
 
 func NewTFEarPrivateEndpoints(projectID, cloudProvider string, sdkResults []admin.EARPrivateEndpoint) *TFEncryptionAtRestPrivateEndpointsDSModel {
-	results := make([]TFEarPrivateEndpointModel, len(sdkResults))
+	results := make([]TFEarPrivateEndpointModelDS, len(sdkResults))
 	for i := range sdkResults {
-		result := NewTFEarPrivateEndpoint(sdkResults[i], projectID)
+		result := NewTFEarPrivateEndpointDS(sdkResults[i], projectID)
 		results[i] = result
 	}
 	return &TFEncryptionAtRestPrivateEndpointsDSModel{
@@ -42,3 +42,16 @@ func NewTFEarPrivateEndpoints(projectID, cloudProvider string, sdkResults []admi
 		Results:       results,
 	}
 }
+
+// NewTFEarPrivateEndpointDS creates a new data source model without timeout fields
+func NewTFEarPrivateEndpointDS(apiResp admin.EARPrivateEndpoint, projectID string) TFEarPrivateEndpointModelDS {
+	return TFEarPrivateEndpointModelDS{
+		ProjectID:                     types.StringValue(projectID),
+		CloudProvider:                 conversion.StringNullIfEmpty(apiResp.GetCloudProvider()),
+		ErrorMessage:                  conversion.StringNullIfEmpty(apiResp.GetErrorMessage()),
+		ID:                            conversion.StringNullIfEmpty(apiResp.GetId()),
+		RegionName:                    conversion.StringNullIfEmpty(apiResp.GetRegionName()),
+		Status:                        conversion.StringNullIfEmpty(apiResp.GetStatus()),
+		PrivateEndpointConnectionName: conversion.StringNullIfEmpty(apiResp.GetPrivateEndpointConnectionName()),
+	}
+}

internal/service/encryptionatrestprivateendpoint/model_test.go

@@ -174,7 +174,7 @@ func TestEncryptionAtRestPrivateEndpointPluralDSSDKToTFModel(t *testing.T) {
 			expectedTFModel: &encryptionatrestprivateendpoint.TFEncryptionAtRestPrivateEndpointsDSModel{
 				CloudProvider: types.StringValue(testCloudProvider),
 				ProjectID:     types.StringValue(testProjectID),
-				Results: []encryptionatrestprivateendpoint.TFEarPrivateEndpointModel{
+				Results: []encryptionatrestprivateendpoint.TFEarPrivateEndpointModelDS{
 					{
 						CloudProvider:                 types.StringValue(testCloudProvider),
 						ErrorMessage:                  types.StringNull(),