fixing delete behavior on load balancer resources for Failed work requests

rcohenma · rcohenma · commit 33a9a3ecc3ac · 2018-07-06T17:07:30.000-07:00
diff --git a/provider/load_balancer_backend_resource.go b/provider/load_balancer_backend_resource.go
@@ -231,6 +231,10 @@ func (s *BackendResourceCrud) Create() error {
 		return err
 	}
 	s.WorkRequest = &workRequestResponse.WorkRequest
+	err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -365,6 +369,10 @@ func (s *BackendResourceCrud) Delete() error {
 	}
 	s.WorkRequest = &workRequestResponse.WorkRequest
 	s.D.SetId(*workReqID)
+	err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
diff --git a/provider/load_balancer_backend_set_resource.go b/provider/load_balancer_backend_set_resource.go
@@ -356,6 +356,10 @@ func (s *BackendSetResourceCrud) Create() error {
 		return err
 	}
 	s.WorkRequest = &workRequestResponse.WorkRequest
+	err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -497,6 +501,10 @@ func (s *BackendSetResourceCrud) Delete() error {
 		return err
 	}
 	s.WorkRequest = &workRequestResponse.WorkRequest
+	err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
diff --git a/provider/load_balancer_certificate_resource.go b/provider/load_balancer_certificate_resource.go
@@ -191,6 +191,10 @@ func (s *CertificateResourceCrud) Create() error {
 		return err
 	}
 	s.WorkRequest = &workRequestResponse.WorkRequest
+	err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -255,6 +259,10 @@ func (s *CertificateResourceCrud) Delete() error {
 		return err
 	}
 	s.WorkRequest = &workRequestResponse.WorkRequest
+	err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
diff --git a/provider/load_balancer_hostname_resource.go b/provider/load_balancer_hostname_resource.go
@@ -166,6 +166,10 @@ func (s *HostnameResourceCrud) Create() error {
 		return err
 	}
 	s.WorkRequest = &workRequestResponse.WorkRequest
+	err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -271,6 +275,10 @@ func (s *HostnameResourceCrud) Delete() error {
 		return err
 	}
 	s.WorkRequest = &workRequestResponse.WorkRequest
+	err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
diff --git a/provider/load_balancer_listener_resource.go b/provider/load_balancer_listener_resource.go
@@ -272,6 +272,10 @@ func (s *ListenerResourceCrud) Create() error {
 		return err
 	}
 	s.WorkRequest = &workRequestResponse.WorkRequest
+	err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -420,6 +424,10 @@ func (s *ListenerResourceCrud) Delete() error {
 		return err
 	}
 	s.WorkRequest = &workRequestResponse.WorkRequest
+	err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
diff --git a/provider/load_balancer_load_balancer_resource.go b/provider/load_balancer_load_balancer_resource.go
@@ -212,6 +212,10 @@ func (s *LoadBalancerResourceCrud) Create() error {
 	}
 	s.WorkRequest = &workRequestResponse.WorkRequest
 	s.D.Set("state", s.WorkRequest.LifecycleState)
+	err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -301,6 +305,10 @@ func (s *LoadBalancerResourceCrud) Delete() error {
 		return err
 	}
 	s.WorkRequest = &workRequestResponse.WorkRequest
+	err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
diff --git a/provider/load_balancer_path_route_set_resource.go b/provider/load_balancer_path_route_set_resource.go
@@ -207,6 +207,10 @@ func (s *PathRouteSetResourceCrud) Create() error {
 		return err
 	}
 	s.WorkRequest = &workRequestResponse.WorkRequest
+	err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -317,6 +321,10 @@ func (s *PathRouteSetResourceCrud) Delete() error {
 		return err
 	}
 	s.WorkRequest = &workRequestResponse.WorkRequest
