ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix wrong usage of hashicorp/errwrap (#11500) 

According to https://github.com/hashicorp/errwrap
'{{err}}' has to be used instead of '%s'

Without this patch, error output from terraform is missing important information:
* aws_cloudwatch_log_group.logs: Error Getting CloudWatch Logs Tag List: %s

With this patch, I get the important information. E.g.:
* aws_cloudwatch_log_group.logs: Error Getting CloudWatch Logs Tag List: AccessDeniedException: User: arn:aws:sts::XYZ:assumed-role/AAA-BBB-CCC/terraform-assuming-role-assume-role-ReadOnly is not authorized to perform: logs:ListTagsLogGroup on resource: arn:aws:logs:us-east-1:XYZ:log-group:logs:log-stream:
This commit is contained in:
julius-bonial 2017-01-29 20:19:48 +01:00 committed by Paul Stack
parent ab18f60071
commit 5d8662d5da
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/providers/aws/auth_helpers.go
View File

@ -30,7 +30,7 @@ func GetAccountInfo(iamconn *iam.IAM, stsconn *sts.STS, authProviderName string)
setOptionalEndpoint(cfg)
sess, err := session.NewSession(cfg)
if err != nil {
return "", "", errwrap.Wrapf("Error creating AWS session: %s", err)
return "", "", errwrap.Wrapf("Error creating AWS session: {{err}}", err)
}
metadataClient := ec2metadata.New(sess)

2
builtin/providers/aws/resource_aws_cloudwatch_log_group.go
View File

@ -218,7 +218,7 @@ func flattenCloudWatchTags(d *schema.ResourceData, conn *cloudwatchlogs.CloudWat
LogGroupName: aws.String(d.Get("name").(string)),
})
if err != nil {
return nil, errwrap.Wrapf("Error Getting CloudWatch Logs Tag List: %s", err)
return nil, errwrap.Wrapf("Error Getting CloudWatch Logs Tag List: {{err}}", err)
}
if tagsOutput != nil {
output := make(map[string]interface{}, len(tagsOutput.Tags))

4
builtin/providers/aws/resource_aws_cloudwatch_log_stream.go
View File

@ -48,7 +48,7 @@ func resourceAwsCloudWatchLogStreamCreate(d *schema.ResourceData, meta interface
LogStreamName: aws.String(d.Get("name").(string)),
})
if err != nil {
return errwrap.Wrapf("Creating CloudWatch Log Stream failed: %s", err)
return errwrap.Wrapf("Creating CloudWatch Log Stream failed: {{err}}", err)
}
d.SetId(d.Get("name").(string))
@ -86,7 +86,7 @@ func resourceAwsCloudWatchLogStreamDelete(d *schema.ResourceData, meta interface
}
_, err := conn.DeleteLogStream(params)
if err != nil {
return errwrap.Wrapf("Error deleting CloudWatch Log Stream: %s", err)
return errwrap.Wrapf("Error deleting CloudWatch Log Stream: {{err}}", err)
}
return nil

2
builtin/providers/postgresql/provider.go
View File

@ -102,7 +102,7 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
client, err := config.NewClient()
if err != nil {
return nil, errwrap.Wrapf("Error initializing PostgreSQL client: %s", err)
return nil, errwrap.Wrapf("Error initializing PostgreSQL client: {{err}}", err)
}
return client, nil