Follow up of the EnsureNoError deprecation (#481)

Author: wata727

aws/provider.go

@@ -63,66 +63,94 @@ func GetCredentialsFromProvider(runner tflint.Runner) (map[string]Credentials, e
 		opts := &tflint.EvaluateExprOption{ModuleCtx: tflint.RootModuleCtxType}
 
 		if attr, exists := provider.Body.Attributes["access_key"]; exists {
-			if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.AccessKey, opts), func() error { return nil }); err != nil {
+			if err := runner.EvaluateExpr(attr.Expr, func(accessKey string) error {
+				creds.AccessKey = accessKey
+				return nil
+			}, opts); err != nil {
 				return nil, err
 			}
 		}
 
 		if attr, exists := provider.Body.Attributes["secret_key"]; exists {
-			if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.SecretKey, opts), func() error { return nil }); err != nil {
+			if err := runner.EvaluateExpr(attr.Expr, func(secretKey string) error {
+				creds.SecretKey = secretKey
+				return nil
+			}, opts); err != nil {
 				return nil, err
 			}
 		}
 
 		if attr, exists := provider.Body.Attributes["profile"]; exists {
-			if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.Profile, opts), func() error { return nil }); err != nil {
+			if err := runner.EvaluateExpr(attr.Expr, func(profile string) error {
+				creds.Profile = profile
+				return nil
+			}, opts); err != nil {
 				return nil, err
 			}
 		}
 
 		if attr, exists := provider.Body.Attributes["shared_credentials_file"]; exists {
-			if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.CredsFile, opts), func() error { return nil }); err != nil {
+			if err := runner.EvaluateExpr(attr.Expr, func(credsFile string) error {
+				creds.CredsFile = credsFile
+				return nil
+			}, opts); err != nil {
 				return nil, err
 			}
 		}
 
 		if attr, exists := provider.Body.Attributes["region"]; exists {
-			if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.Region, opts), func() error { return nil }); err != nil {
+			if err := runner.EvaluateExpr(attr.Expr, func(region string) error {
+				creds.Region = region
+				return nil
+			}, opts); err != nil {
 				return nil, err
 			}
 		}
 
 		for _, assumeRole := range provider.Body.Blocks {
 			if attr, exists := assumeRole.Body.Attributes["role_arn"]; exists {
-				if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.AssumeRoleARN, opts), func() error { return nil }); err != nil {
+				if err := runner.EvaluateExpr(attr.Expr, func(roleARN string) error {
+					creds.AssumeRoleARN = roleARN
+					return nil
+				}, opts); err != nil {
 					return nil, err
 				}
 			}
 
 			if attr, exists := assumeRole.Body.Attributes["session_name"]; exists {
-				if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.AssumeRoleSessionName, opts), func() error { return nil }); err != nil {
+				if err := runner.EvaluateExpr(attr.Expr, func(sessionName string) error {
+					creds.AssumeRoleSessionName = sessionName
+					return nil
+				}, opts); err != nil {
 					return nil, err
 				}
 			}
 
 			if attr, exists := assumeRole.Body.Attributes["external_id"]; exists {
-				if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.AssumeRoleExternalID, opts), func() error { return nil }); err != nil {
+				if err := runner.EvaluateExpr(attr.Expr, func(id string) error {
+					creds.AssumeRoleExternalID = id
+					return nil
+				}, opts); err != nil {
 					return nil, err
 				}
 			}
 
 			if attr, exists := assumeRole.Body.Attributes["policy"]; exists {
-				if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.AssumeRolePolicy, opts), func() error { return nil }); err != nil {
+				if err := runner.EvaluateExpr(attr.Expr, func(policy string) error {
+					creds.AssumeRolePolicy = policy
+					return nil
+				}, opts); err != nil {
 					return nil, err
 				}
 			}
 		}
 		if attr, exists := provider.Body.Attributes["alias"]; exists {
-			var alas string
-			if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &alas, opts), func() error { return nil }); err != nil {
+			if err := runner.EvaluateExpr(attr.Expr, func(alias string) error {
+				m[alias] = creds
+				return nil
+			}, opts); err != nil {
 				return nil, err
 			}
-			m[alas] = creds
 		} else {
 			m["aws"] = creds
 		}

aws/runner.go

@@ -73,7 +73,13 @@ func (r *Runner) AwsClient(attributes hclext.Attributes) (*Client, error) {
 // If not, the given expression is used as it is
 func (r *Runner) EachStringSliceExprs(expr hcl.Expression, proc func(val string, expr hcl.Expression)) error {
 	var vals []string
-	err := r.EvaluateExpr(expr, &vals, nil)
+	err := r.EvaluateExpr(expr, func(v []string) error {
+		vals = v
+		return nil
+	}, nil)
+	if err != nil {
+		return err
+	}
 
 	exprs, diags := hcl.ExprList(expr)
 	if diags.HasErrors() {
@@ -83,10 +89,8 @@ func (r *Runner) EachStringSliceExprs(expr hcl.Expression, proc func(val string,
 		}
 	}
 
-	return r.EnsureNoError(err, func() error {
-		for idx, val := range vals {
-			proc(val, exprs[idx])
-		}
-		return nil
-	})
+	for idx, val := range vals {
+		proc(val, exprs[idx])
+	}
+	return nil
 }

rules/api/aws_db_instance_invalid_db_subnet_group.go

@@ -91,10 +91,7 @@ func (r *AwsDBInstanceInvalidDBSubnetGroupRule) Check(rr tflint.Runner) error {
 			r.dataPrepared = true
 		}
 
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		return runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			if !r.data[val] {
 				runner.EmitIssue(
 					r,
@@ -103,7 +100,10 @@ func (r *AwsDBInstanceInvalidDBSubnetGroupRule) Check(rr tflint.Runner) error {
 				)
 			}
 			return nil
-		})
+		}, nil)
+		if err != nil {
+			return err
+		}
 	}
 
 	return nil

