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

Removing usage of awsutil.Prettify.

This commit is contained in:
BSick7 2015-10-26 13:38:17 -04:00
parent 9cb1aada0a
commit e4465adca5
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/providers/aws/resource_aws_route.go
View File

@ -5,7 +5,6 @@ import (
"log" "log"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awsutil"
"github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2"
"github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/hashcode"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
@ -129,7 +128,7 @@ func resourceAwsRouteCreate(d *schema.ResourceData, meta interface{}) error {
default: default:
fmt.Errorf("Error: invalid target type specified.") fmt.Errorf("Error: invalid target type specified.")
} }
log.Printf("[DEBUG] Route create config: %s", awsutil.Prettify(createOpts)) log.Printf("[DEBUG] Route create config: %s", createOpts)
// Create the route // Create the route
_, err := conn.CreateRoute(createOpts) _, err := conn.CreateRoute(createOpts)
@ -139,7 +138,7 @@ func resourceAwsRouteCreate(d *schema.ResourceData, meta interface{}) error {
route, err := findResourceRoute(conn, d.Get("route_table_id").(string), d.Get("destination_cidr_block").(string)) route, err := findResourceRoute(conn, d.Get("route_table_id").(string), d.Get("destination_cidr_block").(string))
if err != nil { if err != nil {
fmt.Errorf("Error: %s", awsutil.Prettify(err)) fmt.Errorf("Error: %s", err)
} }
d.SetId(routeIDHash(d, route)) d.SetId(routeIDHash(d, route))
@ -227,7 +226,7 @@ func resourceAwsRouteUpdate(d *schema.ResourceData, meta interface{}) error {
default: default:
fmt.Errorf("Error: invalid target type specified.") fmt.Errorf("Error: invalid target type specified.")
} }
log.Printf("[DEBUG] Route replace config: %s", awsutil.Prettify(replaceOpts)) log.Printf("[DEBUG] Route replace config: %s", replaceOpts)
// Replace the route // Replace the route
_, err := conn.ReplaceRoute(replaceOpts) _, err := conn.ReplaceRoute(replaceOpts)
@ -326,10 +325,10 @@ func deleteAwsRoute(conn *ec2.EC2, routeTableId string, cidr string) error {
RouteTableId: aws.String(routeTableId), RouteTableId: aws.String(routeTableId),
DestinationCidrBlock: aws.String(cidr), DestinationCidrBlock: aws.String(cidr),
} }
log.Printf("[DEBUG] Route delete opts: %s", awsutil.Prettify(deleteOpts)) log.Printf("[DEBUG] Route delete opts: %s", deleteOpts)
resp, err := conn.DeleteRoute(deleteOpts) resp, err := conn.DeleteRoute(deleteOpts)
log.Printf("[DEBUG] Route delete result: %s", awsutil.Prettify(resp)) log.Printf("[DEBUG] Route delete result: %s", resp)
if err != nil { if err != nil {
return err return err
} }