From c41ba3eedf4c54891df4659860d741d42ca1ff68 Mon Sep 17 00:00:00 2001 From: Haowei Cai Date: Wed, 28 Apr 2021 21:53:15 -0700 Subject: [PATCH] gke node pool: add 404 response code check on delete call --- .../terraform/resources/resource_container_node_pool.go.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mmv1/third_party/terraform/resources/resource_container_node_pool.go.erb b/mmv1/third_party/terraform/resources/resource_container_node_pool.go.erb index 63892e29ff53..c0da35674884 100644 --- a/mmv1/third_party/terraform/resources/resource_container_node_pool.go.erb +++ b/mmv1/third_party/terraform/resources/resource_container_node_pool.go.erb @@ -482,6 +482,10 @@ func resourceContainerNodePoolDelete(d *schema.ResourceData, meta interface{}) e //Check cluster is in running state _, err = containerClusterAwaitRestingState(config, nodePoolInfo.project, nodePoolInfo.location, nodePoolInfo.cluster, userAgent, d.Timeout(schema.TimeoutCreate)) if err != nil { + if isGoogleApiErrorWithCode(err, 404) { + log.Printf("[INFO] GKE node pool %s doesn't exist to delete", d.Id()) + return nil + } return err }