From 08b2479a7e1076b72fe01d3b64f4689e43c4f908 Mon Sep 17 00:00:00 2001 From: Ian Dillon Date: Sun, 17 Dec 2017 12:21:16 -0500 Subject: [PATCH] Adds security_group_id to directory_service_directory output. --- aws/resource_aws_directory_service_directory.go | 8 ++++++++ aws/resource_aws_directory_service_directory_test.go | 1 + website/docs/r/directory_service_directory.html.markdown | 3 ++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/aws/resource_aws_directory_service_directory.go b/aws/resource_aws_directory_service_directory.go index 54d5839988e5..9de42ed3b0b5 100644 --- a/aws/resource_aws_directory_service_directory.go +++ b/aws/resource_aws_directory_service_directory.go @@ -134,6 +134,10 @@ func resourceAwsDirectoryServiceDirectory() *schema.Resource { Set: schema.HashString, Computed: true, }, + "security_group_id": { + Type: schema.TypeString, + Computed: true, + }, "type": { Type: schema.TypeString, Optional: true, @@ -446,6 +450,10 @@ func resourceAwsDirectoryServiceDirectoryRead(d *schema.ResourceData, meta inter d.Set("connect_settings", flattenDSConnectSettings(dir.DnsIpAddrs, dir.ConnectSettings)) d.Set("enable_sso", *dir.SsoEnabled) + if dir.VpcSettings != nil { + d.Set("security_group_id", *dir.VpcSettings.SecurityGroupId) + } + tagList, err := dsconn.ListTagsForResource(&directoryservice.ListTagsForResourceInput{ ResourceId: aws.String(d.Id()), }) diff --git a/aws/resource_aws_directory_service_directory_test.go b/aws/resource_aws_directory_service_directory_test.go index c294c9e823b5..a2004853c34e 100644 --- a/aws/resource_aws_directory_service_directory_test.go +++ b/aws/resource_aws_directory_service_directory_test.go @@ -98,6 +98,7 @@ func TestAccAWSDirectoryServiceDirectory_basic(t *testing.T) { Config: testAccDirectoryServiceDirectoryConfig, Check: resource.ComposeTestCheckFunc( testAccCheckServiceDirectoryExists("aws_directory_service_directory.bar"), + resource.TestCheckResourceAttrSet("aws_directory_service_directory.bar", "security_group_id"), ), }, }, diff --git a/website/docs/r/directory_service_directory.html.markdown b/website/docs/r/directory_service_directory.html.markdown index 673de123228e..99a44bf3f494 100644 --- a/website/docs/r/directory_service_directory.html.markdown +++ b/website/docs/r/directory_service_directory.html.markdown @@ -83,6 +83,7 @@ The following attributes are exported: * `id` - The directory identifier. * `access_url` - The access URL for the directory, such as `http://alias.awsapps.com`. * `dns_ip_addresses` - A list of IP addresses of the DNS servers for the directory or connector. +* `security_group_id` - The ID of the security group created by the directory (`SimpleAD` or `MicrosoftAD` only). ## Import @@ -91,4 +92,4 @@ DirectoryService directories can be imported using the directory `id`, e.g. ``` $ terraform import aws_directory_service_directory.sample d-926724cf57 -``` \ No newline at end of file +```