Fix usage of resource config on vercel_project resource. (#286)

- properly support null or unknown values for this field.
- remove false defaults of `null` for the fields.
- Fix validation allowing `0` or `901` as timeout values.
- Remove a lot of unnecessary code to suppress diffs.
- Allow setting resourceConfig on project creation.

Author: dglsparsons

client/project.go

@@ -218,8 +218,8 @@ type Security struct {
 }
 
 type ResourceConfig struct {
-	FunctionDefaultMemoryType string `json:"functionDefaultMemoryType,omitempty"`
-	FunctionDefaultTimeout    int64  `json:"functionDefaultTimeout,omitempty"`
+	FunctionDefaultMemoryType *string `json:"functionDefaultMemoryType,omitempty"`
+	FunctionDefaultTimeout    *int64  `json:"functionDefaultTimeout,omitempty"`
 }
 
 // GetProject retrieves information about an existing project from Vercel.

vercel/data_source_project.go

@@ -414,7 +414,7 @@ type ProjectDataSource struct {
 	DirectoryListing                    types.Bool            `tfsdk:"directory_listing"`
 	EnableAffectedProjectsDeployments   types.Bool            `tfsdk:"enable_affected_projects_deployments"`
 	SkewProtection                      types.String          `tfsdk:"skew_protection"`
-	ResourceConfig                      *ResourceConfig       `tfsdk:"resource_config"`
+	ResourceConfig                      types.Object          `tfsdk:"resource_config"`
 	NodeVersion                         types.String          `tfsdk:"node_version"`
 }
 
@@ -431,13 +431,6 @@ func convertResponseToProjectDataSource(ctx context.Context, response client.Pro
 		})
 	}
 
-	if response.ResourceConfig != nil {
-		plan.ResourceConfig = &ResourceConfig{
-			FunctionDefaultMemoryType: types.StringValue(response.ResourceConfig.FunctionDefaultMemoryType),
-			FunctionDefaultTimeout:    types.Int64Value(response.ResourceConfig.FunctionDefaultTimeout),
-		}
-	}
-
 	project, err := convertResponseToProject(ctx, response, plan, environmentVariables)
 	if err != nil {
 		return ProjectDataSource{}, err

vercel/resource_project.go

@@ -518,9 +518,10 @@ At this time you cannot use a Vercel Project resource with in-line ` + "`environ
 				},
 			},
 			"resource_config": schema.SingleNestedAttribute{
-				Description: "Resource Configuration for the project.",
-				Optional:    true,
-				Computed:    true,
+				Description:   "Resource Configuration for the project.",
+				Optional:      true,
+				Computed:      true,
+				PlanModifiers: []planmodifier.Object{objectplanmodifier.UseStateForUnknown()},
 				Attributes: map[string]schema.Attribute{
 					// This is actually "function_default_memory_type" in the API schema, but for better convention, we use "cpu" and do translation in the provider.
 					"function_default_cpu_type": schema.StringAttribute{
@@ -530,64 +531,24 @@ At this time you cannot use a Vercel Project resource with in-line ` + "`environ
 						Validators: []validator.String{
 							stringvalidator.OneOf("standard_legacy", "standard", "performance"),
 						},
-						PlanModifiers: []planmodifier.String{SuppressDiffIfNotConfigured(), stringplanmodifier.UseStateForUnknown()},
+						PlanModifiers: []planmodifier.String{stringplanmodifier.UseStateForUnknown()},
 					},
 					"function_default_timeout": schema.Int64Attribute{
 						Description: "The default timeout for Serverless Functions.",
 						Optional:    true,
 						Computed:    true,
 						Validators: []validator.Int64{
-							int64validator.AtLeast(0),
-							int64validator.AtMost(901),
+							int64validator.AtLeast(1),
+							int64validator.AtMost(900),
 						},
-						PlanModifiers: []planmodifier.Int64{SuppressDiffIfNotConfigured(), int64planmodifier.UseStateForUnknown()},
+						PlanModifiers: []planmodifier.Int64{int64planmodifier.UseStateForUnknown()},
 					},
 				},
-				Default: objectdefault.StaticValue(types.ObjectValueMust(
-					map[string]attr.Type{
-						"function_default_cpu_type": types.StringType,
-						"function_default_timeout":  types.Int64Type,
-					},
-					map[string]attr.Value{
-						"function_default_cpu_type": types.StringNull(),
-						"function_default_timeout":  types.Int64Null(),
-					},
-				)),
 			},
 		},
 	}
 }
 
