Support VPC sharing

aws/data_source_aws_internet_gateway.go

@@ -36,6 +36,10 @@ func dataSourceAwsInternetGateway() *schema.Resource {
 					},
 				},
 			},
+			"owner_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -77,6 +81,7 @@ func dataSourceAwsInternetGatewayRead(d *schema.ResourceData, meta interface{})
 	igw := resp.InternetGateways[0]
 	d.SetId(aws.StringValue(igw.InternetGatewayId))
 	d.Set("tags", tagsToMap(igw.Tags))
+	d.Set("owner_id", igw.OwnerId)
 	d.Set("internet_gateway_id", igw.InternetGatewayId)
 	if err := d.Set("attachments", dataSourceAttachmentsRead(igw.Attachments)); err != nil {
 		return err

aws/data_source_aws_internet_gateway_test.go

@@ -53,6 +53,14 @@ func testAccDataSourceAwsInternetGatewayCheck(name string) resource.TestCheckFun
 			)
 		}
 
+		if attr["owner_id"] != igwRs.Primary.Attributes["owner_id"] {
+			return fmt.Errorf(
+				"owner_id is %s; want %s",
+				attr["owner_id"],
+				igwRs.Primary.Attributes["owner_id"],
+			)
+		}
+
 		if attr["attachments.0.vpc_id"] != vpcRs.Primary.Attributes["id"] {
 			return fmt.Errorf(
 				"vpc_id is %s; want %s",

aws/data_source_aws_route_table.go

@@ -110,6 +110,10 @@ func dataSourceAwsRouteTable() *schema.Resource {
 					},
 				},
 			},
+			"owner_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -158,6 +162,7 @@ func dataSourceAwsRouteTableRead(d *schema.ResourceData, meta interface{}) error
 	d.Set("route_table_id", rt.RouteTableId)
 	d.Set("vpc_id", rt.VpcId)
 	d.Set("tags", tagsToMap(rt.Tags))
+	d.Set("owner_id", rt.OwnerId)
 	if err := d.Set("routes", dataSourceRoutesRead(rt.Routes)); err != nil {
 		return err
 	}

aws/data_source_aws_route_table_test.go

@@ -80,6 +80,14 @@ func testAccDataSourceAwsRouteTableCheck(name string) resource.TestCheckFunc {
 			)
 		}
 
+		if attr["owner_id"] != rts.Primary.Attributes["owner_id"] {
+			return fmt.Errorf(
+				"owner_id is %s; want %s",
+				attr["owner_id"],
+				rts.Primary.Attributes["owner_id"],
+			)
+		}
+
 		if attr["vpc_id"] != vpcRs.Primary.Attributes["id"] {
 			return fmt.Errorf(
 				"vpc_id is %s; want %s",

aws/data_source_aws_subnet.go

@@ -5,7 +5,6 @@ import (
 	"log"
 
 	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/arn"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/hashicorp/terraform/helper/schema"
 )
@@ -80,6 +79,11 @@ func dataSourceAwsSubnet() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+
+			"owner_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -161,14 +165,8 @@ func dataSourceAwsSubnetRead(d *schema.ResourceData, meta interface{}) error {
 		}
 	}
 
-	arn := arn.ARN{
-		Partition: meta.(*AWSClient).partition,
-		Region:    meta.(*AWSClient).region,
-		Service:   "ec2",
-		AccountID: meta.(*AWSClient).accountid,
-		Resource:  fmt.Sprintf("subnet/%s", d.Id()),
-	}
-	d.Set("arn", arn.String())
+	d.Set("arn", subnet.SubnetArn)
+	d.Set("owner_id", subnet.OwnerId)
 
 	return nil
 }

aws/data_source_aws_subnet_test.go

@@ -100,6 +100,14 @@ func testAccDataSourceAwsSubnetCheck(name string, rInt int) resource.TestCheckFu
 			)
 		}
 
