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

providers/aws: use one resourcestate so we don't lose attributes

This commit is contained in:
Mitchell Hashimoto 2014-06-25 23:21:46 -07:00
parent 0ab7faf5c1
commit fa3ac806cc
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/providers/aws/resources.go
View File

@ -35,14 +35,12 @@ func resource_aws_instance_create(
ec2conn := p.ec2conn ec2conn := p.ec2conn
// Merge the diff into the state so that we have all the attributes // Merge the diff into the state so that we have all the attributes
// properly. Note that this merged state will contain some computed // properly.
// properties so it won't actually be our result (which we build from rs := s.MergeDiff(d)
// scratch later).
ms := s.MergeDiff(d)
runOpts := &ec2.RunInstances{ runOpts := &ec2.RunInstances{
ImageId: ms.Attributes["ami"], ImageId: rs.Attributes["ami"],
InstanceType: ms.Attributes["instance_type"], InstanceType: rs.Attributes["instance_type"],
} }
log.Printf("[DEBUG] Run configuration: %#v", runOpts) log.Printf("[DEBUG] Run configuration: %#v", runOpts)
@ -56,7 +54,6 @@ func resource_aws_instance_create(
// Store the resource state now so that we can return it in the case // Store the resource state now so that we can return it in the case
// of any errors. // of any errors.
rs := new(terraform.ResourceState)
rs.ID = instance.InstanceId rs.ID = instance.InstanceId
// Wait for the instance to become running so we can get some attributes // Wait for the instance to become running so we can get some attributes
@ -77,7 +74,6 @@ func resource_aws_instance_create(
instance = instanceRaw.(*ec2.Instance) instance = instanceRaw.(*ec2.Instance)
// Set our attributes // Set our attributes
rs = rs.MergeDiff(d)
return resource_aws_instance_update_state(rs, instance) return resource_aws_instance_update_state(rs, instance)
} }