fix: correctly detect more ID attributes for data sources

Author: stainless-app[bot]

internal/customvalidator/dynamicvalidator_test.go

@@ -208,6 +208,7 @@ var testcases = map[string](struct {
 		[]attr.Value{
 			basetypes.NewListValueMust(basetypes.StringType{}, []attr.Value{basetypes.NewStringValue("")}),
 			basetypes.NewListValueMust(basetypes.StringType{}, []attr.Value{}),
+			basetypes.NewTupleValueMust([]attr.Type{basetypes.StringType{}, basetypes.StringType{}}, []attr.Value{basetypes.NewStringValue(""), basetypes.NewStringValue("")}),
 			basetypes.NewSetValueMust(basetypes.StringType{}, []attr.Value{basetypes.NewStringValue("")}),
 		},
 		[]attr.Value{

internal/services/access_rule/data_source.go

@@ -113,6 +113,7 @@ func (d *AccessRuleDataSource) Read(ctx context.Context, req datasource.ReadRequ
 		return
 	}
 	data = &env.Result
+	data.ID = data.RuleID
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
 }

internal/services/account/data_source.go

@@ -112,6 +112,7 @@ func (d *AccountDataSource) Read(ctx context.Context, req datasource.ReadRequest
 		return
 	}
 	data = &env.Result
+	data.ID = data.AccountID
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
 }

internal/services/account_dns_settings_internal_view/data_source.go

@@ -113,6 +113,7 @@ func (d *AccountDNSSettingsInternalViewDataSource) Read(ctx context.Context, req
 		return
 	}
 	data = &env.Result
+	data.ID = data.ViewID
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
 }

internal/services/account_member/data_source.go

@@ -113,6 +113,7 @@ func (d *AccountMemberDataSource) Read(ctx context.Context, req datasource.ReadR
 		return
 	}
 	data = &env.Result
+	data.ID = data.MemberID
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
 }

internal/services/account_subscription/data_source.go

@@ -82,6 +82,7 @@ func (d *AccountSubscriptionDataSource) Read(ctx context.Context, req datasource
 		return
 	}
 	data = &env.Result
+	data.ID = data.AccountID
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
 }

internal/services/account_subscription/data_source_model.go

@@ -18,12 +18,12 @@ type AccountSubscriptionResultDataSourceEnvelope struct {
 }
 
 type AccountSubscriptionDataSourceModel struct {
+	ID                 types.String                                                         `tfsdk:"id" path:"account_id,computed"`
 	AccountID          types.String                                                         `tfsdk:"account_id" path:"account_id,required"`
 	Currency           types.String                                                         `tfsdk:"currency" json:"currency,computed"`
 	CurrentPeriodEnd   timetypes.RFC3339                                                    `tfsdk:"current_period_end" json:"current_period_end,computed" format:"date-time"`
 	CurrentPeriodStart timetypes.RFC3339                                                    `tfsdk:"current_period_start" json:"current_period_start,computed" format:"date-time"`
 	Frequency          types.String                                                         `tfsdk:"frequency" json:"frequency,computed"`
-	ID                 types.String                                                         `tfsdk:"id" json:"id,computed"`
 	Price              types.Float64                                                        `tfsdk:"price" json:"price,computed"`
 	State              types.String                                                         `tfsdk:"state" json:"state,computed"`
 	RatePlan           customfield.NestedObject[AccountSubscriptionRatePlanDataSourceModel] `tfsdk:"rate_plan" json:"rate_plan,computed"`

internal/services/account_subscription/data_source_schema.go

@@ -19,6 +19,10 @@ var _ datasource.DataSourceWithConfigValidators = (*AccountSubscriptionDataSourc
 func DataSourceSchema(ctx context.Context) schema.Schema {
 	return schema.Schema{
 		Attributes: map[string]schema.Attribute{
+			"id": schema.StringAttribute{
+				Description: "Identifier",
+				Computed:    true,
+			},
 			"account_id": schema.StringAttribute{
 				Description: "Identifier",
 				Required:    true,
@@ -49,10 +53,6 @@ func DataSourceSchema(ctx context.Context) schema.Schema {
 					),
 				},
 			},
-			"id": schema.StringAttribute{
-				Description: "Subscription identifier tag.",
-				Computed:    true,
-			},
 			"price": schema.Float64Attribute{
 				Description: "The price of the subscription that will be billed, in US dollars.",
 				Computed:    true,

internal/services/account_token/data_source.go

@@ -113,6 +113,7 @@ func (d *AccountTokenDataSource) Read(ctx context.Context, req datasource.ReadRe
 		return
 	}
 	data = &env.Result
+	data.ID = data.TokenID
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
 }

internal/services/address_map/data_source.go

@@ -83,6 +83,7 @@ func (d *AddressMapDataSource) Read(ctx context.Context, req datasource.ReadRequ
 		return
 	}
 	data = &env.Result
+	data.ID = data.AddressMapID
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
 }