Merge pull request #19820 from hashicorp/b-security_group_id_nil

Check VpcSettings and ConnectSettings for nil values
hashicorp · Jun 17, 2021 · 507aeeb · 507aeeb
2 parents 87cbd86 + fa883eb
commit 507aeeb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.changelog/19820.txt b/.changelog/19820.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+data-source/aws_directory_service_directory: Check VpcSettings and ConnectSettings for nil values
+```
diff --git a/aws/data_source_aws_directory_service_directory.go b/aws/data_source_aws_directory_service_directory.go
@@ -182,9 +182,9 @@ func dataSourceAwsDirectoryServiceDirectoryRead(d *schema.ResourceData, meta int
 	d.Set("enable_sso", dir.SsoEnabled)
 
 	var securityGroupId *string
-	if aws.StringValue(dir.Type) == directoryservice.DirectoryTypeAdconnector {
+	if aws.StringValue(dir.Type) == directoryservice.DirectoryTypeAdconnector && dir.ConnectSettings != nil {
 		securityGroupId = dir.ConnectSettings.SecurityGroupId
-	} else {
+	} else if dir.VpcSettings != nil {
 		securityGroupId = dir.VpcSettings.SecurityGroupId
 	}
 	d.Set("security_group_id", securityGroupId)