+	err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))
+	if err != nil {
+		return err
+	}
 	return nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -231,6 +231,10 @@ func (s *BackendResourceCrud) Create() error {`
`231`	`231`	`return err`
`232`	`232`	`}`
`233`	`233`	`s.WorkRequest = &workRequestResponse.WorkRequest`
	`234`	`+ err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))`
	`235`	`+ if err != nil {`
	`236`	`+ return err`
	`237`	`+ }`
`234`	`238`	`return nil`
`235`	`239`	`}`
`236`	`240`
`@@ -365,6 +369,10 @@ func (s *BackendResourceCrud) Delete() error {`
`365`	`369`	`}`
`366`	`370`	`s.WorkRequest = &workRequestResponse.WorkRequest`
`367`	`371`	`s.D.SetId(*workReqID)`
	`372`	`+ err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))`
	`373`	`+ if err != nil {`
	`374`	`+ return err`
	`375`	`+ }`
`368`	`376`	`return nil`
`369`	`377`	`}`
`370`	`378`
Original file line number	Diff line number	Diff line change
`@@ -356,6 +356,10 @@ func (s *BackendSetResourceCrud) Create() error {`
`356`	`356`	`return err`
`357`	`357`	`}`
`358`	`358`	`s.WorkRequest = &workRequestResponse.WorkRequest`
	`359`	`+ err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))`
	`360`	`+ if err != nil {`
	`361`	`+ return err`
	`362`	`+ }`
`359`	`363`	`return nil`
`360`	`364`	`}`
`361`	`365`
`@@ -497,6 +501,10 @@ func (s *BackendSetResourceCrud) Delete() error {`
`497`	`501`	`return err`
`498`	`502`	`}`
`499`	`503`	`s.WorkRequest = &workRequestResponse.WorkRequest`
	`504`	`+ err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))`
	`505`	`+ if err != nil {`
	`506`	`+ return err`
	`507`	`+ }`
`500`	`508`	`return nil`
`501`	`509`	`}`
`502`	`510`
Original file line number	Diff line number	Diff line change
`@@ -191,6 +191,10 @@ func (s *CertificateResourceCrud) Create() error {`
`191`	`191`	`return err`
`192`	`192`	`}`
`193`	`193`	`s.WorkRequest = &workRequestResponse.WorkRequest`
	`194`	`+ err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))`
	`195`	`+ if err != nil {`
	`196`	`+ return err`
	`197`	`+ }`
`194`	`198`	`return nil`
`195`	`199`	`}`
`196`	`200`
`@@ -255,6 +259,10 @@ func (s *CertificateResourceCrud) Delete() error {`
`255`	`259`	`return err`
`256`	`260`	`}`
`257`	`261`	`s.WorkRequest = &workRequestResponse.WorkRequest`
	`262`	`+ err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))`
	`263`	`+ if err != nil {`
	`264`	`+ return err`
	`265`	`+ }`
`258`	`266`	`return nil`
`259`	`267`	`}`
`260`	`268`
Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,10 @@ func (s *HostnameResourceCrud) Create() error {`
`166`	`166`	`return err`
`167`	`167`	`}`
`168`	`168`	`s.WorkRequest = &workRequestResponse.WorkRequest`
	`169`	`+ err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))`
	`170`	`+ if err != nil {`
	`171`	`+ return err`
	`172`	`+ }`
`169`	`173`	`return nil`
`170`	`174`	`}`
`171`	`175`
`@@ -271,6 +275,10 @@ func (s *HostnameResourceCrud) Delete() error {`
`271`	`275`	`return err`
`272`	`276`	`}`
`273`	`277`	`s.WorkRequest = &workRequestResponse.WorkRequest`
	`278`	`+ err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))`
	`279`	`+ if err != nil {`
	`280`	`+ return err`
	`281`	`+ }`
`274`	`282`	`return nil`
`275`	`283`	`}`
`276`	`284`
Original file line number	Diff line number	Diff line change
`@@ -272,6 +272,10 @@ func (s *ListenerResourceCrud) Create() error {`
`272`	`272`	`return err`
`273`	`273`	`}`
`274`	`274`	`s.WorkRequest = &workRequestResponse.WorkRequest`
	`275`	`+ err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))`
	`276`	`+ if err != nil {`
	`277`	`+ return err`
	`278`	`+ }`
`275`	`279`	`return nil`
`276`	`280`	`}`
`277`	`281`
`@@ -420,6 +424,10 @@ func (s *ListenerResourceCrud) Delete() error {`
`420`	`424`	`return err`
`421`	`425`	`}`
`422`	`426`	`s.WorkRequest = &workRequestResponse.WorkRequest`
	`427`	`+ err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))`
	`428`	`+ if err != nil {`
	`429`	`+ return err`
	`430`	`+ }`
`423`	`431`	`return nil`
`424`	`432`	`}`
`425`	`433`
Original file line number	Diff line number	Diff line change
`@@ -212,6 +212,10 @@ func (s *LoadBalancerResourceCrud) Create() error {`
`212`	`212`	`}`
`213`	`213`	`s.WorkRequest = &workRequestResponse.WorkRequest`
`214`	`214`	`s.D.Set("state", s.WorkRequest.LifecycleState)`
	`215`	`+ err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))`
	`216`	`+ if err != nil {`
	`217`	`+ return err`
	`218`	`+ }`
`215`	`219`	`return nil`
`216`	`220`	`}`
`217`	`221`
`@@ -301,6 +305,10 @@ func (s *LoadBalancerResourceCrud) Delete() error {`
`301`	`305`	`return err`
`302`	`306`	`}`
`303`	`307`	`s.WorkRequest = &workRequestResponse.WorkRequest`
	`308`	`+ err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))`
	`309`	`+ if err != nil {`
	`310`	`+ return err`
	`311`	`+ }`
`304`	`312`	`return nil`
`305`	`313`	`}`
`306`	`314`
Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,10 @@ func (s *PathRouteSetResourceCrud) Create() error {`
`207`	`207`	`return err`
`208`	`208`	`}`
`209`	`209`	`s.WorkRequest = &workRequestResponse.WorkRequest`
	`210`	`+ err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))`
	`211`	`+ if err != nil {`
	`212`	`+ return err`
	`213`	`+ }`
`210`	`214`	`return nil`
`211`	`215`	`}`
`212`	`216`
`@@ -317,6 +321,10 @@ func (s *PathRouteSetResourceCrud) Delete() error {`
`317`	`321`	`return err`
`318`	`322`	`}`
`319`	`323`	`s.WorkRequest = &workRequestResponse.WorkRequest`
	`324`	`+ err = crud.LoadBalancerWaitForWorkRequest(s.Client, s.D, s.WorkRequest, getRetryPolicy(s.DisableNotFoundRetries, "load_balancer"))`
	`325`	`+ if err != nil {`
	`326`	`+ return err`
	`327`	`+ }`
`320`	`328`	`return nil`
`321`	`329`	`}`
`322`	`330`