+		if attr["owner_id"] != subnetRs.Primary.Attributes["owner_id"] {
+			return fmt.Errorf(
+				"owner_id is %s; want %s",
+				attr["owner_id"],
+				subnetRs.Primary.Attributes["owner_id"],
+			)
+		}
+
 		if attr["vpc_id"] != vpcRs.Primary.Attributes["id"] {
 			return fmt.Errorf(
 				"vpc_id is %s; want %s",

aws/data_source_aws_vpc.go

@@ -104,6 +104,11 @@ func dataSourceAwsVpc() *schema.Resource {
 			},
 
 			"tags": tagsSchemaComputed(),
+
+			"owner_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -172,6 +177,7 @@ func dataSourceAwsVpcRead(d *schema.ResourceData, meta interface{}) error {
 	d.Set("default", vpc.IsDefault)
 	d.Set("state", vpc.State)
 	d.Set("tags", tagsToMap(vpc.Tags))
+	d.Set("owner_id", vpc.OwnerId)
 
 	arn := arn.ARN{
 		Partition: meta.(*AWSClient).partition,

aws/data_source_aws_vpc_dhcp_options.go

@@ -46,6 +46,10 @@ func dataSourceAwsVpcDhcpOptions() *schema.Resource {
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
 			"tags": tagsSchemaComputed(),
+			"owner_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -121,6 +125,7 @@ func dataSourceAwsVpcDhcpOptionsRead(d *schema.ResourceData, meta interface{}) e
 	if err := d.Set("tags", d.Set("tags", tagsToMap(output.DhcpOptions[0].Tags))); err != nil {
 		return fmt.Errorf("error setting tags: %s", err)
 	}
+	d.Set("owner_id", output.DhcpOptions[0].OwnerId)
 
 	return nil
 }

aws/data_source_aws_vpc_dhcp_options_test.go

@@ -36,6 +36,7 @@ func TestAccDataSourceAwsVpcDhcpOptions_basic(t *testing.T) {
 					resource.TestCheckResourceAttrPair(datasourceName, "ntp_servers.0", resourceName, "ntp_servers.0"),
 					resource.TestCheckResourceAttrPair(datasourceName, "tags.%", resourceName, "tags.%"),
 					resource.TestCheckResourceAttrPair(datasourceName, "tags.Name", resourceName, "tags.Name"),
+					resource.TestCheckResourceAttrPair(datasourceName, "owner_id", resourceName, "owner_id"),
 				),
 			},
 		},
@@ -66,6 +67,7 @@ func TestAccDataSourceAwsVpcDhcpOptions_Filter(t *testing.T) {
 					resource.TestCheckResourceAttrPair(datasourceName, "ntp_servers.0", resourceName, "ntp_servers.0"),
 					resource.TestCheckResourceAttrPair(datasourceName, "tags.%", resourceName, "tags.%"),
 					resource.TestCheckResourceAttrPair(datasourceName, "tags.Name", resourceName, "tags.Name"),
+					resource.TestCheckResourceAttrPair(datasourceName, "owner_id", resourceName, "owner_id"),
 				),
 			},
 			{

aws/data_source_aws_vpc_test.go

@@ -104,6 +104,14 @@ func testAccDataSourceAwsVpcCheck(name, cidr, tag string) resource.TestCheckFunc
 			)
 		}
 
+		if attr["owner_id"] != vpcRs.Primary.Attributes["owner_id"] {
+			return fmt.Errorf(
+				"owner_id is %s; want %s",
+				attr["owner_id"],
+				vpcRs.Primary.Attributes["owner_id"],
+			)
+		}
+
 		if attr["cidr_block"] != cidr {
 			return fmt.Errorf("bad cidr_block %s, expected: %s", attr["cidr_block"], cidr)
 		}

aws/resource_aws_default_network_acl.go

@@ -146,6 +146,11 @@ func resourceAwsDefaultNetworkAcl() *schema.Resource {
 			},
 
 			"tags": tagsSchema(),
+
+			"owner_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 		},
 	}
 }

aws/resource_aws_default_network_acl_test.go

@@ -38,6 +38,7 @@ func TestAccAWSDefaultNetworkAcl_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccGetAWSDefaultNetworkAcl("aws_default_network_acl.default", &networkAcl),
 					testAccCheckAWSDefaultACLAttributes(&networkAcl, []*ec2.NetworkAclEntry{}, 0, 2),
+					resource.TestCheckResourceAttrSet("aws_default_network_acl.default", "owner_id"),
 				),
 			},
 		},

aws/resource_aws_default_route_table.go

@@ -91,6 +91,11 @@ func resourceAwsDefaultRouteTable() *schema.Resource {
 			},
 
 			"tags": tagsSchema(),
+
+			"owner_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 		},
 	}
 }

aws/resource_aws_default_route_table_test.go