-type suppressDiffIfNotConfigured struct{}
-
-func SuppressDiffIfNotConfigured() *suppressDiffIfNotConfigured {
-	return &suppressDiffIfNotConfigured{}
-}
-
-func (m *suppressDiffIfNotConfigured) Description(ctx context.Context) string {
-	return "Ensures that the diff is suppressed if the attribute is not explicitly configured by users."
-}
-
-func (m *suppressDiffIfNotConfigured) MarkdownDescription(ctx context.Context) string {
-	return m.Description(ctx)
-}
-
-func (m *suppressDiffIfNotConfigured) PlanModifyString(ctx context.Context, req planmodifier.StringRequest, resp *planmodifier.StringResponse) {
-	if req.ConfigValue.IsNull() {
-		resp.PlanValue = req.StateValue
-		resp.RequiresReplace = false
-		return
-	}
-}
-
-func (m *suppressDiffIfNotConfigured) PlanModifyInt64(ctx context.Context, req planmodifier.Int64Request, resp *planmodifier.Int64Response) {
-	if req.ConfigValue.IsNull() {
-		resp.PlanValue = req.StateValue
-		resp.RequiresReplace = false
-		return
-	}
-}
-
 // Project reflects the state terraform stores internally for a project.
 type Project struct {
 	BuildCommand                        types.String                    `tfsdk:"build_command"`
@@ -624,7 +585,7 @@ type Project struct {
 	DirectoryListing                    types.Bool                      `tfsdk:"directory_listing"`
 	EnableAffectedProjectsDeployments   types.Bool                      `tfsdk:"enable_affected_projects_deployments"`
 	SkewProtection                      types.String                    `tfsdk:"skew_protection"`
-	ResourceConfig                      *ResourceConfig                 `tfsdk:"resource_config"`
+	ResourceConfig                      types.Object                    `tfsdk:"resource_config"`
 }
 
 type GitComments struct {
@@ -659,7 +620,6 @@ func (p Project) RequiresUpdateAfterCreation() bool {
 		!p.PrioritiseProductionBuilds.IsNull() ||
 		!p.DirectoryListing.IsNull() ||
 		!p.SkewProtection.IsNull() ||
-		p.ResourceConfig != nil ||
 		!p.NodeVersion.IsNull()
 
 }
@@ -723,6 +683,14 @@ func parseEnvironment(ctx context.Context, vars []EnvironmentItem) (out []client
 
 func (p *Project) toCreateProjectRequest(ctx context.Context, envs []EnvironmentItem) (req client.CreateProjectRequest, diags diag.Diagnostics) {
 	clientEnvs, diags := parseEnvironment(ctx, envs)
+	if diags.HasError() {
+		return req, diags
+	}
+	resourceConfig, diags := p.resourceConfig(ctx)
+	if diags.HasError() {
+		return req, diags
+	}
+
 	return client.CreateProjectRequest{
 		BuildCommand:                      p.BuildCommand.ValueStringPointer(),
 		CommandForIgnoringBuildStep:       p.IgnoreCommand.ValueStringPointer(),
@@ -738,6 +706,7 @@ func (p *Project) toCreateProjectRequest(ctx context.Context, envs []Environment
 		PublicSource:                      p.PublicSource.ValueBoolPointer(),
 		RootDirectory:                     p.RootDirectory.ValueStringPointer(),
 		ServerlessFunctionRegion:          p.ServerlessFunctionRegion.ValueString(),
+		ResourceConfig:                    resourceConfig.toClientResourceConfig(),
 	}, diags
 }
 
@@ -768,6 +737,10 @@ func (p *Project) toUpdateProjectRequest(ctx context.Context, oldName string) (r
 	if diags.HasError() {
 		return req, diags
 	}
+	resourceConfig, diags := p.resourceConfig(ctx)
+	if diags.HasError() {
+		return req, diags
+	}
 	return client.UpdateProjectRequest{
 		BuildCommand:                         p.BuildCommand.ValueStringPointer(),
 		CommandForIgnoringBuildStep:          p.IgnoreCommand.ValueStringPointer(),
@@ -796,7 +769,7 @@ func (p *Project) toUpdateProjectRequest(ctx context.Context, oldName string) (r
 		DirectoryListing:                     p.DirectoryListing.ValueBool(),
 		SkewProtectionMaxAge:                 toSkewProtectionAge(p.SkewProtection),
 		GitComments:                          gc.toUpdateProjectRequest(),
-		ResourceConfig:                       p.ResourceConfig.toUpdateProjectRequest(),
+		ResourceConfig:                       resourceConfig.toClientResourceConfig(),
 		NodeVersion:                          p.NodeVersion.ValueString(),
 	}, nil
 }
@@ -1026,22 +999,37 @@ func (o *OIDCTokenConfig) toUpdateProjectRequest() *client.OIDCTokenConfig {
 	}
 }
 
+var resourceConfigAttrType = types.ObjectType{
+	AttrTypes: map[string]attr.Type{
+		"function_default_cpu_type": types.StringType,
+		"function_default_timeout":  types.Int64Type,
+	},
+}
+
 type ResourceConfig struct {
-	FunctionDefaultMemoryType types.String `tfsdk:"function_default_cpu_type"`
-	FunctionDefaultTimeout    types.Int64  `tfsdk:"function_default_timeout"`
+	FunctionDefaultCPUType types.String `tfsdk:"function_default_cpu_type"`
+	FunctionDefaultTimeout types.Int64  `tfsdk:"function_default_timeout"`
+}
+
+func (p *Project) resourceConfig(ctx context.Context) (rc *ResourceConfig, diags diag.Diagnostics) {
+	diags = p.ResourceConfig.As(ctx, &rc, basetypes.ObjectAsOptions{
+		UnhandledNullAsEmpty:    true,
+		UnhandledUnknownAsEmpty: true,
+	})
+	return rc, diags
 }
 
-func (r *ResourceConfig) toUpdateProjectRequest() *client.ResourceConfig {
-	resourceConfig := &client.ResourceConfig{}
+func (r *ResourceConfig) toClientResourceConfig() *client.ResourceConfig {
 	if r == nil {
-		return resourceConfig
+		return nil
 	}
+	var resourceConfig = &client.ResourceConfig{}
 
-	if !r.FunctionDefaultMemoryType.IsNull() {
-		resourceConfig.FunctionDefaultMemoryType = r.FunctionDefaultMemoryType.ValueString()
+	if !r.FunctionDefaultCPUType.IsUnknown() {
+		resourceConfig.FunctionDefaultMemoryType = r.FunctionDefaultCPUType.ValueStringPointer()
 	}
-	if !r.FunctionDefaultTimeout.IsNull() {
-		resourceConfig.FunctionDefaultTimeout = r.FunctionDefaultTimeout.ValueInt64()
+	if !r.FunctionDefaultTimeout.IsUnknown() {
+		resourceConfig.FunctionDefaultTimeout = r.FunctionDefaultTimeout.ValueInt64Pointer()
 	}
 	return resourceConfig
 }
@@ -1260,14 +1248,12 @@ func convertResponseToProject(ctx context.Context, response client.ProjectRespon
 		oidcTokenConfig.IssuerMode = types.StringValue(response.OIDCTokenConfig.IssuerMode)
 	}
 
-	resourceConfig := &ResourceConfig{}
-	if response.ResourceConfig != nil && plan.ResourceConfig != nil {
-		if !plan.ResourceConfig.FunctionDefaultMemoryType.IsNull() {
-			resourceConfig.FunctionDefaultMemoryType = types.StringValue(response.ResourceConfig.FunctionDefaultMemoryType)
-		}
-		if !plan.ResourceConfig.FunctionDefaultTimeout.IsNull() {
-			resourceConfig.FunctionDefaultTimeout = types.Int64Value(response.ResourceConfig.FunctionDefaultTimeout)
-		}
+	resourceConfig := types.ObjectNull(resourceConfigAttrType.AttrTypes)
+	if response.ResourceConfig != nil {
+		resourceConfig = types.ObjectValueMust(resourceConfigAttrType.AttrTypes, map[string]attr.Value{
+			"function_default_cpu_type": types.StringPointerValue(response.ResourceConfig.FunctionDefaultMemoryType),
+			"function_default_timeout":  types.Int64PointerValue(response.ResourceConfig.FunctionDefaultTimeout),
+		})
 	}
 
 	var oal *OptionsAllowlist
@@ -1531,9 +1517,10 @@ func (r *projectResource) Create(ctx context.Context, req resource.CreateRequest
 		)
 		return
 	}
-	tflog.Info(ctx, "created project", map[string]any{
+	tflog.Error(ctx, "created project", map[string]any{
 		"team_id":    result.TeamID.ValueString(),
 		"project_id": result.ID.ValueString(),
+		"project":    result,
 	})
 	diags = resp.State.Set(ctx, result)
 	resp.Diagnostics.Append(diags...)

vercel/resource_project_test.go

@@ -82,6 +82,8 @@ func TestAcc_Project(t *testing.T) {
 					resource.TestCheckResourceAttr("vercel_project.test", "skew_protection", "7 days"),
 					resource.TestCheckResourceAttr("vercel_project.test", "oidc_token_config.enabled", "true"),
 					resource.TestCheckResourceAttr("vercel_project.test", "oidc_token_config.issuer_mode", "team"),
+					resource.TestCheckResourceAttr("vercel_project.test", "resource_config.function_default_cpu_type", "standard"),
+					resource.TestCheckResourceAttr("vercel_project.test", "resource_config.function_default_timeout", "60"),
 				),
 			},
 			// Update testing
@@ -923,6 +925,10 @@ resource "vercel_project" "test" {
     enabled = true
     issuer_mode = "team"
   }
+  resource_config = {
+      function_default_cpu_type = "standard"
+      function_default_timeout = 60
+  }
   environment = [
     {
       key    = "foo"