Merge pull request #16845 from hashicorp/f/appinsights-breaking-api-c…

…hange-16805

r/application_insights_web_test: working around the breaking api change

internal/services/applicationinsights/application_insights_webtests_resource.go

@@ -149,7 +149,7 @@ func resourceApplicationInsightsWebTestsCreateUpdate(d *pluginsdk.ResourceData,
 	id := parse.NewWebTestID(appInsightsId.SubscriptionId, d.Get("resource_group_name").(string), d.Get("name").(string))
 
 	if d.IsNewResource() {
-		existing, err := client.Get(ctx, id.ResourceGroup, id.Name)
+		existing, err := client.Get(ctx, id)
 		if err != nil {
 			if !utils.ResponseWasNotFound(existing.Response) {
 				return fmt.Errorf("checking for presence of existing Application Insights %s: %+v", id, err)
@@ -197,7 +197,7 @@ func resourceApplicationInsightsWebTestsCreateUpdate(d *pluginsdk.ResourceData,
 		Tags: tags.Expand(t),
 	}
 
-	_, err = client.CreateOrUpdate(ctx, id.ResourceGroup, id.Name, webTest)
+	_, err = client.CreateOrUpdate(ctx, id, webTest)
 	if err != nil {
 		return fmt.Errorf("creating/updating Application Insights %s: %+v", id, err)
 	}
@@ -219,7 +219,7 @@ func resourceApplicationInsightsWebTestsRead(d *pluginsdk.ResourceData, meta int
 
 	log.Printf("[DEBUG] Reading AzureRM Application Insights %q", *id)
 
-	resp, err := client.Get(ctx, id.ResourceGroup, id.Name)
+	resp, err := client.Get(ctx, *id)
 	if err != nil {
 		if utils.ResponseWasNotFound(resp.Response) {
 			log.Printf("[DEBUG] Application Insights %s was not found - removing from state!", *id)
@@ -280,7 +280,7 @@ func resourceApplicationInsightsWebTestsDelete(d *pluginsdk.ResourceData, meta i
 
 	log.Printf("[DEBUG] Deleting AzureRM Application Insights %s", *id)
 
-	resp, err := client.Delete(ctx, id.ResourceGroup, id.Name)
+	resp, err := client.Delete(ctx, *id)
 	if err != nil {
 		if resp.StatusCode == http.StatusNotFound {
 			return nil

internal/services/applicationinsights/application_insights_webtests_resource_test.go

@@ -101,7 +101,7 @@ func (t AppInsightsWebTestsResource) Exists(ctx context.Context, clients *client
 		return nil, err
 	}
 
-	resp, err := clients.AppInsights.WebTestsClient.Get(ctx, id.ResourceGroup, id.Name)
+	resp, err := clients.AppInsights.WebTestsClient.Get(ctx, *id)
 	if err != nil {
 		return nil, fmt.Errorf("retrieving Application Insights '%q' (resource group: '%q') does not exist", id.ResourceGroup, id.Name)
 	}

internal/services/applicationinsights/azuresdkhacks/webtests.go

@@ -0,0 +1,70 @@
+package azuresdkhacks
+
+import (
+	"context"
+	"net/http"
+
+	"github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2020-02-02/insights"
+	"github.com/Azure/go-autorest/autorest"
+	"github.com/Azure/go-autorest/autorest/azure"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/applicationinsights/parse"
+)
+
+type WebTestsClient struct {
+	client *insights.WebTestsClient
+}
+
+func NewWebTestsClient(client insights.WebTestsClient) WebTestsClient {
+	return WebTestsClient{
+		client: &client,
+	}
+}
+
+// CreateOrUpdate is a workaround to handle that the Azure API can return either a 200 / 201
+// rather than the 200 documented in the Swagger - this is a workaround until the upstream PR is merged
+// TF issue: https://github.com/hashicorp/terraform-provider-azurerm/issues/16805
+// Swagger PR: https://github.com/Azure/azure-rest-api-specs/pull/19104
+func (c WebTestsClient) CreateOrUpdate(ctx context.Context, id parse.WebTestId, webTestDefinition insights.WebTest) (result insights.WebTest, err error) {
+	req, err := c.client.CreateOrUpdatePreparer(ctx, id.ResourceGroup, id.Name, webTestDefinition)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "insights.WebTestsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		return
+	}
+
+	resp, err := c.client.CreateOrUpdateSender(req)
+	if err != nil {
+		result.Response = autorest.Response{Response: resp}
+		err = autorest.NewErrorWithError(err, "insights.WebTestsClient", "CreateOrUpdate", resp, "Failure sending request")
+		return
+	}
+
+	result, err = c.createOrUpdateResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "insights.WebTestsClient", "CreateOrUpdate", resp, "Failure responding to request")
+		return
+	}
+
+	return
+}
+
+// createOrUpdateResponder is a workaround to handle that the Azure API can return either a 200 / 201
+// rather than the 200 documented in the Swagger - this is a workaround until the upstream PR is merged
+// TF issue: https://github.com/hashicorp/terraform-provider-azurerm/issues/16805
+// Swagger PR: https://github.com/Azure/azure-rest-api-specs/pull/19104
+func (c WebTestsClient) createOrUpdateResponder(resp *http.Response) (result insights.WebTest, err error) {
+	err = autorest.Respond(
+		resp,
+		azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated),
+		autorest.ByUnmarshallingJSON(&result),
+		autorest.ByClosing())
+	result.Response = autorest.Response{Response: resp}
+	return
+}
+
+func (c WebTestsClient) Delete(ctx context.Context, id parse.WebTestId) (result autorest.Response, err error) {
+	return c.client.Delete(ctx, id.ResourceGroup, id.Name)
+}
+
+func (c WebTestsClient) Get(ctx context.Context, id parse.WebTestId) (result insights.WebTest, err error) {
+	return c.client.Get(ctx, id.ResourceGroup, id.Name)
+}

internal/services/applicationinsights/client/client.go

@@ -3,13 +3,14 @@ package client
 import (
 	"github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2020-02-02/insights"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/common"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/applicationinsights/azuresdkhacks"
 )
 
 type Client struct {
 	AnalyticsItemsClient     *insights.AnalyticsItemsClient
 	APIKeysClient            *insights.APIKeysClient
 	ComponentsClient         *insights.ComponentsClient
-	WebTestsClient           *insights.WebTestsClient
+	WebTestsClient           *azuresdkhacks.WebTestsClient
 	BillingClient            *insights.ComponentCurrentBillingFeaturesClient
 	SmartDetectionRuleClient *insights.ProactiveDetectionConfigurationsClient
 }
@@ -26,6 +27,7 @@ func NewClient(o *common.ClientOptions) *Client {
 
 	webTestsClient := insights.NewWebTestsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&webTestsClient.Client, o.ResourceManagerAuthorizer)
+	webTestsWorkaroundClient := azuresdkhacks.NewWebTestsClient(webTestsClient)
 
 	billingClient := insights.NewComponentCurrentBillingFeaturesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&billingClient.Client, o.ResourceManagerAuthorizer)
@@ -37,7 +39,7 @@ func NewClient(o *common.ClientOptions) *Client {
 		AnalyticsItemsClient:     &analyticsItemsClient,
 		APIKeysClient:            &apiKeysClient,
 		ComponentsClient:         &componentsClient,
-		WebTestsClient:           &webTestsClient,
+		WebTestsClient:           &webTestsWorkaroundClient,
 		BillingClient:            &billingClient,
 		SmartDetectionRuleClient: &smartDetectionRuleClient,
 	}