Merge pull request kubernetes#66736 from hanxiaoshuai/cleanup0728

Kubernetes Submit Queue · web-flow · commit 83f6efcec031 · 2018-08-07T03:34:28.000-07:00
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. use func WaitForCompletionRef replace of deprecated func WaitForCompletion **What this PR does / why we need it**: use func WaitForCompletionRef replace of deprecated func WaitForCompletion ``` // WaitForCompletion will return when one of the following conditions is met: the long // running operation has completed, the provided context is cancelled, or the client's // polling duration has been exceeded. It will retry failed polling attempts based on // the retry value defined in the client up to the maximum retry attempts. // Deprecated: Please use WaitForCompletionRef() instead. func (f Future) WaitForCompletion(ctx context.Context, client autorest.Client) error { return f.WaitForCompletionRef(ctx, client) } ``` **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
diff --git a/pkg/cloudprovider/providers/azure/azure_client.go b/pkg/cloudprovider/providers/azure/azure_client.go
@@ -185,7 +185,7 @@ func (az *azVirtualMachinesClient) CreateOrUpdate(ctx context.Context, resourceG
 		return future.Response(), err
 	}
 
-	err = future.WaitForCompletion(ctx, az.client.Client)
+	err = future.WaitForCompletionRef(ctx, az.client.Client)
 	mc.Observe(err)
 	return future.Response(), err
 }
@@ -277,7 +277,7 @@ func (az *azInterfacesClient) CreateOrUpdate(ctx context.Context, resourceGroupN
 		return future.Response(), err
 	}
 
-	err = future.WaitForCompletion(ctx, az.client.Client)
+	err = future.WaitForCompletionRef(ctx, az.client.Client)
 	mc.Observe(err)
 	return future.Response(), err
 }
@@ -356,7 +356,7 @@ func (az *azLoadBalancersClient) CreateOrUpdate(ctx context.Context, resourceGro
 		return future.Response(), err
 	}
 
-	err = future.WaitForCompletion(ctx, az.client.Client)
+	err = future.WaitForCompletionRef(ctx, az.client.Client)
 	mc.Observe(err)
 	return future.Response(), err
 }
@@ -380,7 +380,7 @@ func (az *azLoadBalancersClient) Delete(ctx context.Context, resourceGroupName s
 		return future.Response(), err
 	}
 
-	err = future.WaitForCompletion(ctx, az.client.Client)
+	err = future.WaitForCompletionRef(ctx, az.client.Client)
 	mc.Observe(err)
 	return future.Response(), err
 }
@@ -472,7 +472,7 @@ func (az *azPublicIPAddressesClient) CreateOrUpdate(ctx context.Context, resourc
 		return future.Response(), err
 	}
 
-	err = future.WaitForCompletion(ctx, az.client.Client)
+	err = future.WaitForCompletionRef(ctx, az.client.Client)
 	mc.Observe(err)
 	return future.Response(), err
 }
@@ -496,7 +496,7 @@ func (az *azPublicIPAddressesClient) Delete(ctx context.Context, resourceGroupNa
 		return future.Response(), err
 	}
 
-	err = future.WaitForCompletion(ctx, az.client.Client)
+	err = future.WaitForCompletionRef(ctx, az.client.Client)
 	mc.Observe(err)
 	return future.Response(), err
 }
@@ -587,7 +587,7 @@ func (az *azSubnetsClient) CreateOrUpdate(ctx context.Context, resourceGroupName
 		return future.Response(), err
 	}
 
-	err = future.WaitForCompletion(ctx, az.client.Client)
+	err = future.WaitForCompletionRef(ctx, az.client.Client)
 	mc.Observe(err)
 	return future.Response(), err
 }
@@ -611,7 +611,7 @@ func (az *azSubnetsClient) Delete(ctx context.Context, resourceGroupName string,
 		return future.Response(), err
 	}
 
-	err = future.WaitForCompletion(ctx, az.client.Client)
+	err = future.WaitForCompletionRef(ctx, az.client.Client)
 	mc.Observe(err)
 	return future.Response(), err
 }
@@ -702,7 +702,7 @@ func (az *azSecurityGroupsClient) CreateOrUpdate(ctx context.Context, resourceGr
 		return future.Response(), err
 	}
 
-	err = future.WaitForCompletion(ctx, az.client.Client)
+	err = future.WaitForCompletionRef(ctx, az.client.Client)
 	mc.Observe(err)
 	return future.Response(), err
 }
@@ -726,7 +726,7 @@ func (az *azSecurityGroupsClient) Delete(ctx context.Context, resourceGroupName
 		return future.Response(), err
 	}
 
