Merge pull request #17782 from shuheiktgw/correct_aws_vpc_endpoint_arn

aws_vpc_endpoint: Correct the ARN account id
hashicorp · Mar 17, 2021 · 7d1efab · 7d1efab
2 parents 8175e4e + 508d1cc
commit 7d1efab
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/aws/data_source_aws_vpc_endpoint.go b/aws/data_source_aws_vpc_endpoint.go
@@ -163,7 +163,7 @@ func dataSourceAwsVpcEndpointRead(d *schema.ResourceData, meta interface{}) erro
  Partition: meta.(*AWSClient).partition,
  Service: ec2.ServiceName,
  Region: meta.(*AWSClient).region,
- AccountID: meta.(*AWSClient).accountid,
+ AccountID: aws.StringValue(vpce.OwnerId),
  Resource: fmt.Sprintf("vpc-endpoint/%s", d.Id()),
  }.String()
  d.Set("arn", arn)

diff --git a/aws/resource_aws_vpc_endpoint.go b/aws/resource_aws_vpc_endpoint.go
@@ -228,7 +228,7 @@ func resourceAwsVpcEndpointRead(d *schema.ResourceData, meta interface{}) error
  Partition: meta.(*AWSClient).partition,
  Service: ec2.ServiceName,
  Region: meta.(*AWSClient).region,
- AccountID: meta.(*AWSClient).accountid,
+ AccountID: aws.StringValue(vpce.OwnerId),
  Resource: fmt.Sprintf("vpc-endpoint/%s", d.Id()),
  }.String()
  d.Set("arn", arn)

diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown
@@ -329,8 +329,6 @@ for more information about connecting to alternate AWS endpoints or AWS compatib
  - [`aws_vpc_dhcp_options` resource](/docs/providers/aws/r/vpc_dhcp_options.html)
  - [`aws_vpc_endpoint_service` data source](/docs/providers/aws/d/vpc_endpoint_service.html)
  - [`aws_vpc_endpoint_service` resource](/docs/providers/aws/r/vpc_endpoint_service.html)
- - [`aws_vpc_endpoint` data source](/docs/providers/aws/d/vpc_endpoint.html)
- - [`aws_vpc_endpoint` resource](/docs/providers/aws/r/vpc_endpoint.html)
  - [`aws_vpc` data source](/docs/providers/aws/d/vpc.html)
  - [`aws_vpc` resource](/docs/providers/aws/r/vpc.html)
  - [`aws_vpn_connection` resource](/docs/providers/aws/r/vpn_connection.html)