Skip to content

Commit 18ba742

Browse files
wata727wata727
authored
Follow up of the EnsureNoError deprecation (#481)
1 parent 5f6887e commit 18ba742

File tree

1,451 files changed

+3022
-7421
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,451 files changed

+3022
-7421
lines changed

‎aws/provider.go

Lines changed: 40 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,66 +63,94 @@ func GetCredentialsFromProvider(runner tflint.Runner) (map[string]Credentials, e
6363
opts := &tflint.EvaluateExprOption{ModuleCtx: tflint.RootModuleCtxType}
6464

6565
if attr, exists := provider.Body.Attributes["access_key"]; exists {
66-
if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.AccessKey, opts), func() error { return nil }); err != nil {
66+
if err := runner.EvaluateExpr(attr.Expr, func(accessKey string) error {
67+
creds.AccessKey = accessKey
68+
return nil
69+
}, opts); err != nil {
6770
return nil, err
6871
}
6972
}
7073

7174
if attr, exists := provider.Body.Attributes["secret_key"]; exists {
72-
if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.SecretKey, opts), func() error { return nil }); err != nil {
75+
if err := runner.EvaluateExpr(attr.Expr, func(secretKey string) error {
76+
creds.SecretKey = secretKey
77+
return nil
78+
}, opts); err != nil {
7379
return nil, err
7480
}
7581
}
7682

7783
if attr, exists := provider.Body.Attributes["profile"]; exists {
78-
if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.Profile, opts), func() error { return nil }); err != nil {
84+
if err := runner.EvaluateExpr(attr.Expr, func(profile string) error {
85+
creds.Profile = profile
86+
return nil
87+
}, opts); err != nil {
7988
return nil, err
8089
}
8190
}
8291

8392
if attr, exists := provider.Body.Attributes["shared_credentials_file"]; exists {
84-
if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.CredsFile, opts), func() error { return nil }); err != nil {
93+
if err := runner.EvaluateExpr(attr.Expr, func(credsFile string) error {
94+
creds.CredsFile = credsFile
95+
return nil
96+
}, opts); err != nil {
8597
return nil, err
8698
}
8799
}
88100

89101
if attr, exists := provider.Body.Attributes["region"]; exists {
90-
if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.Region, opts), func() error { return nil }); err != nil {
102+
if err := runner.EvaluateExpr(attr.Expr, func(region string) error {
103+
creds.Region = region
104+
return nil
105+
}, opts); err != nil {
91106
return nil, err
92107
}
93108
}
94109

95110
for _, assumeRole := range provider.Body.Blocks {
96111
if attr, exists := assumeRole.Body.Attributes["role_arn"]; exists {
97-
if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.AssumeRoleARN, opts), func() error { return nil }); err != nil {
112+
if err := runner.EvaluateExpr(attr.Expr, func(roleARN string) error {
113+
creds.AssumeRoleARN = roleARN
114+
return nil
115+
}, opts); err != nil {
98116
return nil, err
99117
}
100118
}
101119

102120
if attr, exists := assumeRole.Body.Attributes["session_name"]; exists {
103-
if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.AssumeRoleSessionName, opts), func() error { return nil }); err != nil {
121+
if err := runner.EvaluateExpr(attr.Expr, func(sessionName string) error {
122+
creds.AssumeRoleSessionName = sessionName
123+
return nil
124+
}, opts); err != nil {
104125
return nil, err
105126
}
106127
}
107128

108129
if attr, exists := assumeRole.Body.Attributes["external_id"]; exists {
109-
if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.AssumeRoleExternalID, opts), func() error { return nil }); err != nil {
130+
if err := runner.EvaluateExpr(attr.Expr, func(id string) error {
131+
creds.AssumeRoleExternalID = id
132+
return nil
133+
}, opts); err != nil {
110134
return nil, err
111135
}
112136
}
113137