-	err = future.WaitForCompletion(ctx, az.client.Client)
+	err = future.WaitForCompletionRef(ctx, az.client.Client)
 	mc.Observe(err)
 	return future.Response(), err
 }
@@ -817,7 +817,7 @@ func (az *azVirtualMachineScaleSetsClient) CreateOrUpdate(ctx context.Context, r
 		return future.Response(), err
 	}
 
-	err = future.WaitForCompletion(ctx, az.client.Client)
+	err = future.WaitForCompletionRef(ctx, az.client.Client)
 	mc.Observe(err)
 	return future.Response(), err
 }
@@ -888,7 +888,7 @@ func (az *azVirtualMachineScaleSetsClient) UpdateInstances(ctx context.Context,
 		return future.Response(), err
 	}
 
-	err = future.WaitForCompletion(ctx, az.client.Client)
+	err = future.WaitForCompletionRef(ctx, az.client.Client)
 	mc.Observe(err)
 	return future.Response(), err
 }
@@ -996,7 +996,7 @@ func (az *azVirtualMachineScaleSetVMsClient) Update(ctx context.Context, resourc
 		return future.Response(), err
 	}
 
-	err = future.WaitForCompletion(ctx, az.client.Client)
+	err = future.WaitForCompletionRef(ctx, az.client.Client)
 	mc.Observe(err)
 	return future.Response(), err
 }
@@ -1041,7 +1041,7 @@ func (az *azRoutesClient) CreateOrUpdate(ctx context.Context, resourceGroupName
 		return future.Response(), err
 	}
 
-	err = future.WaitForCompletion(ctx, az.client.Client)
+	err = future.WaitForCompletionRef(ctx, az.client.Client)
 	mc.Observe(err)
 	return future.Response(), err
 }
@@ -1065,7 +1065,7 @@ func (az *azRoutesClient) Delete(ctx context.Context, resourceGroupName string,
 		return future.Response(), err
 	}
 
-	err = future.WaitForCompletion(ctx, az.client.Client)
+	err = future.WaitForCompletionRef(ctx, az.client.Client)
 	mc.Observe(err)
 	return future.Response(), err
 }
@@ -1110,7 +1110,7 @@ func (az *azRouteTablesClient) CreateOrUpdate(ctx context.Context, resourceGroup
 		return future.Response(), err
 	}
 
-	err = future.WaitForCompletion(ctx, az.client.Client)
+	err = future.WaitForCompletionRef(ctx, az.client.Client)
 	mc.Observe(err)
 	return future.Response(), err
 }
@@ -1170,7 +1170,7 @@ func (az *azStorageAccountClient) Create(ctx context.Context, resourceGroupName
 		return future.Response(), err
 	}
 
-	err = future.WaitForCompletion(ctx, az.client.Client)
+	err = future.WaitForCompletionRef(ctx, az.client.Client)
 	mc.Observe(err)
 	return future.Response(), err
 }
@@ -1282,7 +1282,7 @@ func (az *azDisksClient) CreateOrUpdate(ctx context.Context, resourceGroupName s
 		return future.Response(), err
 	}
 
-	err = future.WaitForCompletion(ctx, az.client.Client)
+	err = future.WaitForCompletionRef(ctx, az.client.Client)
 	mc.Observe(err)
 	return future.Response(), err
 }
@@ -1306,7 +1306,7 @@ func (az *azDisksClient) Delete(ctx context.Context, resourceGroupName string, d
 		return future.Response(), err
 	}
 