@@ -25,6 +25,7 @@ func TestAccAWSDefaultRouteTable_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckRouteTableExists(
 						"aws_default_route_table.foo", &v),
+					resource.TestCheckResourceAttrSet("aws_default_route_table.foo", "owner_id"),
 				),
 			},
 		},

aws/resource_aws_default_subnet_test.go

@@ -28,6 +28,7 @@ func TestAccAWSDefaultSubnet_basic(t *testing.T) {
 						"aws_default_subnet.foo", "tags.%", "1"),
 					resource.TestCheckResourceAttr(
 						"aws_default_subnet.foo", "tags.Name", "terraform-testacc-default-subnet"),
+					resource.TestCheckResourceAttrSet("aws_default_subnet.foo", "owner_id"),
 				),
 			},
 		},

aws/resource_aws_default_vpc_dhcp_options.go

@@ -76,11 +76,7 @@ func resourceAwsDefaultVpcDhcpOptionsCreate(d *schema.ResourceData, meta interfa
 
 	d.SetId(aws.StringValue(resp.DhcpOptions[0].DhcpOptionsId))
 
-	if err := resourceAwsVpcDhcpOptionsUpdate(d, meta); err != nil {
-		return err
-	}
-
-	return resourceAwsVpcDhcpOptionsRead(d, meta)
+	return resourceAwsVpcDhcpOptionsUpdate(d, meta)
 }
 
 func resourceAwsDefaultVpcDhcpOptionsDelete(d *schema.ResourceData, meta interface{}) error {

aws/resource_aws_default_vpc_dhcp_options_test.go

@@ -28,6 +28,7 @@ func TestAccAWSDefaultVpcDhcpOptions_basic(t *testing.T) {
 						"aws_default_vpc_dhcp_options.foo", "tags.%", "1"),
 					resource.TestCheckResourceAttr(
 						"aws_default_vpc_dhcp_options.foo", "tags.Name", "Default DHCP Option Set"),
+					resource.TestCheckResourceAttrSet("aws_default_vpc_dhcp_options.foo", "owner_id"),
 				),
 			},
 		},

aws/resource_aws_default_vpc_test.go

@@ -29,12 +29,8 @@ func TestAccAWSDefaultVpc_basic(t *testing.T) {
 						"aws_default_vpc.foo", "tags.Name", "Default VPC"),
 					resource.TestCheckResourceAttrSet(
 						"aws_default_vpc.foo", "arn"),
-					resource.TestCheckNoResourceAttr(
-						"aws_default_vpc.foo", "assign_generated_ipv6_cidr_block"),
-					resource.TestCheckNoResourceAttr(
-						"aws_default_vpc.foo", "ipv6_association_id"),
-					resource.TestCheckNoResourceAttr(
-						"aws_default_vpc.foo", "ipv6_cidr_block"),
+					resource.TestCheckResourceAttrSet(
+						"aws_default_vpc.foo", "owner_id"),
 				),
 			},
 		},

aws/resource_aws_internet_gateway.go

@@ -28,6 +28,10 @@ func resourceAwsInternetGateway() *schema.Resource {
 				Optional: true,
 			},
 			"tags": tagsSchema(),
+			"owner_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -70,7 +74,12 @@ func resourceAwsInternetGatewayCreate(d *schema.ResourceData, meta interface{})
 	}
 
 	// Attach the new gateway to the correct vpc
-	return resourceAwsInternetGatewayAttach(d, meta)
+	err = resourceAwsInternetGatewayAttach(d, meta)
+	if err != nil {
+		return err
+	}
+
+	return resourceAwsInternetGatewayRead(d, meta)
 }
 
 func resourceAwsInternetGatewayRead(d *schema.ResourceData, meta interface{}) error {
@@ -95,6 +104,7 @@ func resourceAwsInternetGatewayRead(d *schema.ResourceData, meta interface{}) er
 	}
 
 	d.Set("tags", tagsToMap(ig.Tags))
+	d.Set("owner_id", ig.OwnerId)
 
 	return nil
 }
@@ -120,7 +130,7 @@ func resourceAwsInternetGatewayUpdate(d *schema.ResourceData, meta interface{})
 
 	d.SetPartial("tags")
 
