Skip to content

Commit b23cf9f

Browse files
authored
Replace logger from the standard logger (#340)
1 parent c4647b2 commit b23cf9f

File tree

1,432 files changed

+2897
-3338
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,432 files changed

+2897
-3338
lines changed

aws/client.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package aws
22

33
import (
4-
"log"
5-
64
"github.com/aws/aws-sdk-go/service/ec2"
75
"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
86
"github.com/aws/aws-sdk-go/service/ecs"
@@ -19,6 +17,7 @@ import (
1917
"github.com/aws/aws-sdk-go/service/rds/rdsiface"
2018
awsbase "github.com/hashicorp/aws-sdk-go-base"
2119
"github.com/mitchellh/go-homedir"
20+
"github.com/terraform-linters/tflint-plugin-sdk/logger"
2221
)
2322

2423
//go:generate go run github.com/golang/mock/mockgen -destination mock/ec2.go -package mock github.com/aws/aws-sdk-go/service/ec2/ec2iface EC2API
@@ -56,7 +55,7 @@ type Credentials struct {
5655

5756
// NewClient returns a new Client with configured session
5857
func NewClient(creds Credentials) (*Client, error) {
59-
log.Print("[INFO] Initialize AWS Client")
58+
logger.Info("Initialize AWS Client")
6059

6160
config, err := getBaseConfig(creds)
6261
if err != nil {

aws/runner.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package aws
22

33
import (
4-
"log"
5-
64
"github.com/hashicorp/hcl/v2"
5+
"github.com/terraform-linters/tflint-plugin-sdk/logger"
76
"github.com/terraform-linters/tflint-plugin-sdk/tflint"
87
)
98

@@ -45,7 +44,7 @@ func (r *Runner) EachStringSliceExprs(expr hcl.Expression, proc func(val string,
4544

4645
exprs, diags := hcl.ExprList(expr)
4746
if diags.HasErrors() {
48-
log.Printf("[DEBUG] Expr is not static list: %s", diags)
47+
logger.Debug("Expr is not static list: %s", diags)
4948
for range vals {
5049
exprs = append(exprs, expr)
5150
}

rules/api/aws_alb_invalid_security_group.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ package api
44

55
import (
66
"fmt"
7-
"log"
87

98
hcl "github.com/hashicorp/hcl/v2"
109
"github.com/terraform-linters/tflint-plugin-sdk/hclext"
10+
"github.com/terraform-linters/tflint-plugin-sdk/logger"
1111
"github.com/terraform-linters/tflint-plugin-sdk/tflint"
1212
"github.com/terraform-linters/tflint-ruleset-aws/aws"
1313
)
@@ -77,12 +77,12 @@ func (r *AwsALBInvalidSecurityGroupRule) Check(rr tflint.Runner) error {
7777
}
7878

7979
if !r.dataPrepared {
80-
log.Print("[DEBUG] invoking DescribeSecurityGroups")
80+
logger.Debug("invoking DescribeSecurityGroups")
8181
var err error
8282
r.data, err = runner.AwsClient.DescribeSecurityGroups()
8383
if err != nil {
8484
err := fmt.Errorf("An error occurred while invoking DescribeSecurityGroups; %w", err)
85-
log.Printf("[ERROR] %s", err)
85+
logger.Error("%s", err)
8686
return err
8787
}
8888
r.dataPrepared = true

rules/api/aws_alb_invalid_subnet.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ package api
44

55
import (
66
"fmt"
7-
"log"
87

98
hcl "github.com/hashicorp/hcl/v2"
109
"github.com/terraform-linters/tflint-plugin-sdk/hclext"
10+
"github.com/terraform-linters/tflint-plugin-sdk/logger"
1111
"github.com/terraform-linters/tflint-plugin-sdk/tflint"
1212
"github.com/terraform-linters/tflint-ruleset-aws/aws"
1313
)
@@ -77,12 +77,12 @@ func (r *AwsALBInvalidSubnetRule) Check(rr tflint.Runner) error {
7777
}
7878

7979
if !r.dataPrepared {
80-
log.Print("[DEBUG] invoking DescribeSubnets")
80+
logger.Debug("invoking DescribeSubnets")
8181
var err error
8282
r.data, err = runner.AwsClient.DescribeSubnets()
8383
if err != nil {
8484
err := fmt.Errorf("An error occurred while invoking DescribeSubnets; %w", err)
85-
log.Printf("[ERROR] %s", err)
85+
logger.Error("%s", err)
8686
return err
8787
}
8888
r.dataPrepared = true

rules/api/aws_db_instance_invalid_db_subnet_group.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ package api
44

55
import (
66
"fmt"
7-
"log"
87

98
"github.com/terraform-linters/tflint-plugin-sdk/hclext"
9+
"github.com/terraform-linters/tflint-plugin-sdk/logger"
1010
"github.com/terraform-linters/tflint-plugin-sdk/tflint"
1111
"github.com/terraform-linters/tflint-ruleset-aws/aws"
1212
)
@@ -76,12 +76,12 @@ func (r *AwsDBInstanceInvalidDBSubnetGroupRule) Check(rr tflint.Runner) error {
7676
}
7777

7878
if !r.dataPrepared {
79-
log.Print("[DEBUG] invoking DescribeDBSubnetGroups")
79+
logger.Debug("invoking DescribeDBSubnetGroups")
8080
var err error
8181
r.data, err = runner.AwsClient.DescribeDBSubnetGroups()
8282
if err != nil {
8383
err := fmt.Errorf("An error occurred while invoking DescribeDBSubnetGroups; %w", err)
84-
log.Printf("[ERROR] %s", err)
84+
logger.Error("%s", err)
8585
return err
8686
}
8787
r.dataPrepared = true

rules/api/aws_db_instance_invalid_option_group.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ package api
44

55
import (
66
"fmt"
7-
"log"
87

98
"github.com/terraform-linters/tflint-plugin-sdk/hclext"
9+
"github.com/terraform-linters/tflint-plugin-sdk/logger"
1010
"github.com/terraform-linters/tflint-plugin-sdk/tflint"
1111
"github.com/terraform-linters/tflint-ruleset-aws/aws"
1212
)
@@ -76,12 +76,12 @@ func (r *AwsDBInstanceInvalidOptionGroupRule) Check(rr tflint.Runner) error {
7676
}
7777

7878
if !r.dataPrepared {
79-
log.Print("[DEBUG] invoking DescribeOptionGroups")
79+
logger.Debug("invoking DescribeOptionGroups")
8080
var err error
8181
r.data, err = runner.AwsClient.DescribeOptionGroups()
8282
if err != nil {
8383
err := fmt.Errorf("An error occurred while invoking DescribeOptionGroups; %w", err)
84-
log.Printf("[ERROR] %s", err)
84+
logger.Error("%s", err)
8585
return err
8686
}
8787
r.dataPrepared = true

rules/api/aws_db_instance_invalid_parameter_group.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ package api
44

55
import (
66
"fmt"
7-
"log"
87

98
"github.com/terraform-linters/tflint-plugin-sdk/hclext"
9+
"github.com/terraform-linters/tflint-plugin-sdk/logger"
1010
"github.com/terraform-linters/tflint-plugin-sdk/tflint"
1111
"github.com/terraform-linters/tflint-ruleset-aws/aws"
1212
)
@@ -76,12 +76,12 @@ func (r *AwsDBInstanceInvalidParameterGroupRule) Check(rr tflint.Runner) error {
7676
}
7777

7878
if !r.dataPrepared {
79-
log.Print("[DEBUG] invoking DescribeDBParameterGroups")
79+
logger.Debug("invoking DescribeDBParameterGroups")
8080
var err error
8181
r.data, err = runner.AwsClient.DescribeDBParameterGroups()
8282
if err != nil {
8383
err := fmt.Errorf("An error occurred while invoking DescribeDBParameterGroups; %w", err)
84-
log.Printf("[ERROR] %s", err)
84+
logger.Error("%s", err)
8585
return err
8686
}
8787
r.dataPrepared = true

rules/api/aws_db_instance_invalid_vpc_security_group.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ package api
44

55
import (
66
"fmt"
7-
"log"
87

98
hcl "github.com/hashicorp/hcl/v2"
109
"github.com/terraform-linters/tflint-plugin-sdk/hclext"
10+
"github.com/terraform-linters/tflint-plugin-sdk/logger"
1111
"github.com/terraform-linters/tflint-plugin-sdk/tflint"
1212
"github.com/terraform-linters/tflint-ruleset-aws/aws"
1313
)
@@ -77,12 +77,12 @@ func (r *AwsDBInstanceInvalidVpcSecurityGroupRule) Check(rr tflint.Runner) error
7777
}
7878

7979
if !r.dataPrepared {
80-
log.Print("[DEBUG] invoking DescribeSecurityGroups")
80+
logger.Debug("invoking DescribeSecurityGroups")
8181
var err error
8282
r.data, err = runner.AwsClient.DescribeSecurityGroups()
8383
if err != nil {
8484
err := fmt.Errorf("An error occurred while invoking DescribeSecurityGroups; %w", err)
85-
log.Printf("[ERROR] %s", err)
85+
logger.Error("%s", err)
8686
return err
8787
}
8888
r.dataPrepared = true

rules/api/aws_elasticache_cluster_invalid_parameter_group.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ package api
44

55
import (
66
"fmt"
7-
"log"
87

98
"github.com/terraform-linters/tflint-plugin-sdk/hclext"
9+
"github.com/terraform-linters/tflint-plugin-sdk/logger"
1010
"github.com/terraform-linters/tflint-plugin-sdk/tflint"
1111
"github.com/terraform-linters/tflint-ruleset-aws/aws"
1212
)
@@ -76,12 +76,12 @@ func (r *AwsElastiCacheClusterInvalidParameterGroupRule) Check(rr tflint.Runner)
7676
}
7777

7878
if !r.dataPrepared {
79-
log.Print("[DEBUG] invoking DescribeCacheParameterGroups")
79+
logger.Debug("invoking DescribeCacheParameterGroups")
8080
var err error
8181
r.data, err = runner.AwsClient.DescribeCacheParameterGroups()
8282
if err != nil {
8383
err := fmt.Errorf("An error occurred while invoking DescribeCacheParameterGroups; %w", err)
84-
log.Printf("[ERROR] %s", err)
84+
logger.Error("%s", err)
8585
return err
8686
}
8787
r.dataPrepared = true

rules/api/aws_elasticache_cluster_invalid_security_group.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ package api
44

55
import (
66
"fmt"
7-
"log"
87

98
hcl "github.com/hashicorp/hcl/v2"
109
"github.com/terraform-linters/tflint-plugin-sdk/hclext"
10+
"github.com/terraform-linters/tflint-plugin-sdk/logger"
1111
"github.com/terraform-linters/tflint-plugin-sdk/tflint"
1212
"github.com/terraform-linters/tflint-ruleset-aws/aws"
1313
)
@@ -77,12 +77,12 @@ func (r *AwsElastiCacheClusterInvalidSecurityGroupRule) Check(rr tflint.Runner)
7777
}
7878

7979
if !r.dataPrepared {
80-
log.Print("[DEBUG] invoking DescribeSecurityGroups")
80+
logger.Debug("invoking DescribeSecurityGroups")
8181
var err error
8282
r.data, err = runner.AwsClient.DescribeSecurityGroups()
8383
if err != nil {
8484
err := fmt.Errorf("An error occurred while invoking DescribeSecurityGroups; %w", err)
85-
log.Printf("[ERROR] %s", err)
85+
logger.Error("%s", err)
8686
return err
8787
}
8888
r.dataPrepared = true

0 commit comments

Comments
 (0)