-	err = future.WaitForCompletion(ctx, az.client.Client)
+	err = future.WaitForCompletionRef(ctx, az.client.Client)
 	mc.Observe(err)
 	return future.Response(), err
 }

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ func (az *azVirtualMachinesClient) CreateOrUpdate(ctx context.Context, resourceG`
`185`	`185`	`return future.Response(), err`
`186`	`186`	`}`
`187`	`187`
`188`		`- err = future.WaitForCompletion(ctx, az.client.Client)`
	`188`	`+ err = future.WaitForCompletionRef(ctx, az.client.Client)`
`189`	`189`	`mc.Observe(err)`
`190`	`190`	`return future.Response(), err`
`191`	`191`	`}`
`@@ -277,7 +277,7 @@ func (az *azInterfacesClient) CreateOrUpdate(ctx context.Context, resourceGroupN`
`277`	`277`	`return future.Response(), err`
`278`	`278`	`}`
`279`	`279`
`280`		`- err = future.WaitForCompletion(ctx, az.client.Client)`
	`280`	`+ err = future.WaitForCompletionRef(ctx, az.client.Client)`
`281`	`281`	`mc.Observe(err)`
`282`	`282`	`return future.Response(), err`
`283`	`283`	`}`
`@@ -356,7 +356,7 @@ func (az *azLoadBalancersClient) CreateOrUpdate(ctx context.Context, resourceGro`
`356`	`356`	`return future.Response(), err`
`357`	`357`	`}`
`358`	`358`
`359`		`- err = future.WaitForCompletion(ctx, az.client.Client)`
	`359`	`+ err = future.WaitForCompletionRef(ctx, az.client.Client)`
`360`	`360`	`mc.Observe(err)`
`361`	`361`	`return future.Response(), err`
`362`	`362`	`}`
`@@ -380,7 +380,7 @@ func (az *azLoadBalancersClient) Delete(ctx context.Context, resourceGroupName s`
`380`	`380`	`return future.Response(), err`
`381`	`381`	`}`
`382`	`382`
`383`		`- err = future.WaitForCompletion(ctx, az.client.Client)`
	`383`	`+ err = future.WaitForCompletionRef(ctx, az.client.Client)`
`384`	`384`	`mc.Observe(err)`
`385`	`385`	`return future.Response(), err`
`386`	`386`	`}`
`@@ -472,7 +472,7 @@ func (az *azPublicIPAddressesClient) CreateOrUpdate(ctx context.Context, resourc`
`472`	`472`	`return future.Response(), err`
`473`	`473`	`}`
`474`	`474`
`475`		`- err = future.WaitForCompletion(ctx, az.client.Client)`
	`475`	`+ err = future.WaitForCompletionRef(ctx, az.client.Client)`
`476`	`476`	`mc.Observe(err)`
`477`	`477`	`return future.Response(), err`
`478`	`478`	`}`
`@@ -496,7 +496,7 @@ func (az *azPublicIPAddressesClient) Delete(ctx context.Context, resourceGroupNa`
`496`	`496`	`return future.Response(), err`
`497`	`497`	`}`
`498`	`498`
`499`		`- err = future.WaitForCompletion(ctx, az.client.Client)`
	`499`	`+ err = future.WaitForCompletionRef(ctx, az.client.Client)`
`500`	`500`	`mc.Observe(err)`
`501`	`501`	`return future.Response(), err`
`502`	`502`	`}`
`@@ -587,7 +587,7 @@ func (az *azSubnetsClient) CreateOrUpdate(ctx context.Context, resourceGroupName`
`587`	`587`	`return future.Response(), err`
`588`	`588`	`}`
`589`	`589`
`590`		`- err = future.WaitForCompletion(ctx, az.client.Client)`
	`590`	`+ err = future.WaitForCompletionRef(ctx, az.client.Client)`
`591`	`591`	`mc.Observe(err)`
`592`	`592`	`return future.Response(), err`
`593`	`593`	`}`
`@@ -611,7 +611,7 @@ func (az *azSubnetsClient) Delete(ctx context.Context, resourceGroupName string,`
`611`	`611`	`return future.Response(), err`
`612`	`612`	`}`
`613`	`613`
`614`		`- err = future.WaitForCompletion(ctx, az.client.Client)`
	`614`	`+ err = future.WaitForCompletionRef(ctx, az.client.Client)`
`615`	`615`	`mc.Observe(err)`
`616`	`616`	`return future.Response(), err`
`617`	`617`	`}`
`@@ -702,7 +702,7 @@ func (az *azSecurityGroupsClient) CreateOrUpdate(ctx context.Context, resourceGr`
`702`	`702`	`return future.Response(), err`
`703`	`703`	`}`
`704`	`704`
`705`		`- err = future.WaitForCompletion(ctx, az.client.Client)`
	`705`	`+ err = future.WaitForCompletionRef(ctx, az.client.Client)`
`706`	`706`	`mc.Observe(err)`
`707`	`707`	`return future.Response(), err`
`708`	`708`	`}`
`@@ -726,7 +726,7 @@ func (az *azSecurityGroupsClient) Delete(ctx context.Context, resourceGroupName`
`726`	`726`	`return future.Response(), err`
`727`	`727`	`}`
`728`	`728`
`729`		`- err = future.WaitForCompletion(ctx, az.client.Client)`
	`729`	`+ err = future.WaitForCompletionRef(ctx, az.client.Client)`
`730`	`730`	`mc.Observe(err)`
`731`	`731`	`return future.Response(), err`
`732`	`732`	`}`
`@@ -817,7 +817,7 @@ func (az *azVirtualMachineScaleSetsClient) CreateOrUpdate(ctx context.Context, r`
`817`	`817`	`return future.Response(), err`
`818`	`818`	`}`
`819`	`819`
`820`		`- err = future.WaitForCompletion(ctx, az.client.Client)`
	`820`	`+ err = future.WaitForCompletionRef(ctx, az.client.Client)`
`821`	`821`	`mc.Observe(err)`
`822`	`822`	`return future.Response(), err`
`823`	`823`	`}`
`@@ -888,7 +888,7 @@ func (az *azVirtualMachineScaleSetsClient) UpdateInstances(ctx context.Context,`
`888`	`888`	`return future.Response(), err`
`889`	`889`	`}`
`890`	`890`
`891`		`- err = future.WaitForCompletion(ctx, az.client.Client)`
	`891`	`+ err = future.WaitForCompletionRef(ctx, az.client.Client)`
`892`	`892`	`mc.Observe(err)`
`893`	`893`	`return future.Response(), err`
`894`	`894`	`}`
`@@ -996,7 +996,7 @@ func (az *azVirtualMachineScaleSetVMsClient) Update(ctx context.Context, resourc`
`996`	`996`	`return future.Response(), err`
`997`	`997`	`}`
`998`	`998`
`999`		`- err = future.WaitForCompletion(ctx, az.client.Client)`
	`999`	`+ err = future.WaitForCompletionRef(ctx, az.client.Client)`
`1000`	`1000`	`mc.Observe(err)`
`1001`	`1001`	`return future.Response(), err`
`1002`	`1002`	`}`
`@@ -1041,7 +1041,7 @@ func (az *azRoutesClient) CreateOrUpdate(ctx context.Context, resourceGroupName`
`1041`	`1041`	`return future.Response(), err`
`1042`	`1042`	`}`
`1043`	`1043`
`1044`		`- err = future.WaitForCompletion(ctx, az.client.Client)`
	`1044`	`+ err = future.WaitForCompletionRef(ctx, az.client.Client)`
`1045`	`1045`	`mc.Observe(err)`
`1046`	`1046`	`return future.Response(), err`
`1047`	`1047`	`}`
`@@ -1065,7 +1065,7 @@ func (az *azRoutesClient) Delete(ctx context.Context, resourceGroupName string,`
`1065`	`1065`	`return future.Response(), err`
`1066`	`1066`	`}`
`1067`	`1067`
`1068`		`- err = future.WaitForCompletion(ctx, az.client.Client)`
	`1068`	`+ err = future.WaitForCompletionRef(ctx, az.client.Client)`
`1069`	`1069`	`mc.Observe(err)`
`1070`	`1070`	`return future.Response(), err`
`1071`	`1071`	`}`
`@@ -1110,7 +1110,7 @@ func (az *azRouteTablesClient) CreateOrUpdate(ctx context.Context, resourceGroup`
`1110`	`1110`	`return future.Response(), err`
`1111`	`1111`	`}`
`1112`	`1112`
`1113`		`- err = future.WaitForCompletion(ctx, az.client.Client)`
	`1113`	`+ err = future.WaitForCompletionRef(ctx, az.client.Client)`
`1114`	`1114`	`mc.Observe(err)`
`1115`	`1115`	`return future.Response(), err`
`1116`	`1116`	`}`
`@@ -1170,7 +1170,7 @@ func (az *azStorageAccountClient) Create(ctx context.Context, resourceGroupName`
`1170`	`1170`	`return future.Response(), err`
`1171`	`1171`	`}`
`1172`	`1172`
`1173`		`- err = future.WaitForCompletion(ctx, az.client.Client)`
	`1173`	`+ err = future.WaitForCompletionRef(ctx, az.client.Client)`
`1174`	`1174`	`mc.Observe(err)`
`1175`	`1175`	`return future.Response(), err`
`1176`	`1176`	`}`
`@@ -1282,7 +1282,7 @@ func (az *azDisksClient) CreateOrUpdate(ctx context.Context, resourceGroupName s`
`1282`	`1282`	`return future.Response(), err`
`1283`	`1283`	`}`
`1284`	`1284`
`1285`		`- err = future.WaitForCompletion(ctx, az.client.Client)`
	`1285`	`+ err = future.WaitForCompletionRef(ctx, az.client.Client)`
`1286`	`1286`	`mc.Observe(err)`
`1287`	`1287`	`return future.Response(), err`
`1288`	`1288`	`}`
`@@ -1306,7 +1306,7 @@ func (az *azDisksClient) Delete(ctx context.Context, resourceGroupName string, d`
`1306`	`1306`	`return future.Response(), err`
`1307`	`1307`	`}`
`1308`	`1308`
`1309`		`- err = future.WaitForCompletion(ctx, az.client.Client)`
	`1309`	`+ err = future.WaitForCompletionRef(ctx, az.client.Client)`
`1310`	`1310`	`mc.Observe(err)`
`1311`	`1311`	`return future.Response(), err`
`1312`	`1312`	`}`