rules/api/aws_db_instance_invalid_option_group.go

@@ -91,10 +91,7 @@ func (r *AwsDBInstanceInvalidOptionGroupRule) Check(rr tflint.Runner) error {
 			r.dataPrepared = true
 		}
 
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		return runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			if !r.data[val] {
 				runner.EmitIssue(
 					r,
@@ -103,7 +100,10 @@ func (r *AwsDBInstanceInvalidOptionGroupRule) Check(rr tflint.Runner) error {
 				)
 			}
 			return nil
-		})
+		}, nil)
+		if err != nil {
+			return err
+		}
 	}
 
 	return nil

rules/api/aws_db_instance_invalid_parameter_group.go

@@ -91,10 +91,7 @@ func (r *AwsDBInstanceInvalidParameterGroupRule) Check(rr tflint.Runner) error {
 			r.dataPrepared = true
 		}
 
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		return runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			if !r.data[val] {
 				runner.EmitIssue(
 					r,
@@ -103,7 +100,10 @@ func (r *AwsDBInstanceInvalidParameterGroupRule) Check(rr tflint.Runner) error {
 				)
 			}
 			return nil
-		})
+		}, nil)
+		if err != nil {
+			return err
+		}
 	}
 
 	return nil

rules/api/aws_elasticache_cluster_invalid_parameter_group.go

@@ -91,10 +91,7 @@ func (r *AwsElastiCacheClusterInvalidParameterGroupRule) Check(rr tflint.Runner)
 			r.dataPrepared = true
 		}
 
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		return runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			if !r.data[val] {
 				runner.EmitIssue(
 					r,
@@ -103,7 +100,10 @@ func (r *AwsElastiCacheClusterInvalidParameterGroupRule) Check(rr tflint.Runner)
 				)
 			}
 			return nil
-		})
+		}, nil)
+		if err != nil {
+			return err
+		}
 	}
 
 	return nil

rules/api/aws_elasticache_cluster_invalid_subnet_group.go

@@ -91,10 +91,7 @@ func (r *AwsElastiCacheClusterInvalidSubnetGroupRule) Check(rr tflint.Runner) er
 			r.dataPrepared = true
 		}
 
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		return runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			if !r.data[val] {
 				runner.EmitIssue(
 					r,
@@ -103,7 +100,10 @@ func (r *AwsElastiCacheClusterInvalidSubnetGroupRule) Check(rr tflint.Runner) er
 				)
 			}
 			return nil
-		})
+		}, nil)
+		if err != nil {
+			return err
+		}
 	}
 
 	return nil

rules/api/aws_elasticache_replication_group_invalid_parameter_group.go

@@ -91,10 +91,7 @@ func (r *AwsElastiCacheReplicationGroupInvalidParameterGroupRule) Check(rr tflin
 			r.dataPrepared = true
 		}
 
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		return runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			if !r.data[val] {
 				runner.EmitIssue(
 					r,
@@ -103,7 +100,10 @@ func (r *AwsElastiCacheReplicationGroupInvalidParameterGroupRule) Check(rr tflin
 				)
 			}
 			return nil
-		})
+		}, nil)
+		if err != nil {
+			return err
+		}
 	}
 
 	return nil

rules/api/aws_elasticache_replication_group_invalid_subnet_group.go

@@ -91,10 +91,7 @@ func (r *AwsElastiCacheReplicationGroupInvalidSubnetGroupRule) Check(rr tflint.R
 			r.dataPrepared = true
 		}
 
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		return runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			if !r.data[val] {
 				runner.EmitIssue(
 					r,
@@ -103,7 +100,10 @@ func (r *AwsElastiCacheReplicationGroupInvalidSubnetGroupRule) Check(rr tflint.R
 				)
 			}
 			return nil
-		})
+		}, nil)
+		if err != nil {
+			return err
+		}
 	}
 
 	return nil

rules/api/aws_instance_invalid_ami.go

@@ -80,10 +80,7 @@ func (r *AwsInstanceInvalidAMIRule) Check(rr tflint.Runner) error {
 			return err
 		}
 
-		var ami string
-		err = runner.EvaluateExpr(attribute.Expr, &ami, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err = runner.EvaluateExpr(attribute.Expr, func(ami string) error {
 			if !r.amiIDs[ami] {
 				logger.Debug("Fetch AMI images: %s", ami)
 				resp, err := awsClient.EC2.DescribeImages(&ec2.DescribeImagesInput{
@@ -123,7 +120,7 @@ func (r *AwsInstanceInvalidAMIRule) Check(rr tflint.Runner) error {
 				}
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}