-	return nil
+	return resourceAwsInternetGatewayRead(d, meta)
 }
 
 func resourceAwsInternetGatewayDelete(d *schema.ResourceData, meta interface{}) error {

aws/resource_aws_internet_gateway_test.go

@@ -145,6 +145,7 @@ func TestAccAWSInternetGateway_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckInternetGatewayExists(
 						"aws_internet_gateway.foo", &v),
+					resource.TestCheckResourceAttrSet("aws_internet_gateway.foo", "owner_id"),
 				),
 			},
 
@@ -154,6 +155,7 @@ func TestAccAWSInternetGateway_basic(t *testing.T) {
 					testAccCheckInternetGatewayExists(
 						"aws_internet_gateway.foo", &v2),
 					testNotEqual,
+					resource.TestCheckResourceAttrSet("aws_internet_gateway.foo", "owner_id"),
 				),
 			},
 		},
@@ -207,6 +209,7 @@ func TestAccAWSInternetGateway_tags(t *testing.T) {
 					testAccCheckInternetGatewayExists("aws_internet_gateway.foo", &v),
 					testAccCheckTags(&v.Tags, "Name", "terraform-testacc-internet-gateway-tags"),
 					testAccCheckTags(&v.Tags, "foo", "bar"),
+					resource.TestCheckResourceAttrSet("aws_internet_gateway.foo", "owner_id"),
 				),
 			},
 
@@ -217,6 +220,7 @@ func TestAccAWSInternetGateway_tags(t *testing.T) {
 					testAccCheckTags(&v.Tags, "Name", "terraform-testacc-internet-gateway-tags"),
 					testAccCheckTags(&v.Tags, "foo", ""),
 					testAccCheckTags(&v.Tags, "bar", "baz"),
+					resource.TestCheckResourceAttrSet("aws_internet_gateway.foo", "owner_id"),
 				),
 			},
 		},

aws/resource_aws_network_acl.go

@@ -158,6 +158,10 @@ func resourceAwsNetworkAcl() *schema.Resource {
 				Set: resourceAwsNetworkAclEntryHash,
 			},
 			"tags": tagsSchema(),
+			"owner_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -229,6 +233,7 @@ func resourceAwsNetworkAclRead(d *schema.ResourceData, meta interface{}) error {
 
 	d.Set("vpc_id", networkAcl.VpcId)
 	d.Set("tags", tagsToMap(networkAcl.Tags))
+	d.Set("owner_id", networkAcl.OwnerId)
 
 	var s []string
 	for _, a := range networkAcl.Associations {

aws/resource_aws_network_acl_test.go

@@ -167,6 +167,7 @@ func TestAccAWSNetworkAcl_EgressAndIngressRules(t *testing.T) {
 						"aws_network_acl.bar", "egress.3111164687.cidr_block", "10.3.0.0/18"),
 					resource.TestCheckResourceAttr(
 						"aws_network_acl.bar", "egress.3111164687.action", "allow"),
+					resource.TestCheckResourceAttrSet("aws_network_acl.bar", "owner_id"),
 				),
 			},
 		},
@@ -198,6 +199,7 @@ func TestAccAWSNetworkAcl_OnlyIngressRules_basic(t *testing.T) {
 						"aws_network_acl.foos", "ingress.4245812720.action", "deny"),
 					resource.TestCheckResourceAttr(
 						"aws_network_acl.foos", "ingress.4245812720.cidr_block", "10.2.0.0/18"),
+					resource.TestCheckResourceAttrSet("aws_network_acl.foos", "owner_id"),
 				),
 			},
 		},
@@ -234,6 +236,7 @@ func TestAccAWSNetworkAcl_OnlyIngressRules_update(t *testing.T) {
 						"aws_network_acl.foos", "ingress.4245812720.from_port", "443"),
 					resource.TestCheckResourceAttr(
 						"aws_network_acl.foos", "ingress.4245812720.rule_no", "2"),
+					resource.TestCheckResourceAttrSet("aws_network_acl.foos", "owner_id"),
 				),
 			},
 			{
@@ -253,6 +256,7 @@ func TestAccAWSNetworkAcl_OnlyIngressRules_update(t *testing.T) {
 						"aws_network_acl.foos", "ingress.401088754.action", "deny"),
 					resource.TestCheckResourceAttr(
 						"aws_network_acl.foos", "ingress.401088754.cidr_block", "10.2.0.0/18"),
+					resource.TestCheckResourceAttrSet("aws_network_acl.foos", "owner_id"),
 				),
 			},
 		},