Follow up of the EnsureNoError deprecation (#263)

wata727 · web-flow · commit 6f02250877d4 · 2023-04-09T22:18:41.000+09:00
diff --git a/google/provider.go b/google/provider.go
@@ -41,9 +41,12 @@ func GetProject(runner tflint.Runner) (string, error) {
 
 		if attr, exists := provider.Body.Attributes["project"]; exists {
 			var project string
-			if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &project, opts), func() error { return nil }); err != nil {
-				return project, err
-			}
+			err := runner.EvaluateExpr(attr.Expr, func(val string) error {
+				project = val
+				return nil
+			}, opts)
+
+			return project, err
 		}
 	}
 
diff --git a/rules/google_composer_environment_invalid_machine_type.go b/rules/google_composer_environment_invalid_machine_type.go
@@ -68,10 +68,7 @@ func (r *GoogleComposerEnvironmentInvalidMachineTypeRule) Check(runner tflint.Ru
 					continue
 				}
 
-				var machineType string
-				err := runner.EvaluateExpr(attribute.Expr, &machineType, nil)
-
-				err = runner.EnsureNoError(err, func() error {
+				err := runner.EvaluateExpr(attribute.Expr, func(machineType string) error {
 					if validMachineTypes[machineType] || isCustomType(machineType) {
 						return nil
 					}
@@ -81,7 +78,7 @@ func (r *GoogleComposerEnvironmentInvalidMachineTypeRule) Check(runner tflint.Ru
 						fmt.Sprintf(`"%s" is an invalid as machine type`, machineType),
 						attribute.Expr.Range(),
 					)
-				})
+				}, nil)
 				if err != nil {
 					return err
 				}
diff --git a/rules/google_compute_instance_invalid_machine_type.go b/rules/google_compute_instance_invalid_machine_type.go
@@ -52,10 +52,7 @@ func (r *GoogleComputeInstanceInvalidMachineTypeRule) Check(runner tflint.Runner
 			continue
 		}
 
