-
Notifications
You must be signed in to change notification settings - Fork 9.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
provider/aws: Add resource_aws_volume_attachment #2050
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
68587eb
provider/aws: Add resource_aws_volume_attachment
catsby fa44e45
provider/aws: Add accdeptance test for volume attachment
catsby c523401
provider/aws: Wait for EBS Volume to be available
catsby 3af25c1
refactor volume attachment to not retry attachment
catsby 9329073
refactor to poll for status consistently
catsby 3f68ea7
Merge remote-tracking branch 'upstream/master' into f-aws-volume-atta…
catsby 1f5c038
provider/aws: Document Volume Attachment
catsby File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
191 changes: 191 additions & 0 deletions
191
builtin/providers/aws/resource_aws_volume_attachment.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,191 @@ | ||
package aws | ||
|
||
import ( | ||
"bytes" | ||
"fmt" | ||
"log" | ||
"time" | ||
|
||
"github.com/awslabs/aws-sdk-go/aws" | ||
"github.com/awslabs/aws-sdk-go/aws/awserr" | ||
"github.com/awslabs/aws-sdk-go/service/ec2" | ||
"github.com/hashicorp/terraform/helper/hashcode" | ||
"github.com/hashicorp/terraform/helper/resource" | ||
"github.com/hashicorp/terraform/helper/schema" | ||
) | ||
|
||
func resourceAwsVolumeAttachment() *schema.Resource { | ||
return &schema.Resource{ | ||
Create: resourceAwsVolumeAttachmentCreate, | ||
Read: resourceAwsVolumeAttachmentRead, | ||
Delete: resourceAwsVolumeAttachmentDelete, | ||
|
||
Schema: map[string]*schema.Schema{ | ||
"device_name": &schema.Schema{ | ||
Type: schema.TypeString, | ||
Required: true, | ||
ForceNew: true, | ||
}, | ||
|
||
"instance_id": &schema.Schema{ | ||
Type: schema.TypeString, | ||
Required: true, | ||
ForceNew: true, | ||
}, | ||
|
||
"volume_id": &schema.Schema{ | ||
Type: schema.TypeString, | ||
Required: true, | ||
ForceNew: true, | ||
}, | ||
|
||
"force_detach": &schema.Schema{ | ||
Type: schema.TypeBool, | ||
Optional: true, | ||
Computed: true, | ||
}, | ||
}, | ||
} | ||
} | ||
|
||
func resourceAwsVolumeAttachmentCreate(d *schema.ResourceData, meta interface{}) error { | ||
conn := meta.(*AWSClient).ec2conn | ||
name := d.Get("device_name").(string) | ||
iID := d.Get("instance_id").(string) | ||
vID := d.Get("volume_id").(string) | ||
|
||
opts := &ec2.AttachVolumeInput{ | ||
Device: aws.String(name), | ||
InstanceID: aws.String(iID), | ||
VolumeID: aws.String(vID), | ||
} | ||
|
||
log.Printf("[DEBUG] Attaching Volume (%s) to Instance (%s)", vID, iID) | ||
_, err := conn.AttachVolume(opts) | ||
if err != nil { | ||
if awsErr, ok := err.(awserr.Error); ok { | ||
return fmt.Errorf("[WARN] Error attaching volume (%s) to instance (%s), message: \"%s\", code: \"%s\"", | ||
vID, iID, awsErr.Message(), awsErr.Code()) | ||
} | ||
return err | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. So now that we loop above, there's no eventual consistency here? No need to loop and wait for "attached" or anything? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
|
||
stateConf := &resource.StateChangeConf{ | ||
Pending: []string{"attaching"}, | ||
Target: "attached", | ||
Refresh: volumeAttachmentStateRefreshFunc(conn, vID, iID), | ||
Timeout: 5 * time.Minute, | ||
Delay: 10 * time.Second, | ||
MinTimeout: 3 * time.Second, | ||
} | ||
|
||
_, err = stateConf.WaitForState() | ||
if err != nil { | ||
return fmt.Errorf( | ||
"Error waiting for Volume (%s) to attach to Instance: %s, error:", | ||
vID, iID, err) | ||
} | ||
|
||
d.SetId(volumeAttachmentID(name, vID, iID)) | ||
return resourceAwsVolumeAttachmentRead(d, meta) | ||
} | ||
|
||
func volumeAttachmentStateRefreshFunc(conn *ec2.EC2, volumeID, instanceID string) resource.StateRefreshFunc { | ||
return func() (interface{}, string, error) { | ||
|
||
request := &ec2.DescribeVolumesInput{ | ||
VolumeIDs: []*string{aws.String(volumeID)}, | ||
Filters: []*ec2.Filter{ | ||
&ec2.Filter{ | ||
Name: aws.String("attachment.instance-id"), | ||
Values: []*string{aws.String(instanceID)}, | ||
}, | ||
}, | ||
} | ||
|
||
resp, err := conn.DescribeVolumes(request) | ||
if err != nil { | ||
if awsErr, ok := err.(awserr.Error); ok { | ||
return nil, "failed", fmt.Errorf("code: %s, message: %s", awsErr.Code(), awsErr.Message()) | ||
} | ||
return nil, "failed", err | ||
} | ||
|
||
if len(resp.Volumes) > 0 { | ||
v := resp.Volumes[0] | ||
for _, a := range v.Attachments { | ||
if a.InstanceID != nil && *a.InstanceID == instanceID { | ||
return a, *a.State, nil | ||
} | ||
} | ||
} | ||
// assume detached if volume count is 0 | ||
return 42, "detached", nil | ||
} | ||
} | ||
func resourceAwsVolumeAttachmentRead(d *schema.ResourceData, meta interface{}) error { | ||
conn := meta.(*AWSClient).ec2conn | ||
|
||
request := &ec2.DescribeVolumesInput{ | ||
VolumeIDs: []*string{aws.String(d.Get("volume_id").(string))}, | ||
Filters: []*ec2.Filter{ | ||
&ec2.Filter{ | ||
Name: aws.String("attachment.instance-id"), | ||
Values: []*string{aws.String(d.Get("instance_id").(string))}, | ||
}, | ||
}, | ||
} | ||
|
||
_, err := conn.DescribeVolumes(request) | ||
if err != nil { | ||
if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidVolume.NotFound" { | ||
d.SetId("") | ||
return nil | ||
} | ||
return fmt.Errorf("Error reading EC2 volume %s for instance: %s: %#v", d.Get("volume_id").(string), d.Get("instance_id").(string), err) | ||
} | ||
return nil | ||
} | ||
|
||
func resourceAwsVolumeAttachmentDelete(d *schema.ResourceData, meta interface{}) error { | ||
conn := meta.(*AWSClient).ec2conn | ||
|
||
vID := d.Get("volume_id").(string) | ||
iID := d.Get("instance_id").(string) | ||
|
||
opts := &ec2.DetachVolumeInput{ | ||
Device: aws.String(d.Get("device_name").(string)), | ||
InstanceID: aws.String(iID), | ||
VolumeID: aws.String(vID), | ||
Force: aws.Boolean(d.Get("force_detach").(bool)), | ||
} | ||
|
||
_, err := conn.DetachVolume(opts) | ||
stateConf := &resource.StateChangeConf{ | ||
Pending: []string{"detaching"}, | ||
Target: "detached", | ||
Refresh: volumeAttachmentStateRefreshFunc(conn, vID, iID), | ||
Timeout: 5 * time.Minute, | ||
Delay: 10 * time.Second, | ||
MinTimeout: 3 * time.Second, | ||
} | ||
|
||
log.Printf("[DEBUG] Detaching Volume (%s) from Instance (%s)", vID, iID) | ||
_, err = stateConf.WaitForState() | ||
if err != nil { | ||
return fmt.Errorf( | ||
"Error waiting for Volume (%s) to detach from Instance: %s", | ||
vID, iID) | ||
} | ||
d.SetId("") | ||
return nil | ||
} | ||
|
||
func volumeAttachmentID(name, volumeID, instanceID string) string { | ||
var buf bytes.Buffer | ||
buf.WriteString(fmt.Sprintf("%s-", name)) | ||
buf.WriteString(fmt.Sprintf("%s-", instanceID)) | ||
buf.WriteString(fmt.Sprintf("%s-", volumeID)) | ||
|
||
return fmt.Sprintf("vai-%d", hashcode.String(buf.String())) | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Upgraded this test while I was here, since I needed a
testAccCheckVolumeExists
methodThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
📈 👍