spring_cloud_java_deployment_resource wait LRO (#15833)

Co-authored-by: heiazuo <[email protected]>
hashicorp · Mar 20, 2022 · 9876d70 · 9876d70
1 parent 4a92e4a
commit 9876d70
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/internal/services/springcloud/spring_cloud_java_deployment_resource.go b/internal/services/springcloud/spring_cloud_java_deployment_resource.go
@@ -250,9 +250,13 @@ func resourceSpringCloudJavaDeploymentDelete(d *pluginsdk.ResourceData, meta int
 		return err
 	}
 
-	if _, err := client.Delete(ctx, id.ResourceGroup, id.SpringName, id.AppName, id.DeploymentName); err != nil {
+	future, err := client.Delete(ctx, id.ResourceGroup, id.SpringName, id.AppName, id.DeploymentName)
+	if err != nil {
 		return fmt.Errorf("deleting Spring Cloud Deployment %q (Spring Cloud Service %q / App %q / resource Group %q): %+v", id.DeploymentName, id.SpringName, id.AppName, id.ResourceGroup, err)
 	}
+	if err := future.WaitForCompletionRef(ctx, client.Client); err != nil {
+		return fmt.Errorf("waiting for deletion of %q: %+v", id, err)
+	}
 
 	return nil
 }

diff --git a/internal/services/springcloud/spring_cloud_java_deployment_resource_test.go b/internal/services/springcloud/spring_cloud_java_deployment_resource_test.go
@@ -166,8 +166,8 @@ resource "azurerm_spring_cloud_java_deployment" "test" {
   runtime_version     = "Java_11"
 
   quota {
-    cpu    = "500m"
-    memory = "4Gi"
+    cpu    = "2"
+    memory = "2Gi"
   }
 
   environment_variables = {