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

Merge pull request #7428 from TimeIncOSS/f-efs-target-hostname 

provider/aws: Add dns_name to aws_efs_mount_target
This commit is contained in:
Radek Simko 2016-06-30 12:40:48 +01:00 committed by GitHub
parent 124e0906e1 32019fa008
commit b54481909b
3 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
builtin/providers/aws/resource_aws_efs_mount_target.go
View File

@ -7,6 +7,7 @@ import (
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/aws/aws-sdk-go/service/efs" "github.com/aws/aws-sdk-go/service/efs"
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
@ -51,6 +52,10 @@ func resourceAwsEfsMountTarget() *schema.Resource {
Type: schema.TypeString, Type: schema.TypeString,
Computed: true, Computed: true,
}, },
"dns_name": &schema.Schema{
Type: schema.TypeString,
Computed: true,
},
}, },
} }
} }
@ -163,9 +168,33 @@ func resourceAwsEfsMountTargetRead(d *schema.ResourceData, meta interface{}) err
d.Set("security_groups", schema.NewSet(schema.HashString, flattenStringList(sgResp.SecurityGroups))) d.Set("security_groups", schema.NewSet(schema.HashString, flattenStringList(sgResp.SecurityGroups)))
// DNS name per http://docs.aws.amazon.com/efs/latest/ug/mounting-fs-mount-cmd-dns-name.html
az, err := getAzFromSubnetId(*mt.SubnetId, meta.(*AWSClient).ec2conn)
if err != nil {
return fmt.Errorf("Failed getting AZ from subnet ID (%s): %s", *mt.SubnetId, err)
}
region := meta.(*AWSClient).region
d.Set("dns_name", fmt.Sprintf("%s.%s.efs.%s.amazonaws.com", az, *mt.FileSystemId, region))
return nil return nil
} }
func getAzFromSubnetId(subnetId string, conn *ec2.EC2) (string, error) {
input := ec2.DescribeSubnetsInput{
SubnetIds: []*string{aws.String(subnetId)},
}
out, err := conn.DescribeSubnets(&input)
if err != nil {
return "", err
}
if len(out.Subnets) != 1 {
return "", fmt.Errorf("Expected exactly 1 subnet returned for %q", subnetId)
}
return *out.Subnets[0].AvailabilityZone, nil
}
func resourceAwsEfsMountTargetDelete(d *schema.ResourceData, meta interface{}) error { func resourceAwsEfsMountTargetDelete(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).efsconn conn := meta.(*AWSClient).efsconn

16
builtin/providers/aws/resource_aws_efs_mount_target_test.go
View File

@ -2,6 +2,7 @@ package aws
import ( import (
"fmt" "fmt"
"regexp"
"testing" "testing"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
@ -24,6 +25,11 @@ func TestAccAWSEFSMountTarget_basic(t *testing.T) {
testAccCheckEfsMountTarget( testAccCheckEfsMountTarget(
"aws_efs_mount_target.alpha", "aws_efs_mount_target.alpha",
), ),
resource.TestMatchResourceAttr(
"aws_efs_mount_target.alpha",
"dns_name",
regexp.MustCompile("^us-west-2a.[^.]+.efs.us-west-2.amazonaws.com$"),
),
), ),
}, },
resource.TestStep{ resource.TestStep{
@ -32,9 +38,19 @@ func TestAccAWSEFSMountTarget_basic(t *testing.T) {
testAccCheckEfsMountTarget( testAccCheckEfsMountTarget(
"aws_efs_mount_target.alpha", "aws_efs_mount_target.alpha",
), ),
resource.TestMatchResourceAttr(
"aws_efs_mount_target.alpha",
"dns_name",
regexp.MustCompile("^us-west-2a.[^.]+.efs.us-west-2.amazonaws.com$"),
),
testAccCheckEfsMountTarget( testAccCheckEfsMountTarget(
"aws_efs_mount_target.beta", "aws_efs_mount_target.beta",
), ),
resource.TestMatchResourceAttr(
"aws_efs_mount_target.beta",
"dns_name",
regexp.MustCompile("^us-west-2b.[^.]+.efs.us-west-2.amazonaws.com$"),
),
), ),
}, },
}, },

3
website/source/docs/providers/aws/r/efs_mount_target.html.markdown
View File

@ -41,7 +41,10 @@ The following arguments are supported:
## Attributes Reference ## Attributes Reference
~> **Note:** The `dns_name` attribute is only useful if the mount target is in a VPC with `enable_dns_hostnames = true`.
The following attributes are exported: The following attributes are exported:
* `id` - The ID of the mount target * `id` - The ID of the mount target
* `dns_name` - The DNS name for the given subnet/AZ per [documented convention](http://docs.aws.amazon.com/efs/latest/ug/mounting-fs-mount-cmd-dns-name.html)
* `network_interface_id` - The ID of the network interface that Amazon EFS created when it created the mount target. * `network_interface_id` - The ID of the network interface that Amazon EFS created when it created the mount target.