114138
if attr, exists := assumeRole.Body.Attributes["policy"]; exists {
115-
if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.AssumeRolePolicy, opts), func() error { return nil }); err != nil {
139+
if err := runner.EvaluateExpr(attr.Expr, func(policy string) error {
140+
creds.AssumeRolePolicy = policy
141+
return nil
142+
}, opts); err != nil {
116143
return nil, err
117144
}
118145
}
119146
}
120147
if attr, exists := provider.Body.Attributes["alias"]; exists {
121-
var alas string
122-
if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &alas, opts), func() error { return nil }); err != nil {
148+
if err := runner.EvaluateExpr(attr.Expr, func(alias string) error {
149+
m[alias] = creds
150+
return nil
151+
}, opts); err != nil {
123152
return nil, err
124153
}
125-
m[alas] = creds
126154
} else {
127155
m["aws"] = creds
128156
}

‎aws/runner.go

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,13 @@ func (r *Runner) AwsClient(attributes hclext.Attributes) (*Client, error) {
7373
// If not, the given expression is used as it is
7474
func (r *Runner) EachStringSliceExprs(expr hcl.Expression, proc func(val string, expr hcl.Expression)) error {
7575
var vals []string
76-
err := r.EvaluateExpr(expr, &vals, nil)
76+
err := r.EvaluateExpr(expr, func(v []string) error {
77+
vals = v
78+
return nil
79+
}, nil)
80+
if err != nil {
81+
return err
82+
}
7783

7884
exprs, diags := hcl.ExprList(expr)
7985
if diags.HasErrors() {
@@ -83,10 +89,8 @@ func (r *Runner) EachStringSliceExprs(expr hcl.Expression, proc func(val string,
8389
}
8490
}
8591

86-
return r.EnsureNoError(err, func() error {
87-
for idx, val := range vals {
88-
proc(val, exprs[idx])
89-
}
90-
return nil
91-
})
92+
for idx, val := range vals {
93+
proc(val, exprs[idx])
94+
}
95+
return nil
9296
}

‎rules/api/aws_db_instance_invalid_db_subnet_group.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,7 @@ func (r *AwsDBInstanceInvalidDBSubnetGroupRule) Check(rr tflint.Runner) error {
9191
r.dataPrepared = true
9292
}
9393

94-
var val string
95-
err := runner.EvaluateExpr(attribute.Expr, &val, nil)
96-
97-
return runner.EnsureNoError(err, func() error {
94+
err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
9895
if !r.data[val] {
9996
runner.EmitIssue(
10097
r,
@@ -103,7 +100,10 @@ func (r *AwsDBInstanceInvalidDBSubnetGroupRule) Check(rr tflint.Runner) error {
103100
)
104101
}
105102
return nil
106-
})
103+
}, nil)
104+
if err != nil {
105+
return err
106+
}
107107
}
108108

109109
return nil

‎rules/api/aws_db_instance_invalid_option_group.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,7 @@ func (r *AwsDBInstanceInvalidOptionGroupRule) Check(rr tflint.Runner) error {
9191
r.dataPrepared = true
9292
}
9393

94-
var val string
95-
err := runner.EvaluateExpr(attribute.Expr, &val, nil)
96-
97-
return runner.EnsureNoError(err, func() error {
94+
err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
9895
if !r.data[val] {
9996
runner.EmitIssue(
10097
r,
@@ -103,7 +100,10 @@ func (r *AwsDBInstanceInvalidOptionGroupRule) Check(rr tflint.Runner) error {
103100
)
104101
}
105102
return nil
106-
})
103+
}, nil)
104+
if err != nil {
105+
return err
106+
}
107107
}
108108

109109
return nil

‎rules/api/aws_db_instance_invalid_parameter_group.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,7 @@ func (r *AwsDBInstanceInvalidParameterGroupRule) Check(rr tflint.Runner) error {
9191
r.dataPrepared = true
9292
}
9393

94-
var val string
95-
err := runner.EvaluateExpr(attribute.Expr, &val, nil)
96-
97-
return runner.EnsureNoError(err, func() error {
94+
err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
9895
if !r.data[val] {
9996
runner.EmitIssue(
10097
r,
@@ -103,7 +100,10 @@ func (r *AwsDBInstanceInvalidParameterGroupRule) Check(rr tflint.Runner) error {
103100
)
104101
}
105102
return nil
106-
})
103+
}, nil)
104+
if err != nil {
105+
return err
106+
}
107107
}
108108

109109
return nil

