Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Follow up of the EnsureNoError deprecation #263

Merged
merged 1 commit into from
Apr 9, 2023
Merged

Follow up of the EnsureNoError deprecation #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions google/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down
7 changes: 2 additions & 5 deletions rules/google_composer_environment_invalid_machine_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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
}
Expand Down
7 changes: 2 additions & 5 deletions rules/google_compute_instance_invalid_machine_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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
}
Expand Down
7 changes: 2 additions & 5 deletions rules/google_compute_instance_template_invalid_machine_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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
}
Expand Down
8 changes: 2 additions & 6 deletions rules/google_compute_reservation_invalid_machine_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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
}
Expand Down
13 changes: 6 additions & 7 deletions rules/google_compute_resource_policy_invalid_name.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
7 changes: 2 additions & 5 deletions rules/google_container_cluster_invalid_machine_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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
}
Expand Down
7 changes: 2 additions & 5 deletions rules/google_container_node_pool_invalid_machine_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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
}
Expand Down
7 changes: 2 additions & 5 deletions rules/google_dataflow_job_invalid_machine_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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
}
Expand Down
7 changes: 2 additions & 5 deletions rules/google_project_iam_audit_config_invalid_member.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -82,7 +79,7 @@ func (r *GoogleProjectIamAuditConfigInvalidMemberRule) Check(runner tflint.Runne
}
}
return nil
})
}, nil)
if err != nil {
return err
}
Expand Down
7 changes: 2 additions & 5 deletions rules/google_project_iam_binding_invalid_member.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -73,7 +70,7 @@ func (r *GoogleProjectIamBindingInvalidMemberRule) Check(runner tflint.Runner) e
}
}
return nil
})
}, nil)
if err != nil {
return err
}
Expand Down
7 changes: 2 additions & 5 deletions rules/google_project_iam_member_invalid_member.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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
}
Expand Down
7 changes: 2 additions & 5 deletions rules/google_project_iam_policy_invalid_member.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -74,7 +71,7 @@ func (r *GoogleProjectIamPolicyInvalidMemberRule) Check(runner tflint.Runner) er

}
return nil
})
}, nil)
if err != nil {
return err
}
Expand Down
7 changes: 2 additions & 5 deletions rules/rule.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -80,7 +77,7 @@ func (r *{{ .RuleNameCC }}Rule) Check(runner tflint.Runner) error {
)
}
return nil
})
}, nil)
if err != nil {
return err
}
Expand Down