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

storage_account: Ignore Advanced Threat Protection read errors in Azure Germany #4564

Merged
merged 1 commit into from
Oct 9, 2019
Merged

storage_account: Ignore Advanced Threat Protection read errors in Azure Germany #4564

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions azurerm/resource_arm_storage_account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,9 +1103,11 @@ func resourceArmStorageAccountRead(d *schema.ResourceData, meta interface{}) err
atp, err := advancedThreatProtectionClient.Get(ctx, d.Id())
if err != nil {
msg := err.Error()
if !strings.Contains(msg, "No registered resource provider found for location '") {
if !strings.Contains(msg, "' and API version '2017-08-01-preview' for type ") {
return fmt.Errorf("Error reading the advanced threat protection settings of AzureRM Storage Account %q: %+v", name, err)
if msg != "The resource namespace 'Microsoft.Security' is invalid." {
if !strings.Contains(msg, "No registered resource provider found for location '") {
if !strings.Contains(msg, "' and API version '2017-08-01-preview' for type ") {
return fmt.Errorf("Error reading the advanced threat protection settings of AzureRM Storage Account %q: %+v", name, err)
}
}
}
} else {
Expand Down