chore: replace tftypes.Nullable* helpers with builtins (#83)

albertodonato · web-flow · commit 18ffab976184 · 2025-06-26T14:43:15.000+02:00
### what

replace `tftypes.Nullable*` helpers, since builtin functions can be used
instead

### why

avoid code duplication

### testing

acceptance tests

### docs

n/a
diff --git a/internal/api/binding.go b/internal/api/binding.go
@@ -87,7 +87,7 @@ type BindingExecutionConfigResourceLimits struct {
 
 // BindingExecutionConfigResourceLimit holds resource limits for a binding execution config.
 type BindingExecutionConfigResourceLimit struct {
-	MaxCount      *int     `json:"maxCount,omitempty"`
+	MaxCount      *int32   `json:"maxCount,omitempty"`
 	MaxPercentage *float32 `json:"maxPercentage,omitempty"`
 	RequiresBoth  bool     `json:"requiresBoth"`
 }
diff --git a/internal/api/types.go b/internal/api/types.go
@@ -60,13 +60,3 @@ func StringsList(l types.List) []string {
 	}
 	return sl
 }
-
-// NullableInt conerts a types.Int32 to an int that can be null.
-func NullableInt(i types.Int32) *int {
-	if i.IsNull() {
-		return nil
-	}
-
-	v := int(i.ValueInt32())
-	return &v
-}
diff --git a/internal/datasources/account.go b/internal/datasources/account.go
@@ -104,12 +104,12 @@ func (d *accountDataSource) Read(ctx context.Context, req datasource.ReadRequest
 	data.ID = types.StringValue(account.ID)
 	data.Key = types.StringValue(account.Key)
 	data.Name = types.StringValue(account.Name)
-	data.ShortName = tftypes.NullableString(account.ShortName)
-	data.Description = tftypes.NullableString(account.Description)
+	data.ShortName = types.StringPointerValue(account.ShortName)
+	data.Description = types.StringPointerValue(account.Description)
 	data.CloudProvider = types.StringValue(string(account.Provider))
-	data.Path = tftypes.NullableString(account.Path)
-	data.Email = tftypes.NullableString(account.Email)
-	data.SecurityContext = tftypes.NullableString(account.SecurityContext)
+	data.Path = types.StringPointerValue(account.Path)
+	data.Email = types.StringPointerValue(account.Email)
+	data.SecurityContext = types.StringPointerValue(account.SecurityContext)
 	variablesString, err := tftypes.JSONString(account.Variables)
 	if err != nil {
 		errors.AddDiagAttributeError(&resp.Diagnostics, "variables", err)
diff --git a/internal/datasources/account_group.go b/internal/datasources/account_group.go
@@ -94,7 +94,7 @@ func (d *accountGroupDataSource) Read(ctx context.Context, req datasource.ReadRe
 	data.ID = types.StringValue(account_group.ID)
 	data.UUID = types.StringValue(account_group.UUID)
 	data.Name = types.StringValue(account_group.Name)
-	data.Description = tftypes.NullableString(account_group.Description)
+	data.Description = types.StringPointerValue(account_group.Description)
 	data.CloudProvider = types.StringValue(account_group.Provider)
 	data.Regions = tftypes.StringsList(account_group.Regions)
 
diff --git a/internal/datasources/binding.go b/internal/datasources/binding.go
@@ -166,14 +166,14 @@ func (d *bindingDataSource) Read(ctx context.Context, req datasource.ReadRequest
 	data.ID = types.StringValue(binding.ID)
 	data.UUID = types.StringValue(binding.UUID)
 	data.Name = types.StringValue(binding.Name)
-	data.Description = tftypes.NullableString(binding.Description)
+	data.Description = types.StringPointerValue(binding.Description)
 	data.AutoDeploy = types.BoolValue(binding.AutoDeploy)
-	data.Schedule = tftypes.NullableString(binding.Schedule)
+	data.Schedule = types.StringPointerValue(binding.Schedule)
 	data.AccountGroupUUID = types.StringValue(binding.AccountGroup.UUID)
 	data.PolicyCollectionUUID = types.StringValue(binding.PolicyCollection.UUID)
 	data.System = types.BoolValue(binding.System)
-	data.DryRun = tftypes.NullableBool(binding.DryRun())
-	data.SecurityContext = tftypes.NullableString(binding.SecurityContext())
+	data.DryRun = types.BoolPointerValue(binding.DryRun())
+	data.SecurityContext = types.StringPointerValue(binding.SecurityContext())
 
 	variablesString, err := tftypes.JSONString(binding.ExecutionConfig.Variables)
 	if err != nil {
@@ -188,8 +188,8 @@ func (d *bindingDataSource) Read(ctx context.Context, req datasource.ReadRequest
 		defLimit,
 		func() (*models.BindingExecutionConfigResourceLimit, diag.Diagnostics) {
 			return &models.BindingExecutionConfigResourceLimit{
-				MaxCount:      tftypes.NullableInt(defLimit.MaxCount),
-				MaxPercentage: tftypes.NullableFloat(defLimit.MaxPercentage),
+				MaxCount:      types.Int32PointerValue(defLimit.MaxCount),
+				MaxPercentage: types.Float32PointerValue(defLimit.MaxPercentage),
 				RequiresBoth:  types.BoolValue(defLimit.RequiresBoth),
 			}, nil
 		},
@@ -205,8 +205,8 @@ func (d *bindingDataSource) Read(ctx context.Context, req datasource.ReadRequest
 		func(entry api.BindingExecutionConfigResourceLimitsPolicyOverrides) (map[string]attr.Value, diag.Diagnostics) {
 			return map[string]attr.Value{
 				"policy_name":    types.StringValue(entry.PolicyName),
-				"max_count":      tftypes.NullableInt(entry.Limit.MaxCount),
-				"max_percentage": tftypes.NullableFloat(entry.Limit.MaxPercentage),
+				"max_count":      types.Int32PointerValue(entry.Limit.MaxCount),
+				"max_percentage": types.Float32PointerValue(entry.Limit.MaxPercentage),
 				"requires_both":  types.BoolValue(entry.Limit.RequiresBoth),
 			}, nil
 		},
diff --git a/internal/datasources/platform.go b/internal/datasources/platform.go
@@ -125,7 +125,7 @@ func (d *platformDataSource) Read(ctx context.Context, req datasource.ReadReques
 	}
 
 	data.ID = types.StringValue(platform.ID)
-	data.ExternalID = tftypes.NullableString(platform.ExternalID)
+	data.ExternalID = types.StringPointerValue(platform.ExternalID)
 	data.ExecutionRegions = tftypes.StringsList(platform.ExecutionRegions)
 	awsAccountCustomerConfig, diags := d.getCustomerConfig(ctx, platform.AWSAccountCustomerConfig)
 	resp.Diagnostics.Append(diags...)
diff --git a/internal/datasources/policy.go b/internal/datasources/policy.go
@@ -15,7 +15,6 @@ import (
 	"github.com/stacklet/terraform-provider-stacklet/internal/models"
 	"github.com/stacklet/terraform-provider-stacklet/internal/providerdata"
 	"github.com/stacklet/terraform-provider-stacklet/internal/schemavalidate"
-	tftypes "github.com/stacklet/terraform-provider-stacklet/internal/types"
 )
 
 var (
@@ -130,7 +129,7 @@ func (d *policyDataSource) Read(ctx context.Context, req datasource.ReadRequest,
 	data.ID = types.StringValue(policy.ID)
 	data.UUID = types.StringValue(policy.UUID)
 	data.Name = types.StringValue(policy.Name)
-	data.Description = tftypes.NullableString(policy.Description)
+	data.Description = types.StringPointerValue(policy.Description)
 	data.CloudProvider = types.StringValue(policy.Provider)
 	data.Version = types.Int32Value(int32(policy.Version))
 	category, diag := types.ListValueFrom(ctx, types.StringType, policy.Category)
diff --git a/internal/datasources/policy_collection.go b/internal/datasources/policy_collection.go
@@ -125,7 +125,7 @@ func (d *policyCollectionDataSource) Read(ctx context.Context, req datasource.Re
 	data.ID = types.StringValue(policyCollection.ID)
 	data.UUID = types.StringValue(policyCollection.UUID)
 	data.Name = types.StringValue(policyCollection.Name)
-	data.Description = tftypes.NullableString(policyCollection.Description)
+	data.Description = types.StringPointerValue(policyCollection.Description)
 	data.CloudProvider = types.StringValue(string(policyCollection.Provider))
 	data.AutoUpdate = types.BoolValue(policyCollection.AutoUpdate)
 	data.System = types.BoolValue(policyCollection.System)
diff --git a/internal/datasources/repository.go b/internal/datasources/repository.go
@@ -13,7 +13,6 @@ import (
 	"github.com/stacklet/terraform-provider-stacklet/internal/errors"
 	"github.com/stacklet/terraform-provider-stacklet/internal/models"
 	"github.com/stacklet/terraform-provider-stacklet/internal/providerdata"
-	tftypes "github.com/stacklet/terraform-provider-stacklet/internal/types"
 )
 
 // Ensure provider defined types fully satisfy framework interfaces.
@@ -129,10 +128,10 @@ func (d *repositoryDataSource) Read(ctx context.Context, req datasource.ReadRequ
 	data.URL = types.StringValue(repo.URL)
 	data.Name = types.StringValue(repo.Name)
 	data.WebhookURL = types.StringValue(repo.WebhookURL)
-	data.Description = tftypes.NullableString(repo.Description)
-	data.AuthUser = tftypes.NullableString(repo.Auth.AuthUser)
+	data.Description = types.StringPointerValue(repo.Description)
+	data.AuthUser = types.StringPointerValue(repo.Auth.AuthUser)
 	data.HasAuthToken = types.BoolValue(repo.Auth.HasAuthToken)
-	data.SSHPublicKey = tftypes.NullableString(repo.Auth.SSHPublicKey)
+	data.SSHPublicKey = types.StringPointerValue(repo.Auth.SSHPublicKey)
 	data.HasSSHPrivateKey = types.BoolValue(repo.Auth.HasSshPrivateKey)
 	data.HasSSHPassphrase = types.BoolValue(repo.Auth.HasSshPassphrase)
 	data.System = types.BoolValue(repo.System)
diff --git a/internal/resources/account.go b/internal/resources/account.go
@@ -238,12 +238,12 @@ func (r accountResource) updateAccountModel(m *models.AccountResource, account *
 	m.ID = types.StringValue(account.ID)
 	m.Key = types.StringValue(account.Key)
 	m.Name = types.StringValue(account.Name)
-	m.ShortName = tftypes.NullableString(account.ShortName)
+	m.ShortName = types.StringPointerValue(account.ShortName)
 	m.CloudProvider = types.StringValue(string(account.Provider))
-	m.Description = tftypes.NullableString(account.Description)
-	m.Path = tftypes.NullableString(account.Path)
-	m.Email = tftypes.NullableString(account.Email)
-	m.SecurityContext = tftypes.NullableString(account.SecurityContext)
+	m.Description = types.StringPointerValue(account.Description)
+	m.Path = types.StringPointerValue(account.Path)
+	m.Email = types.StringPointerValue(account.Email)
+	m.SecurityContext = types.StringPointerValue(account.SecurityContext)
 	variablesString, err := tftypes.JSONString(account.Variables)
 	if err != nil {
 		errors.AddDiagAttributeError(&diags, "variables", err)
diff --git a/internal/resources/account_discovery_aws.go b/internal/resources/account_discovery_aws.go
@@ -18,7 +18,6 @@ import (
 	"github.com/stacklet/terraform-provider-stacklet/internal/errors"
 	"github.com/stacklet/terraform-provider-stacklet/internal/models"
 	"github.com/stacklet/terraform-provider-stacklet/internal/providerdata"
-	tftypes "github.com/stacklet/terraform-provider-stacklet/internal/types"
 )
 
 var (
@@ -193,7 +192,7 @@ func (r *accountDiscoveryAWSResource) ImportState(ctx context.Context, req resou
 func (r accountDiscoveryAWSResource) updateAccountDiscoveryAWSModel(m *models.AccountDiscoveryAWSResource, accountDiscovery *api.AccountDiscovery) {
 	m.ID = types.StringValue(accountDiscovery.ID)
 	m.Name = types.StringValue(accountDiscovery.Name)
-	m.Description = tftypes.NullableString(accountDiscovery.Description)
+	m.Description = types.StringPointerValue(accountDiscovery.Description)
 	m.Suspended = types.BoolValue(accountDiscovery.Schedule.Suspended)
 	m.OrgID = types.StringValue(accountDiscovery.Config.AWSConfig.OrgID)
 	m.OrgReadRole = types.StringValue(accountDiscovery.Config.AWSConfig.OrgRole)
diff --git a/internal/resources/account_discovery_azure.go b/internal/resources/account_discovery_azure.go
@@ -18,7 +18,6 @@ import (
 	"github.com/stacklet/terraform-provider-stacklet/internal/errors"
 	"github.com/stacklet/terraform-provider-stacklet/internal/models"
 	"github.com/stacklet/terraform-provider-stacklet/internal/providerdata"
-	tftypes "github.com/stacklet/terraform-provider-stacklet/internal/types"
 )
 
 var (
@@ -196,7 +195,7 @@ func (r *accountDiscoveryAzureResource) ImportState(ctx context.Context, req res
 func (r accountDiscoveryAzureResource) updateAccountDiscoveryAzureModel(m *models.AccountDiscoveryAzureResource, accountDiscovery *api.AccountDiscovery) {
 	m.ID = types.StringValue(accountDiscovery.ID)
 	m.Name = types.StringValue(accountDiscovery.Name)
-	m.Description = tftypes.NullableString(accountDiscovery.Description)
+	m.Description = types.StringPointerValue(accountDiscovery.Description)
 	m.Suspended = types.BoolValue(accountDiscovery.Schedule.Suspended)
 	m.ClientID = types.StringValue(accountDiscovery.Config.AzureConfig.ClientID)
 	m.TenantID = types.StringValue(accountDiscovery.Config.AzureConfig.TenantID)
diff --git a/internal/resources/account_discovery_gcp.go b/internal/resources/account_discovery_gcp.go
@@ -221,7 +221,7 @@ func (r *accountDiscoveryGCPResource) ImportState(ctx context.Context, req resou
 func (r accountDiscoveryGCPResource) updateAccountDiscoveryGCPModel(m *models.AccountDiscoveryGCPResource, accountDiscovery *api.AccountDiscovery) {
 	m.ID = types.StringValue(accountDiscovery.ID)
 	m.Name = types.StringValue(accountDiscovery.Name)
-	m.Description = tftypes.NullableString(accountDiscovery.Description)
+	m.Description = types.StringPointerValue(accountDiscovery.Description)
 	m.Suspended = types.BoolValue(accountDiscovery.Schedule.Suspended)
 	m.ClientEmail = types.StringValue(accountDiscovery.Config.GCPConfig.ClientEmail)
 	m.ClientID = types.StringValue(accountDiscovery.Config.GCPConfig.ClientID)
diff --git a/internal/resources/account_group.go b/internal/resources/account_group.go
@@ -180,7 +180,7 @@ func (r accountGroupResource) updateAccountGroupModel(m *models.AccountGroupReso
 	m.ID = types.StringValue(account_group.ID)
 	m.UUID = types.StringValue(account_group.UUID)
 	m.Name = types.StringValue(account_group.Name)
-	m.Description = tftypes.NullableString(account_group.Description)
+	m.Description = types.StringPointerValue(account_group.Description)
 	m.CloudProvider = types.StringValue(account_group.Provider)
 	m.Regions = tftypes.StringsList(account_group.Regions)
 }
diff --git a/internal/resources/binding.go b/internal/resources/binding.go
@@ -317,14 +317,14 @@ func (r bindingResource) updateBindingModel(ctx context.Context, m *models.Bindi
 	m.ID = types.StringValue(binding.ID)
 	m.UUID = types.StringValue(binding.UUID)
 	m.Name = types.StringValue(binding.Name)
-	m.Description = tftypes.NullableString(binding.Description)
+	m.Description = types.StringPointerValue(binding.Description)
 	m.AutoDeploy = types.BoolValue(binding.AutoDeploy)
-	m.Schedule = tftypes.NullableString(binding.Schedule)
+	m.Schedule = types.StringPointerValue(binding.Schedule)
 	m.AccountGroupUUID = types.StringValue(binding.AccountGroup.UUID)
 	m.PolicyCollectionUUID = types.StringValue(binding.PolicyCollection.UUID)
 	m.System = types.BoolValue(binding.System)
-	m.DryRun = tftypes.NullableBool(binding.DryRun())
-	m.SecurityContext = tftypes.NullableString(binding.SecurityContext())
+	m.DryRun = types.BoolPointerValue(binding.DryRun())
+	m.SecurityContext = types.StringPointerValue(binding.SecurityContext())
 
 	variablesString, err := tftypes.JSONString(binding.ExecutionConfig.Variables)
 	if err != nil {
@@ -343,7 +343,7 @@ func (r bindingResource) updateBindingModel(ctx context.Context, m *models.Bindi
 		var d diag.Diagnostics
 		// if default resource limits are set in the config but empty, apply default
 		def := models.BindingExecutionConfigResourceLimit{RequiresBoth: types.BoolValue(false)}
-		defaultLimits, d = basetypes.NewObjectValueFrom(ctx, def.AttributeTypes(), &def)
+		defaultLimits, d = types.ObjectValueFrom(ctx, def.AttributeTypes(), &def)
 		diags.Append(d...)
 	} else {
 		var d diag.Diagnostics
@@ -353,8 +353,8 @@ func (r bindingResource) updateBindingModel(ctx context.Context, m *models.Bindi
 			func() (*models.BindingExecutionConfigResourceLimit, diag.Diagnostics) {
 				l := binding.DefaultResourceLimits()
 				return &models.BindingExecutionConfigResourceLimit{
-					MaxCount:      tftypes.NullableInt(l.MaxCount),
-					MaxPercentage: tftypes.NullableFloat(l.MaxPercentage),
+					MaxCount:      types.Int32PointerValue(l.MaxCount),
+					MaxPercentage: types.Float32PointerValue(l.MaxPercentage),
 					RequiresBoth:  types.BoolValue(l.RequiresBoth),
 				}, nil
 			},
@@ -368,8 +368,8 @@ func (r bindingResource) updateBindingModel(ctx context.Context, m *models.Bindi
 		func(entry api.BindingExecutionConfigResourceLimitsPolicyOverrides) (map[string]attr.Value, diag.Diagnostics) {
 			return map[string]attr.Value{
 				"policy_name":    types.StringValue(entry.PolicyName),
-				"max_count":      tftypes.NullableInt(entry.Limit.MaxCount),
-				"max_percentage": tftypes.NullableFloat(entry.Limit.MaxPercentage),
+				"max_count":      types.Int32PointerValue(entry.Limit.MaxCount),
+				"max_percentage": types.Float32PointerValue(entry.Limit.MaxPercentage),
 				"requires_both":  types.BoolValue(entry.Limit.RequiresBoth),
 			}, nil
 		},
@@ -398,7 +398,7 @@ func (r bindingResource) getExecutionConfig(ctx context.Context, plan models.Bin
 			return api.BindingExecutionConfig{}, diags
 		}
 		defaultResourceLimits = &api.BindingExecutionConfigResourceLimit{
-			MaxCount:      api.NullableInt(defLimitsObj.MaxCount),
+			MaxCount:      defLimitsObj.MaxCount.ValueInt32Pointer(),
 			MaxPercentage: defLimitsObj.MaxPercentage.ValueFloat32Pointer(),
 			RequiresBoth:  defLimitsObj.RequiresBoth.ValueBool(),
 		}
@@ -427,7 +427,7 @@ func (r bindingResource) getExecutionConfig(ctx context.Context, plan models.Bin
 				api.BindingExecutionConfigResourceLimitsPolicyOverrides{
 					PolicyName: limitsObj.PolicyName.ValueString(),
 					Limit: api.BindingExecutionConfigResourceLimit{
-						MaxCount:      api.NullableInt(limitsObj.MaxCount),
+						MaxCount:      limitsObj.MaxCount.ValueInt32Pointer(),
 						MaxPercentage: limitsObj.MaxPercentage.ValueFloat32Pointer(),
 						RequiresBoth:  limitsObj.RequiresBoth.ValueBool(),
 					},
diff --git a/internal/resources/policy_collection.go b/internal/resources/policy_collection.go
@@ -279,7 +279,7 @@ func (r policyCollectionResource) updatePolicyCollectionModel(ctx context.Contex
 	m.ID = types.StringValue(policyCollection.ID)
 	m.UUID = types.StringValue(policyCollection.UUID)
 	m.Name = types.StringValue(policyCollection.Name)
-	m.Description = tftypes.NullableString(policyCollection.Description)
+	m.Description = types.StringPointerValue(policyCollection.Description)
 	m.CloudProvider = types.StringValue(string(policyCollection.Provider))
 	m.AutoUpdate = types.BoolValue(policyCollection.AutoUpdate)
 	m.System = types.BoolValue(policyCollection.System)
diff --git a/internal/resources/repository.go b/internal/resources/repository.go
@@ -17,7 +17,6 @@ import (
 	"github.com/stacklet/terraform-provider-stacklet/internal/errors"
 	"github.com/stacklet/terraform-provider-stacklet/internal/models"
 	"github.com/stacklet/terraform-provider-stacklet/internal/providerdata"
-	tftypes "github.com/stacklet/terraform-provider-stacklet/internal/types"
 )
 
 // Ensure provider defined types fully satisfy framework interfaces.
@@ -282,12 +281,12 @@ func (r repositoryResource) updateRepositoryModel(m *models.RepositoryResource,
 	m.UUID = types.StringValue(repo.UUID)
 	m.URL = types.StringValue(repo.URL)
 	m.Name = types.StringValue(repo.Name)
-	m.Description = tftypes.NullableString(repo.Description)
+	m.Description = types.StringPointerValue(repo.Description)
 	m.System = types.BoolValue(repo.System)
 	m.WebhookURL = types.StringValue(repo.WebhookURL)
-	m.AuthUser = tftypes.NullableString(repo.Auth.AuthUser)
+	m.AuthUser = types.StringPointerValue(repo.Auth.AuthUser)
 	m.HasAuthToken = types.BoolValue(repo.Auth.HasAuthToken)
-	m.SSHPublicKey = tftypes.NullableString(repo.Auth.SSHPublicKey)
+	m.SSHPublicKey = types.StringPointerValue(repo.Auth.SSHPublicKey)
 	m.HasSSHPrivateKey = types.BoolValue(repo.Auth.HasSshPrivateKey)
 	m.HasSSHPassphrase = types.BoolValue(repo.Auth.HasSshPassphrase)
 }
diff --git a/internal/types/nullable.go b/internal/types/nullable.go
diff --git a/internal/types/object.go b/internal/types/object.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
 )
 
@@ -26,7 +27,7 @@ func ObjectValue[Type WithAttributes, Value any](ctx context.Context, v *Value,
 	if diags.HasError() || objPtr == nil {
 		return NullObject(empty), diags
 	}
-	return basetypes.NewObjectValueFrom(ctx, empty.AttributeTypes(), *objPtr)
+	return types.ObjectValueFrom(ctx, empty.AttributeTypes(), *objPtr)
 }
 
 // NullObject returns a basetype.ObjectValue for the provided type with empty values.

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ type BindingExecutionConfigResourceLimits struct {`
`87`	`87`
`88`	`88`	`// BindingExecutionConfigResourceLimit holds resource limits for a binding execution config.`
`89`	`89`	`type BindingExecutionConfigResourceLimit struct {`
`90`		- MaxCount *int `json:"maxCount,omitempty"`
	`90`	+ MaxCount *int32 `json:"maxCount,omitempty"`
`91`	`91`	MaxPercentage *float32 `json:"maxPercentage,omitempty"`
`92`	`92`	RequiresBoth bool `json:"requiresBoth"`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,13 +60,3 @@ func StringsList(l types.List) []string {`
`60`	`60`	`}`
`61`	`61`	`return sl`
`62`	`62`	`}`
`63`		`-`
`64`		`-// NullableInt conerts a types.Int32 to an int that can be null.`
`65`		`-func NullableInt(i types.Int32) *int {`
`66`		`- if i.IsNull() {`
`67`		`- return nil`
`68`		`- }`
`69`		`-`
`70`		`- v := int(i.ValueInt32())`
`71`		`- return &v`
`72`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ func (d *platformDataSource) Read(ctx context.Context, req datasource.ReadReques`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`data.ID = types.StringValue(platform.ID)`
`128`		`- data.ExternalID = tftypes.NullableString(platform.ExternalID)`
	`128`	`+ data.ExternalID = types.StringPointerValue(platform.ExternalID)`
`129`	`129`	`data.ExecutionRegions = tftypes.StringsList(platform.ExecutionRegions)`
`130`	`130`	`awsAccountCustomerConfig, diags := d.getCustomerConfig(ctx, platform.AWSAccountCustomerConfig)`
`131`	`131`	`resp.Diagnostics.Append(diags...)`