Use errors.Is() instead of EnsureNoError

terraform-linters · Mar 19, 2023 · a56f91b · a56f91b
1 parent 60146bd
commit a56f91b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 17 deletions.
diff --git a/plugin/stub-generator/sources/customrulesettesting/custom/runner.go b/plugin/stub-generator/sources/customrulesettesting/custom/runner.go
@@ -1,6 +1,8 @@
 package custom
 
 import (
+	"errors"
+
 	"github.com/terraform-linters/tflint-plugin-sdk/hclext"
 	"github.com/terraform-linters/tflint-plugin-sdk/tflint"
 )
@@ -51,25 +53,29 @@ func NewRunner(runner tflint.Runner, config *Config) (*Runner, error) {
 		if attr, exists := provider.Body.Attributes["zone"]; exists {
 			var zone string
 			err := runner.EvaluateExpr(attr.Expr, &zone, opts)
-			err = runner.EnsureNoError(err, func() error {
-				config.Zone = zone
-				return nil
-			})
 			if err != nil {
-				return nil, err
+				if errors.Is(err, tflint.ErrUnknownValue) || errors.Is(err, tflint.ErrNullValue) || errors.Is(err, tflint.ErrSensitive) {
+					// skip
+				} else {
+					return nil, err
+				}
+			} else {
+				config.Zone = zone
 			}
 		}
 
 		for _, annotation := range provider.Body.Blocks {
 			if attr, exists := annotation.Body.Attributes["value"]; exists {
 				var val string
 				err := runner.EvaluateExpr(attr.Expr, &val, opts)
-				err = runner.EnsureNoError(err, func() error {
-					config.Annotation = val
-					return nil
-				})
 				if err != nil {
-					return nil, err
+					if errors.Is(err, tflint.ErrUnknownValue) || errors.Is(err, tflint.ErrNullValue) || errors.Is(err, tflint.ErrSensitive) {
+						// skip
+					} else {
+						return nil, err
+					}
+				} else {
+					config.Annotation = val
 				}
 			}
 		}

diff --git a/plugin/stub-generator/sources/example/main.go b/plugin/stub-generator/sources/example/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/terraform-linters/tflint-plugin-sdk/hclext"
@@ -67,14 +68,18 @@ func (r *AwsInstanceExampleTypeRule) Check(runner tflint.Runner) error {
 
 		var instanceType string
 		err := runner.EvaluateExpr(attribute.Expr, &instanceType, nil)
+		if err != nil {
+			if errors.Is(err, tflint.ErrUnknownValue) || errors.Is(err, tflint.ErrNullValue) || errors.Is(err, tflint.ErrSensitive) {
+				continue
+			}
+			return err
+		}
 
-		err = runner.EnsureNoError(err, func() error {
-			return runner.EmitIssue(
-				r,
-				fmt.Sprintf("instance type is %s", instanceType),
-				attribute.Expr.Range(),
-			)
-		})
+		err = runner.EmitIssue(
+			r,
+			fmt.Sprintf("instance type is %s", instanceType),
+			attribute.Expr.Range(),
+		)
 		if err != nil {
 			return err
 		}