-		var machineType string
-		err := runner.EvaluateExpr(attribute.Expr, &machineType, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func(machineType string) error {
 			if validMachineTypes[machineType] || isCustomType(machineType) {
 				return nil
 			}
@@ -65,7 +62,7 @@ func (r *GoogleComputeInstanceInvalidMachineTypeRule) Check(runner tflint.Runner
 				fmt.Sprintf(`"%s" is an invalid as machine type`, machineType),
 				attribute.Expr.Range(),
 			)
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}
diff --git a/rules/google_compute_instance_template_invalid_machine_type.go b/rules/google_compute_instance_template_invalid_machine_type.go
@@ -52,10 +52,7 @@ func (r *GoogleComputeInstanceTemplateInvalidMachineTypeRule) Check(runner tflin
 			continue
 		}
 
-		var machineType string
-		err := runner.EvaluateExpr(attribute.Expr, &machineType, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func(machineType string) error {
 			if validMachineTypes[machineType] || isCustomType(machineType) {
 				return nil
 			}
@@ -65,7 +62,7 @@ func (r *GoogleComputeInstanceTemplateInvalidMachineTypeRule) Check(runner tflin
 				fmt.Sprintf(`"%s" is an invalid as machine type`, machineType),
 				attribute.Expr.Range(),
 			)
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}
diff --git a/rules/google_compute_reservation_invalid_machine_type.go b/rules/google_compute_reservation_invalid_machine_type.go
@@ -68,10 +68,7 @@ func (r *GoogleComputeReservationInvalidMachineTypeRule) Check(runner tflint.Run
 					continue
 				}
 
-				var machineType string
-				err := runner.EvaluateExpr(attribute.Expr, &machineType, nil)
-
-				err = runner.EnsureNoError(err, func() error {
+				err := runner.EvaluateExpr(attribute.Expr, func(machineType string) error {
 					if validMachineTypes[machineType] || isCustomType(machineType) {
 						return nil
 					}
@@ -81,8 +78,7 @@ func (r *GoogleComputeReservationInvalidMachineTypeRule) Check(runner tflint.Run
 						fmt.Sprintf(`"%s" is an invalid as machine type`, machineType),
 						attribute.Expr.Range(),
 					)
-				})
-
+				}, nil)
 				if err != nil {
 					return err
 				}
diff --git a/rules/google_compute_resource_policy_invalid_name.go b/rules/google_compute_resource_policy_invalid_name.go
@@ -56,18 +56,17 @@ func (r *GoogleComputeResourcePolicyInvalidNameRule) Check(runner tflint.Runner)
 			continue
 		}
 
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
+		err := runner.EvaluateExpr(attribute.Expr, func(val string) error {
+			validateFunc := validateRegexp(`^[a-z]([-a-z0-9]*[a-z0-9])$`)
 
-		validateFunc := validateRegexp(`^[a-z]([-a-z0-9]*[a-z0-9])$`)
-
-		err = runner.EnsureNoError(err, func() error {
 			_, errors := validateFunc(val, r.attributeName)
 			for _, err := range errors {
-				runner.EmitIssue(r, err.Error(), attribute.Expr.Range())
+				if err := runner.EmitIssue(r, err.Error(), attribute.Expr.Range()); err != nil {
+					return err
+				}
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}
diff --git a/rules/google_container_cluster_invalid_machine_type.go b/rules/google_container_cluster_invalid_machine_type.go
@@ -60,10 +60,7 @@ func (r *GoogleContainerClusterInvalidMachineTypeRule) Check(runner tflint.Runne
 				continue
 			}
 
-			var machineType string
-			err := runner.EvaluateExpr(attribute.Expr, &machineType, nil)
-
-			err = runner.EnsureNoError(err, func() error {
+			err := runner.EvaluateExpr(attribute.Expr, func(machineType string) error {
 				if validMachineTypes[machineType] || isCustomType(machineType) {
 					return nil
 				}
@@ -73,7 +70,7 @@ func (r *GoogleContainerClusterInvalidMachineTypeRule) Check(runner tflint.Runne
 					fmt.Sprintf(`"%s" is an invalid as machine type`, machineType),
 					attribute.Expr.Range(),
 				)
-			})
+			}, nil)
 			if err != nil {
 				return err
 			}
diff --git a/rules/google_container_node_pool_invalid_machine_type.go b/rules/google_container_node_pool_invalid_machine_type.go
@@ -60,10 +60,7 @@ func (r *GoogleContainerNodePoolInvalidMachineTypeRule) Check(runner tflint.Runn
 				continue
 			}
 
-			var machineType string
-			err := runner.EvaluateExpr(attribute.Expr, &machineType, nil)
-
-			err = runner.EnsureNoError(err, func() error {
+			err := runner.EvaluateExpr(attribute.Expr, func(machineType string) error {
 				if validMachineTypes[machineType] || isCustomType(machineType) {
 					return nil
 				}
@@ -73,7 +70,7 @@ func (r *GoogleContainerNodePoolInvalidMachineTypeRule) Check(runner tflint.Runn
 					fmt.Sprintf(`"%s" is an invalid as machine type`, machineType),
 					attribute.Expr.Range(),
 				)
-			})
+			}, nil)
 			if err != nil {
 				return err
 			}
diff --git a/rules/google_dataflow_job_invalid_machine_type.go b/rules/google_dataflow_job_invalid_machine_type.go
@@ -52,10 +52,7 @@ func (r *GoogleDataflowJobInvalidMachineTypeRule) Check(runner tflint.Runner) er
 			continue
 		}
 
-		var machineType string
-		err := runner.EvaluateExpr(attribute.Expr, &machineType, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func(machineType string) error {
 			if validMachineTypes[machineType] || isCustomType(machineType) {
 				return nil
 			}
@@ -65,7 +62,7 @@ func (r *GoogleDataflowJobInvalidMachineTypeRule) Check(runner tflint.Runner) er
 				fmt.Sprintf(`"%s" is an invalid as machine type`, machineType),
 				attribute.Expr.Range(),
 			)
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}
diff --git a/rules/google_project_iam_audit_config_invalid_member.go b/rules/google_project_iam_audit_config_invalid_member.go
@@ -68,10 +68,7 @@ func (r *GoogleProjectIamAuditConfigInvalidMemberRule) Check(runner tflint.Runne
 				continue
 			}
 
-			var members []string
-			err := runner.EvaluateExpr(attribute.Expr, &members, nil)
-
-			err = runner.EnsureNoError(err, func() error {
+			err := runner.EvaluateExpr(attribute.Expr, func(members []string) error {
 				for _, member := range members {
 					if !isValidIAMMemberFormat(member) {
 						return runner.EmitIssue(
@@ -82,7 +79,7 @@ func (r *GoogleProjectIamAuditConfigInvalidMemberRule) Check(runner tflint.Runne
 					}
 				}
 				return nil
-			})
+			}, nil)
 			if err != nil {
 				return err
 			}
diff --git a/rules/google_project_iam_binding_invalid_member.go b/rules/google_project_iam_binding_invalid_member.go
@@ -59,10 +59,7 @@ func (r *GoogleProjectIamBindingInvalidMemberRule) Check(runner tflint.Runner) e
 			continue
 		}
 
-		var members []string
-		err := runner.EvaluateExpr(attribute.Expr, &members, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func(members []string) error {
 			for _, member := range members {
 				if !isValidIAMMemberFormat(member) {
 					return runner.EmitIssue(
@@ -73,7 +70,7 @@ func (r *GoogleProjectIamBindingInvalidMemberRule) Check(runner tflint.Runner) e
 				}
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}
diff --git a/rules/google_project_iam_member_invalid_member.go b/rules/google_project_iam_member_invalid_member.go
@@ -59,10 +59,7 @@ func (r *GoogleProjectIamMemberInvalidMemberRule) Check(runner tflint.Runner) er
 			continue
 		}
 
-		var member string
-		err := runner.EvaluateExpr(attribute.Expr, &member, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func(member string) error {
 			if isValidIAMMemberFormat(member) {
 				return nil
 			}
@@ -71,7 +68,7 @@ func (r *GoogleProjectIamMemberInvalidMemberRule) Check(runner tflint.Runner) er
 				fmt.Sprintf("%s is an invalid member format", member),
 				attribute.Expr.Range(),
 			)
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}
diff --git a/rules/google_project_iam_policy_invalid_member.go b/rules/google_project_iam_policy_invalid_member.go
@@ -59,10 +59,7 @@ func (r *GoogleProjectIamPolicyInvalidMemberRule) Check(runner tflint.Runner) er
 			continue
 		}
 
-		var members []string
-		err := runner.EvaluateExpr(attribute.Expr, &members, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func(members []string) error {
 			for _, member := range members {
 				if !isValidIAMMemberFormat(member) {
 					return runner.EmitIssue(
@@ -74,7 +71,7 @@ func (r *GoogleProjectIamPolicyInvalidMemberRule) Check(runner tflint.Runner) er
 
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}
diff --git a/rules/rule.go.tmpl b/rules/rule.go.tmpl
@@ -68,10 +68,7 @@ func (r *{{ .RuleNameCC }}Rule) Check(runner tflint.Runner) error {
 			continue
 		}
 
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			if val == "" {
 				runner.EmitIssue(
 					r,
@@ -80,7 +77,7 @@ func (r *{{ .RuleNameCC }}Rule) Check(runner tflint.Runner) error {
 				)
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}

Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,12 @@ func GetProject(runner tflint.Runner) (string, error) {`
`41`	`41`
`42`	`42`	`if attr, exists := provider.Body.Attributes["project"]; exists {`
`43`	`43`	`var project string`
`44`		`- if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &project, opts), func() error { return nil }); err != nil {`
`45`		`- return project, err`
`46`		`- }`
	`44`	`+ err := runner.EvaluateExpr(attr.Expr, func(val string) error {`
	`45`	`+ project = val`
	`46`	`+ return nil`
	`47`	`+ }, opts)`
	`48`	`+`
	`49`	`+ return project, err`
`47`	`50`	`}`
`48`	`51`	`}`
`49`	`52`
Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,7 @@ func (r *GoogleComposerEnvironmentInvalidMachineTypeRule) Check(runner tflint.Ru`
`68`	`68`	`continue`
`69`	`69`	`}`
`70`	`70`
`71`		`- var machineType string`
`72`		`- err := runner.EvaluateExpr(attribute.Expr, &machineType, nil)`
`73`		`-`
`74`		`- err = runner.EnsureNoError(err, func() error {`
	`71`	`+ err := runner.EvaluateExpr(attribute.Expr, func(machineType string) error {`
`75`	`72`	`if validMachineTypes[machineType] \|\| isCustomType(machineType) {`
`76`	`73`	`return nil`
`77`	`74`	`}`
`@@ -81,7 +78,7 @@ func (r *GoogleComposerEnvironmentInvalidMachineTypeRule) Check(runner tflint.Ru`
`81`	`78`	fmt.Sprintf(`"%s" is an invalid as machine type`, machineType),
`82`	`79`	`attribute.Expr.Range(),`
`83`	`80`	`)`
`84`		`- })`
	`81`	`+ }, nil)`
`85`	`82`	`if err != nil {`
`86`	`83`	`return err`
`87`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,10 +52,7 @@ func (r *GoogleComputeInstanceInvalidMachineTypeRule) Check(runner tflint.Runner`
`52`	`52`	`continue`
`53`	`53`	`}`
`54`	`54`
`55`		`- var machineType string`
`56`		`- err := runner.EvaluateExpr(attribute.Expr, &machineType, nil)`
`57`		`-`
`58`		`- err = runner.EnsureNoError(err, func() error {`
	`55`	`+ err := runner.EvaluateExpr(attribute.Expr, func(machineType string) error {`
`59`	`56`	`if validMachineTypes[machineType] \|\| isCustomType(machineType) {`
`60`	`57`	`return nil`
`61`	`58`	`}`
`@@ -65,7 +62,7 @@ func (r *GoogleComputeInstanceInvalidMachineTypeRule) Check(runner tflint.Runner`
`65`	`62`	fmt.Sprintf(`"%s" is an invalid as machine type`, machineType),
`66`	`63`	`attribute.Expr.Range(),`
`67`	`64`	`)`
`68`		`- })`
	`65`	`+ }, nil)`
`69`	`66`	`if err != nil {`
`70`	`67`	`return err`
`71`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,7 @@ func (r *GoogleComputeReservationInvalidMachineTypeRule) Check(runner tflint.Run`
`68`	`68`	`continue`
`69`	`69`	`}`
`70`	`70`
`71`		`- var machineType string`
`72`		`- err := runner.EvaluateExpr(attribute.Expr, &machineType, nil)`
`73`		`-`
`74`		`- err = runner.EnsureNoError(err, func() error {`
	`71`	`+ err := runner.EvaluateExpr(attribute.Expr, func(machineType string) error {`
`75`	`72`	`if validMachineTypes[machineType] \|\| isCustomType(machineType) {`
`76`	`73`	`return nil`
`77`	`74`	`}`
`@@ -81,8 +78,7 @@ func (r *GoogleComputeReservationInvalidMachineTypeRule) Check(runner tflint.Run`
`81`	`78`	fmt.Sprintf(`"%s" is an invalid as machine type`, machineType),
`82`	`79`	`attribute.Expr.Range(),`
`83`	`80`	`)`
`84`		`- })`
`85`		`-`
	`81`	`+ }, nil)`
`86`	`82`	`if err != nil {`
`87`	`83`	`return err`
`88`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,10 +60,7 @@ func (r *GoogleContainerClusterInvalidMachineTypeRule) Check(runner tflint.Runne`
`60`	`60`	`continue`
`61`	`61`	`}`
`62`	`62`
`63`		`- var machineType string`
`64`		`- err := runner.EvaluateExpr(attribute.Expr, &machineType, nil)`
`65`		`-`
`66`		`- err = runner.EnsureNoError(err, func() error {`
	`63`	`+ err := runner.EvaluateExpr(attribute.Expr, func(machineType string) error {`
`67`	`64`	`if validMachineTypes[machineType] \|\| isCustomType(machineType) {`
`68`	`65`	`return nil`
`69`	`66`	`}`
`@@ -73,7 +70,7 @@ func (r *GoogleContainerClusterInvalidMachineTypeRule) Check(runner tflint.Runne`
`73`	`70`	fmt.Sprintf(`"%s" is an invalid as machine type`, machineType),
`74`	`71`	`attribute.Expr.Range(),`
`75`	`72`	`)`
`76`		`- })`
	`73`	`+ }, nil)`
`77`	`74`	`if err != nil {`
`78`	`75`	`return err`
`79`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,10 +52,7 @@ func (r *GoogleDataflowJobInvalidMachineTypeRule) Check(runner tflint.Runner) er`
`52`	`52`	`continue`
`53`	`53`	`}`
`54`	`54`
`55`		`- var machineType string`
`56`		`- err := runner.EvaluateExpr(attribute.Expr, &machineType, nil)`
`57`		`-`
`58`		`- err = runner.EnsureNoError(err, func() error {`
	`55`	`+ err := runner.EvaluateExpr(attribute.Expr, func(machineType string) error {`
`59`	`56`	`if validMachineTypes[machineType] \|\| isCustomType(machineType) {`
`60`	`57`	`return nil`
`61`	`58`	`}`
`@@ -65,7 +62,7 @@ func (r *GoogleDataflowJobInvalidMachineTypeRule) Check(runner tflint.Runner) er`
`65`	`62`	fmt.Sprintf(`"%s" is an invalid as machine type`, machineType),
`66`	`63`	`attribute.Expr.Range(),`
`67`	`64`	`)`
`68`		`- })`
	`65`	`+ }, nil)`
`69`	`66`	`if err != nil {`
`70`	`67`	`return err`
`71`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,7 @@ func (r *GoogleProjectIamAuditConfigInvalidMemberRule) Check(runner tflint.Runne`
`68`	`68`	`continue`
`69`	`69`	`}`
`70`	`70`
`71`		`- var members []string`
`72`		`- err := runner.EvaluateExpr(attribute.Expr, &members, nil)`
`73`		`-`
`74`		`- err = runner.EnsureNoError(err, func() error {`
	`71`	`+ err := runner.EvaluateExpr(attribute.Expr, func(members []string) error {`
`75`	`72`	`for _, member := range members {`
`76`	`73`	`if !isValidIAMMemberFormat(member) {`
`77`	`74`	`return runner.EmitIssue(`
`@@ -82,7 +79,7 @@ func (r *GoogleProjectIamAuditConfigInvalidMemberRule) Check(runner tflint.Runne`
`82`	`79`	`}`
`83`	`80`	`}`
`84`	`81`	`return nil`
`85`		`- })`
	`82`	`+ }, nil)`
`86`	`83`	`if err != nil {`
`87`	`84`	`return err`
`88`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,10 +59,7 @@ func (r *GoogleProjectIamBindingInvalidMemberRule) Check(runner tflint.Runner) e`
`59`	`59`	`continue`
`60`	`60`	`}`
`61`	`61`
`62`		`- var members []string`
`63`		`- err := runner.EvaluateExpr(attribute.Expr, &members, nil)`
`64`		`-`
`65`		`- err = runner.EnsureNoError(err, func() error {`
	`62`	`+ err := runner.EvaluateExpr(attribute.Expr, func(members []string) error {`
`66`	`63`	`for _, member := range members {`
`67`	`64`	`if !isValidIAMMemberFormat(member) {`
`68`	`65`	`return runner.EmitIssue(`
`@@ -73,7 +70,7 @@ func (r *GoogleProjectIamBindingInvalidMemberRule) Check(runner tflint.Runner) e`
`73`	`70`	`}`
`74`	`71`	`}`
`75`	`72`	`return nil`
`76`		`- })`
	`73`	`+ }, nil)`
`77`	`74`	`if err != nil {`
`78`	`75`	`return err`
`79`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,7 @@ func (r *{{ .RuleNameCC }}Rule) Check(runner tflint.Runner) error {`
`68`	`68`	`continue`
`69`	`69`	`}`
`70`	`70`
`71`		`- var val string`
`72`		`- err := runner.EvaluateExpr(attribute.Expr, &val, nil)`
`73`		`-`
`74`		`- err = runner.EnsureNoError(err, func() error {`
	`71`	`+ err := runner.EvaluateExpr(attribute.Expr, func (val string) error {`
`75`	`72`	`if val == "" {`
`76`	`73`	`runner.EmitIssue(`
`77`	`74`	`r,`
`@@ -80,7 +77,7 @@ func (r *{{ .RuleNameCC }}Rule) Check(runner tflint.Runner) error {`
`80`	`77`	`)`
`81`	`78`	`}`
`82`	`79`	`return nil`
`83`		`- })`
	`80`	`+ }, nil)`
`84`	`81`	`if err != nil {`
`85`	`82`	`return err`
`86`	`83`	`}`