wip

Author: jianyuan

internal/provider/resource_project.go

@@ -13,6 +13,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/boolplanmodifier"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/int64planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
@@ -151,31 +152,20 @@ func (m *ProjectResourceModel) Fill(project apiclient.Project) error {
 	m.Features = types.SetValueMust(types.StringType, sliceutils.Map(func(v string) attr.Value {
 		return types.StringValue(v)
 	}, project.Features))
-
-	if !m.DigestsMinDelay.IsNull() {
-		m.DigestsMinDelay = types.Int64Value(project.DigestsMinDelay)
-	}
-	if !m.DigestsMaxDelay.IsNull() {
-		m.DigestsMaxDelay = types.Int64Value(project.DigestsMaxDelay)
-	}
-	if !m.ResolveAge.IsNull() {
-		m.ResolveAge = types.Int64Value(project.ResolveAge)
-	}
+	m.DigestsMinDelay = types.Int64Value(project.DigestsMinDelay)
+	m.DigestsMaxDelay = types.Int64Value(project.DigestsMaxDelay)
+	m.ResolveAge = types.Int64Value(project.ResolveAge)
 
 	if m.Filters != nil {
 		m.Filters.Fill(project)
 	}
 
-	if !m.FingerprintingRules.IsNull() {
-		if strings.TrimRight(m.FingerprintingRules.ValueString(), "\n") != project.FingerprintingRules {
-			m.FingerprintingRules = types.StringValue(project.FingerprintingRules)
-		}
+	if m.FingerprintingRules.IsUnknown() || strings.TrimRight(m.FingerprintingRules.ValueString(), "\n") != project.FingerprintingRules {
+		m.FingerprintingRules = types.StringValue(project.FingerprintingRules)
 	}
 
-	if !m.GroupingEnhancements.IsNull() {
-		if strings.TrimRight(m.GroupingEnhancements.ValueString(), "\n") != project.GroupingEnhancements {
-			m.GroupingEnhancements = types.StringValue(project.GroupingEnhancements)
-		}
+	if m.GroupingEnhancements.IsUnknown() || strings.TrimRight(m.GroupingEnhancements.ValueString(), "\n") != project.GroupingEnhancements {
+		m.GroupingEnhancements = types.StringValue(project.GroupingEnhancements)
 	}
 
 	if m.ClientSecurity != nil {
@@ -260,14 +250,26 @@ func (r *ProjectResource) Schema(ctx context.Context, req resource.SchemaRequest
 			"digests_min_delay": schema.Int64Attribute{
 				Description: "The minimum amount of time (in seconds) to wait between scheduling digests for delivery after the initial scheduling.",
 				Optional:    true,
+				Computed:    true,
+				PlanModifiers: []planmodifier.Int64{
+					int64planmodifier.UseStateForUnknown(),
+				},
 			},
 			"digests_max_delay": schema.Int64Attribute{
 				Description: "The maximum amount of time (in seconds) to wait between scheduling digests for delivery.",
 				Optional:    true,
+				Computed:    true,
+				PlanModifiers: []planmodifier.Int64{
+					int64planmodifier.UseStateForUnknown(),
+				},
 			},
 			"resolve_age": schema.Int64Attribute{
 				Description: "Hours in which an issue is automatically resolve if not seen after this amount of time.",
 				Optional:    true,
+				Computed:    true,
+				PlanModifiers: []planmodifier.Int64{
+					int64planmodifier.UseStateForUnknown(),
+				},
 			},
 			"filters": schema.SingleNestedAttribute{
 				Description: "Custom filters for this project.",
@@ -302,10 +304,18 @@ func (r *ProjectResource) Schema(ctx context.Context, req resource.SchemaRequest
 			"fingerprinting_rules": schema.StringAttribute{
 				MarkdownDescription: "This can be used to modify the fingerprint rules on the server with custom rules. Rules follow the pattern `matcher:glob -> fingerprint, values`. To learn more about fingerprint rules, [read the docs](https://docs.sentry.io/concepts/data-management/event-grouping/fingerprint-rules/).",
 				Optional:            true,
+				Computed:            true,
+				PlanModifiers: []planmodifier.String{
+					stringplanmodifier.UseStateForUnknown(),
+				},
 			},
 			"grouping_enhancements": schema.StringAttribute{
 				MarkdownDescription: "This can be used to enhance the grouping algorithm with custom rules. Rules follow the pattern `matcher:glob [v^]?[+-]flag`. To learn more about stack trace rules, [read the docs](https://docs.sentry.io/concepts/data-management/event-grouping/stack-trace-rules/).",
 				Optional:            true,
+				Computed:            true,
+				PlanModifiers: []planmodifier.String{
+					stringplanmodifier.UseStateForUnknown(),
+				},
 			},
 		},
 		Blocks: map[string]schema.Block{
@@ -368,7 +378,7 @@ func (r *ProjectResource) Create(ctx context.Context, req resource.CreateRequest
 		DefaultRules: data.DefaultRules.ValueBoolPointer(),
 	}
 
-	if !data.Slug.IsNull() && !data.Slug.IsUnknown() {
+	if !data.Slug.IsUnknown() {
 		createBody.Slug = data.Slug.ValueStringPointer()
 	}
 
@@ -388,19 +398,34 @@ func (r *ProjectResource) Create(ctx context.Context, req resource.CreateRequest
 
 	// Update the project
 	updateBody := apiclient.UpdateOrganizationProjectJSONRequestBody{
-		Name:                 data.Name.ValueStringPointer(),
-		Platform:             data.Platform.ValueStringPointer(),
-		DigestsMinDelay:      data.DigestsMinDelay.ValueInt64Pointer(),
-		DigestsMaxDelay:      data.DigestsMaxDelay.ValueInt64Pointer(),
-		ResolveAge:           data.ResolveAge.ValueInt64Pointer(),
-		FingerprintingRules:  data.FingerprintingRules.ValueStringPointer(),
-		GroupingEnhancements: data.GroupingEnhancements.ValueStringPointer(),
+		Name:     data.Name.ValueStringPointer(),
+		Platform: data.Platform.ValueStringPointer(),
 	}
 
-	if !data.Slug.IsNull() && !data.Slug.IsUnknown() {
+	if !data.Slug.IsUnknown() {
 		updateBody.Slug = data.Slug.ValueStringPointer()
 	}
 
+	if !data.DigestsMinDelay.IsUnknown() {
+		updateBody.DigestsMinDelay = data.DigestsMinDelay.ValueInt64Pointer()
+	}
+
+	if !data.DigestsMaxDelay.IsUnknown() {
+		updateBody.DigestsMaxDelay = data.DigestsMaxDelay.ValueInt64Pointer()
+	}
+
+	if !data.ResolveAge.IsUnknown() {
+		updateBody.ResolveAge = data.ResolveAge.ValueInt64Pointer()
+	}
+
+	if !data.FingerprintingRules.IsUnknown() {
+		updateBody.FingerprintingRules = data.FingerprintingRules.ValueStringPointer()
+	}
+
+	if !data.GroupingEnhancements.IsUnknown() {
+		updateBody.GroupingEnhancements = data.GroupingEnhancements.ValueStringPointer()
+	}
+
 	if data.Filters != nil {
 		options := make(map[string]interface{})
 		if data.Filters.BlacklistedIps.IsNull() {

internal/provider/resource_project_test.go

@@ -187,12 +187,12 @@ func TestAccProjectResource_basic(t *testing.T) {
 			statecheck.ExpectKnownValue(rn, tfjsonpath.New("default_key"), knownvalue.Null()),
 			statecheck.ExpectKnownValue(rn, tfjsonpath.New("internal_id"), knownvalue.NotNull()),
 			statecheck.ExpectKnownValue(rn, tfjsonpath.New("features"), knownvalue.NotNull()),
-			statecheck.ExpectKnownValue(rn, tfjsonpath.New("digests_min_delay"), knownvalue.Null()),
-			statecheck.ExpectKnownValue(rn, tfjsonpath.New("digests_max_delay"), knownvalue.Null()),
-			statecheck.ExpectKnownValue(rn, tfjsonpath.New("resolve_age"), knownvalue.Null()),
+			statecheck.ExpectKnownValue(rn, tfjsonpath.New("digests_min_delay"), knownvalue.Int64Exact(300)),
+			statecheck.ExpectKnownValue(rn, tfjsonpath.New("digests_max_delay"), knownvalue.Int64Exact(1800)),
+			statecheck.ExpectKnownValue(rn, tfjsonpath.New("resolve_age"), knownvalue.Int64Exact(0)),
 			statecheck.ExpectKnownValue(rn, tfjsonpath.New("filters"), knownvalue.Null()),
-			statecheck.ExpectKnownValue(rn, tfjsonpath.New("fingerprinting_rules"), knownvalue.Null()),
-			statecheck.ExpectKnownValue(rn, tfjsonpath.New("grouping_enhancements"), knownvalue.Null()),
+			statecheck.ExpectKnownValue(rn, tfjsonpath.New("fingerprinting_rules"), knownvalue.StringExact("")),
+			statecheck.ExpectKnownValue(rn, tfjsonpath.New("grouping_enhancements"), knownvalue.StringExact("")),
 			statecheck.ExpectKnownValue(rn, tfjsonpath.New("name"), knownvalue.StringExact(data.ProjectName)),
 			statecheck.ExpectKnownValue(rn, tfjsonpath.New("teams"), knownvalue.SetExact(sliceutils.Map(func(teamId int) knownvalue.Check {
 				return knownvalue.StringExact(data.AllTeamNames[teamId])