Use evaluateCountExpressionValue in validate step

There was a special, duplicate function that could be replaced by calling evaluateCountExpressionValue, and removes duplicate code
hashicorp · Jan 5, 2021 · 33c31dc · 33c31dc
1 parent e974857
commit 33c31dc
Showing 1 changed file with 6 additions and 61 deletions.
diff --git a/terraform/node_resource_validate.go b/terraform/node_resource_validate.go
@@ -11,8 11,6 @@ import (
  "github.com/hashicorp/terraform/provisioners"
  "github.com/hashicorp/terraform/tfdiags"
  "github.com/zclconf/go-cty/cty"
- "github.com/zclconf/go-cty/cty/convert"
- "github.com/zclconf/go-cty/cty/gocty"
 )
 
 // NodeValidatableResource represents a resource that is used for validation
@@ -410,69 408,16 @@ func (n *NodeValidatableResource) validateResource(ctx EvalContext) tfdiags.Diag
  return diags
 }
 
-func validateCount(ctx EvalContext, expr hcl.Expression) tfdiags.Diagnostics {
- if expr == nil {
- return nil
- }
-
- var diags tfdiags.Diagnostics
-
- countVal, countDiags := ctx.EvaluateExpr(expr, cty.Number, nil)
- diags = diags.Append(countDiags)
- if diags.HasErrors() {
- return diags
- }
-
- if countVal.IsNull() {
- diags = diags.Append(&hcl.Diagnostic{
- Severity: hcl.DiagError,
- Summary: "Invalid count argument",
- Detail: `The given "count" argument value is null. An integer is required.`,
- Subject: expr.Range().Ptr(),
- })
- return diags
- }
-
- var err error
- countVal, err = convert.Convert(countVal, cty.Number)
- if err != nil {
- diags = diags.Append(&hcl.Diagnostic{
- Severity: hcl.DiagError,
- Summary: "Invalid count argument",
- Detail: fmt.Sprintf(`The given "count" argument value is unsuitable: %s.`, err),
- Subject: expr.Range().Ptr(),
- })
- return diags
- }
-
 func validateCount(ctx EvalContext, expr hcl.Expression) (diags tfdiags.Diagnostics) {
  val, countDiags := evaluateCountExpressionValue(expr, ctx)
  // If the value isn't known then that's the best we can do for now, but
- // we'll check more thoroughly during the plan walk.
- if !countVal.IsKnown() {
- return diags
- }
-
- // If we _do_ know the value, then we can do a few more checks here.
- var count int
- err = gocty.FromCtyValue(countVal, &count)
- if err != nil {
- // Isn't a whole number, etc.
- diags = diags.Append(&hcl.Diagnostic{
- Severity: hcl.DiagError,
- Summary: "Invalid count argument",
- Detail: fmt.Sprintf(`The given "count" argument value is unsuitable: %s.`, err),
- Subject: expr.Range().Ptr(),
- })
  // we'll check more thoroughly during the plan walk
  if !val.IsKnown() {
  return diags
  }
 
- if count < 0 {
- diags = diags.Append(&hcl.Diagnostic{
- Severity: hcl.DiagError,
- Summary: "Invalid count argument",
- Detail: `The given "count" argument value is unsuitable: count cannot be negative.`,
- Subject: expr.Range().Ptr(),
- })
- return diags
  if countDiags.HasErrors() {
  diags = diags.Append(countDiags)
  }
 
  return diags