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

provider/aws: fixing the aws_internet_gateway resource 

The resource is build so it can attach and detach the Internet Gateway
from a VPC, but as the schema has `Required` and `ForceNew` both set
to `true` for the vpc_id field it will never use these capabilities.
This commit is contained in:
Sander van Harmelen 2014-12-14 12:20:59 +01:00
parent 69b2c245dd
commit d9af954c60
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
builtin/providers/aws/resource_aws_internet_gateway.go
View File

@ -20,8 +20,7 @@ func resourceAwsInternetGateway() *schema.Resource {
Schema: map[string]*schema.Schema{
"vpc_id": &schema.Schema{
Type: schema.TypeString,
Required: true,
ForceNew: true,
Optional: true,
},
},
}
@ -66,13 +65,19 @@ func resourceAwsInternetGatewayRead(d *schema.ResourceData, meta interface{}) er
}
func resourceAwsInternetGatewayUpdate(d *schema.ResourceData, meta interface{}) error {
if d.HasChange("vpc_id") {
// If we're already attached, detach it first
if err := resourceAwsInternetGatewayDetach(d, meta); err != nil {
return err
if err := resourceAwsInternetGatewayDetach(d, meta); err != nil {
return err
}
// Attach the gateway to the new vpc
if err := resourceAwsInternetGatewayAttach(d, meta); err != nil {
return err
}
}
// Attach the gateway to the new vpc
return resourceAwsInternetGatewayAttach(d, meta)
return nil
}
func resourceAwsInternetGatewayDelete(d *schema.ResourceData, meta interface{}) error {
@ -126,6 +131,13 @@ func resourceAwsInternetGatewayDelete(d *schema.ResourceData, meta interface{})
func resourceAwsInternetGatewayAttach(d *schema.ResourceData, meta interface{}) error {
ec2conn := meta.(*AWSClient).ec2conn
if d.Get("vpc_id").(string) == "" {
log.Printf(
"[DEBUG] Not attaching Internet Gateway '%s' as no VPC ID is set",
d.Id())
return nil
}
log.Printf(
"[INFO] Attaching Internet Gateway '%s' to VPC '%s'",
d.Id(),
@ -161,13 +173,23 @@ func resourceAwsInternetGatewayAttach(d *schema.ResourceData, meta interface{})
func resourceAwsInternetGatewayDetach(d *schema.ResourceData, meta interface{}) error {
ec2conn := meta.(*AWSClient).ec2conn
// Get the old VPC ID to detach from
vpc_id, _ := d.GetChange("vpc_id")
if vpc_id.(string) == "" {
log.Printf(
"[DEBUG] Not detaching Internet Gateway '%s' as no VPC ID is set",
d.Id())
return nil
}
log.Printf(
"[INFO] Detaching Internet Gateway '%s' from VPC '%s'",
d.Id(),
d.Get("vpc_id").(string))
vpc_id.(string))
wait := true
_, err := ec2conn.DetachInternetGateway(d.Id(), d.Get("vpc_id").(string))
_, err := ec2conn.DetachInternetGateway(d.Id(), vpc_id.(string))
if err != nil {
ec2err, ok := err.(*ec2.Error)
if ok {