‎rules/api/aws_elasticache_cluster_invalid_parameter_group.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,7 @@ func (r *AwsElastiCacheClusterInvalidParameterGroupRule) Check(rr tflint.Runner)
9191
r.dataPrepared = true
9292
}
9393

94-
var val string
95-
err := runner.EvaluateExpr(attribute.Expr, &val, nil)
96-
97-
return runner.EnsureNoError(err, func() error {
94+
err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
9895
if !r.data[val] {
9996
runner.EmitIssue(
10097
r,
@@ -103,7 +100,10 @@ func (r *AwsElastiCacheClusterInvalidParameterGroupRule) Check(rr tflint.Runner)
103100
)
104101
}
105102
return nil
106-
})
103+
}, nil)
104+
if err != nil {
105+
return err
106+
}
107107
}
108108

109109
return nil

‎rules/api/aws_elasticache_cluster_invalid_subnet_group.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,7 @@ func (r *AwsElastiCacheClusterInvalidSubnetGroupRule) Check(rr tflint.Runner) er
9191
r.dataPrepared = true
9292
}
9393

94-
var val string
95-
err := runner.EvaluateExpr(attribute.Expr, &val, nil)
96-
97-
return runner.EnsureNoError(err, func() error {
94+
err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
9895
if !r.data[val] {
9996
runner.EmitIssue(
10097
r,
@@ -103,7 +100,10 @@ func (r *AwsElastiCacheClusterInvalidSubnetGroupRule) Check(rr tflint.Runner) er
103100
)
104101
}
105102
return nil
106-
})
103+
}, nil)
104+
if err != nil {
105+
return err
106+
}
107107
}
108108

109109
return nil

‎rules/api/aws_elasticache_replication_group_invalid_parameter_group.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,7 @@ func (r *AwsElastiCacheReplicationGroupInvalidParameterGroupRule) Check(rr tflin
9191
r.dataPrepared = true
9292
}
9393

94-
var val string
95-
err := runner.EvaluateExpr(attribute.Expr, &val, nil)
96-
97-
return runner.EnsureNoError(err, func() error {
94+
err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
9895
if !r.data[val] {
9996
runner.EmitIssue(
10097
r,
@@ -103,7 +100,10 @@ func (r *AwsElastiCacheReplicationGroupInvalidParameterGroupRule) Check(rr tflin
103100
)
104101
}
105102
return nil
106-
})
103+
}, nil)
104+
if err != nil {
105+
return err
106+
}
107107
}
108108

109109
return nil

‎rules/api/aws_elasticache_replication_group_invalid_subnet_group.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,7 @@ func (r *AwsElastiCacheReplicationGroupInvalidSubnetGroupRule) Check(rr tflint.R
9191
r.dataPrepared = true
9292
}
9393

94-
var val string
95-
err := runner.EvaluateExpr(attribute.Expr, &val, nil)
96-
97-
return runner.EnsureNoError(err, func() error {
94+
err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
9895
if !r.data[val] {
9996
runner.EmitIssue(
10097
r,
@@ -103,7 +100,10 @@ func (r *AwsElastiCacheReplicationGroupInvalidSubnetGroupRule) Check(rr tflint.R
103100
)
104101
}
105102
return nil
106-
})
103+
}, nil)
104+
if err != nil {
105+
return err
106+
}
107107
}
108108

109109
return nil

‎rules/api/aws_instance_invalid_ami.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,7 @@ func (r *AwsInstanceInvalidAMIRule) Check(rr tflint.Runner) error {
8080
return err
8181
}
8282

83-
var ami string
84-
err = runner.EvaluateExpr(attribute.Expr, &ami, nil)
85-
86-
err = runner.EnsureNoError(err, func() error {
83+
err = runner.EvaluateExpr(attribute.Expr, func(ami string) error {
8784
if !r.amiIDs[ami] {
8885
logger.Debug("Fetch AMI images: %s", ami)
8986
resp, err := awsClient.EC2.DescribeImages(&ec2.DescribeImagesInput{
@@ -123,7 +120,7 @@ func (r *AwsInstanceInvalidAMIRule) Check(rr tflint.Runner) error {
123120
}
124121
}
125122
return nil
126-
})
123+
}, nil)
127124
if err != nil {
128125
return err
129126
}

0 commit comments

Comments
 (0)