Skip to content

Commit af17e6c

Browse files
authored
Suppress unevaluable/unknown/null errors on provider block eval (#327)
1 parent fda117e commit af17e6c

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

aws/provider.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,56 +60,56 @@ func GetCredentialsFromProvider(runner tflint.Runner) (Credentials, error) {
6060
opts := &tflint.EvaluateExprOption{ModuleCtx: tflint.RootModuleCtxType}
6161

6262
if attr, exists := provider.Body.Attributes["access_key"]; exists {
63-
if err := runner.EvaluateExpr(attr.Expr, &creds.AccessKey, opts); err != nil {
63+
if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.AccessKey, opts), func() error { return nil }); err != nil {
6464
return creds, err
6565
}
6666
}
6767

6868
if attr, exists := provider.Body.Attributes["secret_key"]; exists {
69-
if err := runner.EvaluateExpr(attr.Expr, &creds.SecretKey, opts); err != nil {
69+
if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.SecretKey, opts), func() error { return nil }); err != nil {
7070
return creds, err
7171
}
7272
}
7373

7474
if attr, exists := provider.Body.Attributes["profile"]; exists {
75-
if err := runner.EvaluateExpr(attr.Expr, &creds.Profile, opts); err != nil {
75+
if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.Profile, opts), func() error { return nil }); err != nil {
7676
return creds, err
7777
}
7878
}
7979

8080
if attr, exists := provider.Body.Attributes["shared_credentials_file"]; exists {
81-
if err := runner.EvaluateExpr(attr.Expr, &creds.CredsFile, opts); err != nil {
81+
if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.CredsFile, opts), func() error { return nil }); err != nil {
8282
return creds, err
8383
}
8484
}
8585

8686
if attr, exists := provider.Body.Attributes["region"]; exists {
87-
if err := runner.EvaluateExpr(attr.Expr, &creds.Region, opts); err != nil {
87+
if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.Region, opts), func() error { return nil }); err != nil {
8888
return creds, err
8989
}
9090
}
9191

9292
for _, assumeRole := range provider.Body.Blocks {
9393
if attr, exists := assumeRole.Body.Attributes["role_arn"]; exists {
94-
if err := runner.EvaluateExpr(attr.Expr, &creds.AssumeRoleARN, opts); err != nil {
94+
if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.AssumeRoleARN, opts), func() error { return nil }); err != nil {
9595
return creds, err
9696
}
9797
}
9898

9999
if attr, exists := assumeRole.Body.Attributes["session_name"]; exists {
100-
if err := runner.EvaluateExpr(attr.Expr, &creds.AssumeRoleSessionName, opts); err != nil {
100+
if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.AssumeRoleSessionName, opts), func() error { return nil }); err != nil {
101101
return creds, err
102102
}
103103
}
104104

105105
if attr, exists := assumeRole.Body.Attributes["external_id"]; exists {
106-
if err := runner.EvaluateExpr(attr.Expr, &creds.AssumeRoleExternalID, opts); err != nil {
106+
if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.AssumeRoleExternalID, opts), func() error { return nil }); err != nil {
107107
return creds, err
108108
}
109109
}
110110

111111
if attr, exists := assumeRole.Body.Attributes["policy"]; exists {
112-
if err := runner.EvaluateExpr(attr.Expr, &creds.AssumeRolePolicy, opts); err != nil {
112+
if err := runner.EnsureNoError(runner.EvaluateExpr(attr.Expr, &creds.AssumeRolePolicy, opts), func() error { return nil }); err != nil {
113113
return creds, err
114114
}
115115
}

0 commit comments

Comments
 (0)