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

Fixes #6076 - Adjusts check to allow for instance-id reset on aws_route

This commit is contained in:
Justin Nauman 2016-05-13 10:07:54 -05:00 committed by Clint
parent e81d06d505
commit be523d3792
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,11 +224,12 @@ func resourceAwsRouteUpdate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn conn := meta.(*AWSClient).ec2conn
var numTargets int var numTargets int
var setTarget string var setTarget string
allowedTargets := []string{ allowedTargets := []string{
"gateway_id", "gateway_id",
"nat_gateway_id", "nat_gateway_id",
"instance_id",
"network_interface_id", "network_interface_id",
"instance_id",
"vpc_peering_connection_id", "vpc_peering_connection_id",
} }
replaceOpts := &ec2.ReplaceRouteInput{} replaceOpts := &ec2.ReplaceRouteInput{}
@ -241,9 +242,19 @@ func resourceAwsRouteUpdate(d *schema.ResourceData, meta interface{}) error {
} }
} }
switch setTarget {
//instance_id is a special case due to the fact that AWS will "discover" the network_interace_id
//when it creates the route and return that data. In the case of an update, we should ignore the
//existing network_interface_id
case "instance_id":
if numTargets > 2 || (numTargets == 2 && len(d.Get("network_interface_id").(string)) == 0) {
return routeTargetValidationError
}
default:
if numTargets > 1 { if numTargets > 1 {
return routeTargetValidationError return routeTargetValidationError
} }
}
// Formulate ReplaceRouteInput based on the target type // Formulate ReplaceRouteInput based on the target type
switch setTarget { switch setTarget {
@ -264,8 +275,6 @@ func resourceAwsRouteUpdate(d *schema.ResourceData, meta interface{}) error {
RouteTableId: aws.String(d.Get("route_table_id").(string)), RouteTableId: aws.String(d.Get("route_table_id").(string)),
DestinationCidrBlock: aws.String(d.Get("destination_cidr_block").(string)), DestinationCidrBlock: aws.String(d.Get("destination_cidr_block").(string)),
InstanceId: aws.String(d.Get("instance_id").(string)), InstanceId: aws.String(d.Get("instance_id").(string)),
//NOOP: Ensure we don't blow away network interface id that is set after instance is launched
NetworkInterfaceId: aws.String(d.Get("network_interface_id").(string)),
} }
case "network_interface_id": case "network_interface_id":
replaceOpts = &ec2.ReplaceRouteInput{ replaceOpts = &ec2.ReplaceRouteInput{