Flatten datasource schema

Author: octopus-hideaki

octopusdeploy_framework/datasource_space_default_retention_policies.go

@@ -2,12 +2,10 @@ package octopusdeploy_framework
 
 import (
 	"context"
-	"time"
 
 	"github.com/OctopusDeploy/go-octopusdeploy/v2/pkg/retention"
 	"github.com/OctopusDeploy/terraform-provider-octopusdeploy/octopusdeploy_framework/schemas"
 	"github.com/OctopusDeploy/terraform-provider-octopusdeploy/octopusdeploy_framework/util"
-	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
@@ -49,23 +47,18 @@ func (s *spaceDefaultRetentionPoliciesDataSource) Read(ctx context.Context, req
 		return
 	}
 
-	util.DatasourceResultCount(ctx, "space_default_retention_policy", 1)
-	retentionPolicy, diag := types.ObjectValue(schemas.GetSpaceDefaultRetentionPolicyAttributes(), map[string]attr.Value{
-		"id":               types.StringValue(existingPolicy.GetID()),
-		"space_id":         types.StringValue(existingPolicy.GetSpaceID()),
-		"retention_type":   types.StringValue(string(existingPolicy.RetentionType)),
-		"strategy":         types.StringValue(string(existingPolicy.Strategy)),
-		"quantity_to_keep": types.Int64Value(int64(existingPolicy.QuantityToKeep)),
-		"unit":             types.StringValue(string(existingPolicy.Unit)),
-	})
-	data.RetentionPolicy = retentionPolicy
-	data.ID = types.StringValue("Space Default Retention Policy " + time.Now().UTC().String())
-	resp.Diagnostics.Append(diag...)
-
+	updateRetentionPolicyDatasourceModelFromResource(&data, existingPolicy)
 	resp.Diagnostics.Append(resp.State.Set(ctx, data)...)
 }
 
 // Schema implements datasource.DataSource.
 func (s *spaceDefaultRetentionPoliciesDataSource) Schema(_ context.Context, _ datasource.SchemaRequest, resp *datasource.SchemaResponse) {
 	resp.Schema = schemas.SpaceDefaultRetentionPolicySchema{}.GetDatasourceSchema()
 }
+
+func updateRetentionPolicyDatasourceModelFromResource(data *schemas.SpaceDefaultRetentionPoliciesDataSourceModel, resource *retention.SpaceDefaultRetentionPolicyResource) {
+	data.ID = types.StringValue(resource.GetID())
+	data.Strategy = types.StringValue(resource.Strategy)
+	data.QuantityToKeep = util.Ternary(resource.QuantityToKeep == 0, types.Int64Null(), types.Int64Value(int64(resource.QuantityToKeep)))
+	data.Unit = util.Ternary(resource.Unit == "", types.StringNull(), types.StringValue(resource.Unit))
+}

octopusdeploy_framework/datasource_space_default_retention_policies_test.go

@@ -21,10 +21,10 @@ func TestAccDataSourceSpaceDefaultRetentionPolicy(t *testing.T) {
 			{
 				Config: testAccDataSourceSpaceDefaultRetentionPolicyConfig(spaceName, retentionType),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttrSet(resourceName, "retention_policy.id"),
-					resource.TestCheckResourceAttrSet(resourceName, "retention_policy.space_id"),
-					resource.TestCheckResourceAttr(resourceName, "retention_policy.retention_type", retentionType),
-					resource.TestCheckResourceAttrSet(resourceName, "retention_policy.strategy"),
+					resource.TestCheckResourceAttrSet(resourceName, "id"),
+					resource.TestCheckResourceAttrSet(resourceName, "space_id"),
+					resource.TestCheckResourceAttr(resourceName, "retention_type", retentionType),
+					resource.TestCheckResourceAttrSet(resourceName, "strategy"),
 				),
 			},
 		},

octopusdeploy_framework/schemas/space_default_retention_policy.go

@@ -4,7 +4,6 @@ import (
 	"github.com/OctopusDeploy/terraform-provider-octopusdeploy/octopusdeploy_framework/util"
 	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/attr"
-	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	ds "github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	rs "github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/types"
@@ -34,20 +33,10 @@ func (s SpaceDefaultRetentionPolicySchema) GetDatasourceSchema() ds.Schema {
 			"retention_type": util.ResourceString().Description("The type of retention policy.").Required().Validators(stringvalidator.OneOf("LifecycleRelease", "LifecycleTentacle")).Build(),
 
 			// response
-			"id": GetIdDatasourceSchema(true),
-		},
-		Blocks: map[string]ds.Block{
-			"retention_policy": schema.SingleNestedBlock{
-				Description: "The default retention policy for the space.",
-				Attributes: map[string]ds.Attribute{
-					"id":               util.ResourceString().Description("The ID of the retention policy.").Computed().Build(),
-					"space_id":         util.ResourceString().Description("The ID of the space.").Computed().Build(),
-					"retention_type":   util.ResourceString().Description("The type of retention policy.").Computed().Build(),
-					"strategy":         util.ResourceString().Description("The strategy for the retention policy.").Computed().Build(),
-					"quantity_to_keep": util.ResourceInt64().Description("The quantity of items to keep.").Computed().Optional().Build(),
-					"unit":             util.ResourceString().Description("The unit of time for the retention policy.").Computed().Optional().Build(),
-				},
-			},
+			"id":               util.ResourceString().Description("The ID of the retention policy.").Computed().Build(),
+			"strategy":         util.ResourceString().Description("The strategy for the retention policy.").Computed().Build(),
+			"quantity_to_keep": util.ResourceInt64().Description("The quantity of items to keep.").Computed().Optional().Build(),
+			"unit":             util.ResourceString().Description("The unit of time for the retention policy.").Computed().Optional().Build(),
 		},
 	}
 }
@@ -57,8 +46,10 @@ func (s SpaceDefaultRetentionPolicySchema) GetResourceSchema() rs.Schema {
 }
 
 type SpaceDefaultRetentionPoliciesDataSourceModel struct {
-	ID              types.String `tfsdk:"id"`
-	SpaceID         types.String `tfsdk:"space_id"`
-	RetentionType   types.String `tfsdk:"retention_type"`
-	RetentionPolicy types.Object `tfsdk:"retention_policy"`
+	ID             types.String `tfsdk:"id"`
+	SpaceID        types.String `tfsdk:"space_id"`
+	RetentionType  types.String `tfsdk:"retention_type"`
+	Strategy       types.String `tfsdk:"strategy"`
+	QuantityToKeep types.Int64  `tfsdk:"quantity_to_keep"`
+	Unit           types.String `tfsdk:"unit"`
 }