Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check VpcSettings and ConnectSettings for nil values #19820

Merged
merged 2 commits into from
Jun 17, 2021
Merged

Check VpcSettings and ConnectSettings for nil values #19820

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acf4b55
Check for nil values
bill-rich Jun 15, 2021
fa883eb
Add CHANGELOG entry
bill-rich Jun 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions aws/data_source_aws_directory_service_directory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down