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.

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

[azurerm_private_link_service] Nil check additional properties #6504

Merged
merged 2 commits into from
Apr 17, 2020

Conversation

hbuckle
Copy link
Contributor

@hbuckle hbuckle commented Apr 16, 2020

We noticed the API doesn't always return these properties which was causing a crash

@ghost ghost added the size/XS label Apr 16, 2020
Copy link
Contributor

@tombuildsstuff tombuildsstuff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hey @hbuckle

Thanks for this PR - taking a look through this is looking good to me 👍

Thanks!

if err := d.Set("auto_approval_subscription_ids", utils.FlattenStringSlice(props.AutoApproval.Subscriptions)); err != nil {
return fmt.Errorf("Error setting `auto_approval_subscription_ids`: %+v", err)
if autoApproval := props.AutoApproval; autoApproval != nil {
if autoApproval.Subscriptions != nil {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can remove this inner nil-check since the flatten func will handle returning an empty array if this is nil

if err := d.Set("visibility_subscription_ids", utils.FlattenStringSlice(props.Visibility.Subscriptions)); err != nil {
return fmt.Errorf("Error setting `visibility_subscription_ids`: %+v", err)
if visibility := props.Visibility; visibility != nil {
if visibility.Subscriptions != nil {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can remove this inner nil-check since the flatten func will handle returning an empty array if this is nil

@tombuildsstuff
Copy link
Contributor

LGTM - thanks for this @hbuckle

@tombuildsstuff tombuildsstuff merged commit 18bc30a into hashicorp:master Apr 17, 2020
tombuildsstuff added a commit that referenced this pull request Apr 17, 2020
sirlatrom pushed a commit to sirlatrom/terraform-provider-azurerm that referenced this pull request Apr 20, 2020
@ghost
Copy link

ghost commented Apr 23, 2020

This has been released in version 2.7.0 of the provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading. As an example:

provider "azurerm" {
    version = "~> 2.7.0"
}
# ... other configuration ...

@ghost
Copy link

ghost commented May 17, 2020

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. If you feel I made an error 🤖 🙉 , please reach out to my human friends 👉 [email protected]. Thanks!

@ghost ghost locked and limited conversation to collaborators May 17, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants