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

Jump to bottom

Fix TC for TestAccAzureRMApplicationInsightsAPIKey_requiresImport #7650

Merged
merged 2 commits into from
Jul 9, 2020
Merged

Fix TC for TestAccAzureRMApplicationInsightsAPIKey_requiresImport #7650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb3837c
Fix TC for TestAccAzureRMApplicationInsightsAPIKey_requiresImport
Jul 9, 2020
c7c38b5
Update code
Jul 9, 2020
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
26 changes: 24 additions & 2 deletions azurerm/internal/services/applicationinsights/application_insights_api_key_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,33 @@ func resourceArmApplicationInsightsAPIKeyCreate(d *schema.ResourceData, meta int
appInsightsName := id.Path["components"]

if features.ShouldResourcesBeImported() {
var existingAPIKeyList insights.ApplicationInsightsComponentAPIKeyListResult
var keyId string
existingAPIKeyList, err = client.List(ctx, resGroup, appInsightsName)
if err != nil {
if !utils.ResponseWasNotFound(existingAPIKeyList.Response) {
return fmt.Errorf("checking for presence of existing Application Insights API key list (Application Insights %q / Resource Group %q): %s", appInsightsName, resGroup, err)
}
}

for _, existingAPIKey := range *existingAPIKeyList.Value {
existingAPIKeyId, err := azure.ParseAzureResourceID(*existingAPIKey.ID)
if err != nil {
return err
}

existingAppInsightsName := existingAPIKeyId.Path["components"]
if appInsightsName == existingAppInsightsName {
keyId = existingAPIKeyId.Path["apikeys"]
break
}
}

var existing insights.ApplicationInsightsComponentAPIKey
existing, err = client.Get(ctx, resGroup, appInsightsName, name)
existing, err = client.Get(ctx, resGroup, appInsightsName, keyId)
if err != nil {
if !utils.ResponseWasNotFound(existing.Response) {
return fmt.Errorf("Error checking for presence of existing Application Insights API key %q (Resource Group %q): %s", name, resGroup, err)
return fmt.Errorf("checking for presence of existing Application Insights API key %q (Resource Group %q): %s", name, resGroup, err)
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...internal/services/applicationinsights/tests/application_insights_api_key_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ func TestAccAzureRMApplicationInsightsAPIKey_requiresImport(t *testing.T) {
),
},
{
Config: testAccAzureRMApplicationInsightsAPIKey_requiresImport(data, "[]", "[]"),
ExpectError: acceptance.RequiresImportError("azurerm_application_insights"),
Config: testAccAzureRMApplicationInsightsAPIKey_requiresImport(data, "[]", `["annotations"]`),
ExpectError: acceptance.RequiresImportError("azurerm_application_insights_api_key"),
},
},
})
Expand Down