Merge pull request #7547 from ptv-logistics/bugfix/g7539-wait-for-com…

…pletion-nv fixes not waiting for createOrUpdate and throwing "Not found" after creation
hashicorp · Jul 1, 2020 · a1587c7 · a1587c7
2 parents 224705c + a07ee8a
commit a1587c7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/azurerm/internal/services/apimanagement/api_management_named_value_resource.go b/azurerm/internal/services/apimanagement/api_management_named_value_resource.go
@@ -102,10 +102,15 @@ func resourceArmApiManagementNamedValueCreateUpdate(d *schema.ResourceData, meta
 		parameters.NamedValueCreateContractProperties.Tags = utils.ExpandStringSlice(tags.([]interface{}))
 	}
 
-	if _, err := client.CreateOrUpdate(ctx, resourceGroup, serviceName, name, parameters, ""); err != nil {
+	future, err := client.CreateOrUpdate(ctx, resourceGroup, serviceName, name, parameters, "")
+	if err != nil {
 		return fmt.Errorf(" creating or updating Property %q (Resource Group %q / API Management Service %q): %+v", name, resourceGroup, serviceName, err)
 	}
 
+	if err = future.WaitForCompletionRef(ctx, client.Client); err != nil {
+		return fmt.Errorf("waiting on creating/updating Property %q (Resource Group %q / API Management Service %q): %+v", name, resourceGroup, serviceName, err)
+	}
+
 	resp, err := client.Get(ctx, resourceGroup, serviceName, name)
 	if err != nil {
 		return fmt.Errorf(" retrieving Property %q (Resource Group %q / API Management Service %q): %+v", name, resourceGroup, serviceName, err)

diff --git a/azurerm/internal/services/apimanagement/api_management_property_resource.go b/azurerm/internal/services/apimanagement/api_management_property_resource.go
@@ -115,8 +115,13 @@ func resourceArmApiManagementPropertyCreateUpdate(d *schema.ResourceData, meta i
 		parameters.NamedValueCreateContractProperties.Tags = utils.ExpandStringSlice(tags.([]interface{}))
 	}
 
-	if _, err := client.CreateOrUpdate(ctx, resourceGroup, serviceName, name, parameters, ""); err != nil {
-		return fmt.Errorf("creating or updating Property %q (Resource Group %q / API Management Service %q): %+v", name, resourceGroup, serviceName, err)
+	future, err := client.CreateOrUpdate(ctx, resourceGroup, serviceName, name, parameters, "")
+	if err != nil {
+		return fmt.Errorf(" creating or updating Property %q (Resource Group %q / API Management Service %q): %+v", name, resourceGroup, serviceName, err)
+	}
+
+	if err = future.WaitForCompletionRef(ctx, client.Client); err != nil {
+		return fmt.Errorf("waiting on creating/updating Property %q (Resource Group %q / API Management Service %q): %+v", name, resourceGroup, serviceName, err)
 	}
 
 	resp, err := client.Get(ctx, resourceGroup, serviceName, name)