From 6f02250877d4c377380c19bbe6fdb542a6ed1a4f Mon Sep 17 00:00:00 2001 From: Kazuma Watanabe Date: Sun, 9 Apr 2023 22:18:41 +0900 Subject: [PATCH] Follow up of the EnsureNoError deprecation (#263) --- google/provider.go | 9 ++++++--- ...gle_composer_environment_invalid_machine_type.go | 7 ++----- .../google_compute_instance_invalid_machine_type.go | 7 ++----- ...ompute_instance_template_invalid_machine_type.go | 7 ++----- ...ogle_compute_reservation_invalid_machine_type.go | 8 ++------ .../google_compute_resource_policy_invalid_name.go | 13 ++++++------- ...google_container_cluster_invalid_machine_type.go | 7 ++----- ...ogle_container_node_pool_invalid_machine_type.go | 7 ++----- rules/google_dataflow_job_invalid_machine_type.go | 7 ++----- ...oogle_project_iam_audit_config_invalid_member.go | 7 ++----- rules/google_project_iam_binding_invalid_member.go | 7 ++----- rules/google_project_iam_member_invalid_member.go | 7 ++----- rules/google_project_iam_policy_invalid_member.go | 7 ++----- rules/rule.go.tmpl | 7 ++----- 14 files changed, 36 insertions(+), 71 deletions(-) diff --git a/google/provider.go b/google/provider.go index 14f2950..15ef3d0 100644 --- 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 index 8819103..5f12079 100644 --- 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 index e8c3a05..b41f8be 100644 --- 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 index 1e59b7d..1df4cda 100644 --- 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 index 7c494bb..8903ef5 100644 --- 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 index a1cb18e..928772d 100644 --- 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 index 57e690b..40b082a 100644 --- 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 index facb6f4..e7ba72e 100644 --- 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 index 3a81618..dde6e91 100644 --- 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 index 664adc3..90c8da9 100644 --- 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 index 1012c4c..3c3dc86 100644 --- 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 index 58c556b..97642aa 100644 --- 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 index 47e037a..194db8e 100644 --- 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 index 7700f7f..66a3dab 100644 --- 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 }