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_storage_account - fix crash in multichannel checking #19298

Merged
merged 3 commits into from
Nov 24, 2022

Conversation

jackofallops
Copy link
Member

Fixes #19220

@jackofallops jackofallops added this to the v3.32.0 milestone Nov 15, 2022
@jackofallops jackofallops requested a review from a team November 15, 2022 10:32
@jackofallops jackofallops self-assigned this Nov 15, 2022
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.

Left a few comments inline but otherwise 👍

internal/services/storage/storage_account_resource.go Outdated Show resolved Hide resolved
Comment on lines +1345 to 1351
if smb != nil && smb.Multichannel != nil {

if smb.Multichannel.Enabled != nil {
if *shareProperties.FileServicePropertiesProperties.ProtocolSettings.Smb.Multichannel.Enabled {
return fmt.Errorf("`multichannel_enabled` isn't supported for Standard tier Storage accounts")
}
}
Copy link
Contributor

Choose a reason for hiding this comment

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

probably could simplify this to:

Suggested change
if smb != nil && smb.Multichannel != nil {
if smb.Multichannel.Enabled != nil {
if *shareProperties.FileServicePropertiesProperties.ProtocolSettings.Smb.Multichannel.Enabled {
return fmt.Errorf("`multichannel_enabled` isn't supported for Standard tier Storage accounts")
}
}
if smb != nil && smb.Multichannel != nil && smb.Multichannel.Enabled != nil && * smb.Multichannel.Enabled {
return fmt.Errorf("`multichannel_enabled` isn't supported for Standard tier Storage accounts")
}

Copy link
Member Author

Choose a reason for hiding this comment

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

This is dual purpose here, we need to error on *smb.Multichannel.Enabled == true and zero the *smb.Multichannel regardless, hence the split of if conditions, so I think this is correct as is?

Copy link
Contributor

Choose a reason for hiding this comment

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

sorry missed this notification - sounds good/works for me

@manicminer manicminer modified the milestones: v3.32.0, v3.33.0 Nov 17, 2022
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.

LGTM 👍

Comment on lines +1345 to 1351
if smb != nil && smb.Multichannel != nil {

if smb.Multichannel.Enabled != nil {
if *shareProperties.FileServicePropertiesProperties.ProtocolSettings.Smb.Multichannel.Enabled {
return fmt.Errorf("`multichannel_enabled` isn't supported for Standard tier Storage accounts")
}
}
Copy link
Contributor

Choose a reason for hiding this comment

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

sorry missed this notification - sounds good/works for me

@jackofallops jackofallops merged commit 477120a into main Nov 24, 2022
@jackofallops jackofallops deleted the b/storage-account-multichannel-crash branch November 24, 2022 11:01
jackofallops added a commit that referenced this pull request Nov 24, 2022
leesutcliffe pushed a commit to leesutcliffe/terraform-provider-azurerm that referenced this pull request Nov 24, 2022
leesutcliffe pushed a commit to leesutcliffe/terraform-provider-azurerm that referenced this pull request Nov 24, 2022
@github-actions
Copy link

This functionality has been released in v3.33.0 of the Terraform Provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template. Thank you!

@github-actions
Copy link

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 26, 2022
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.

SIGSEGV with azurerm_storage_account creation when empty share_properties block is provided.
3 participants