Repository: kubernetes-sigs/cloud-provider-azure
Pull request #500 (2021-01-28 09:43:54)

Fix  package names for a set of files
<!--  Thanks for sending a pull request!  Here are some tips for you:

1. If this is your first time, please read our contributor guidelines: https://git.k8s.io/community/contributors/guide#your-first-contribution and developer guide https://git.k8s.io/community/contributors/devel/development.md#development-guide
2. Please label this pull request according to what type of issue you are addressing, especially if this is a release targeted pull request. For reference on required PR/issue labels, read here:
https://git.k8s.io/community/contributors/devel/release.md#issue-kind-label
3. Ensure you have added or ran the appropriate tests for your PR: https://git.k8s.io/community/contributors/devel/testing.md
4. If you want *faster* PR reviews, read how: https://git.k8s.io/community/contributors/guide/pull-requests.md#best-practices-for-faster-reviews
5. Follow the instructions for writing a release note: https://git.k8s.io/community/contributors/guide/release-notes.md
6. If the PR is unfinished, see how to mark it: https://git.k8s.io/community/contributors/guide/pull-requests.md#marking-unfinished-pull-requests
-->

**What type of PR is this?**
> Uncomment only one ` /kind <>` line, hit enter to put that in a new line, and remove leading whitespaces from that line:
>
> /kind api-change
> /kind bug
> /kind cleanup
> /kind design
> /kind documentation
> /kind failing-test
> /kind feature
> /kind flake
/kind cleanup
**What this PR does / why we need it**: Fix  package names for a set of files

**Which issue(s) this PR fixes**:
<!-- 
*Automatically closes linked issue when PR is merged.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
_If PR is about `failing-tests or flakes`, please post the related issues/tests in a comment and do not use `Fixes`_*
-->
Fixes #

**Special notes for your reviewer**:


**Release note**:
```
NONE
```



Patch:
diff --git a/pkg/azureclients/azure_client_config.go b/pkg/azureclients/azure_client_config.go
index 25d6d817c..3ed1209b7 100644
--- a/pkg/azureclients/azure_client_config.go
+++ b/pkg/azureclients/azure_client_config.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package clients
+package azureclients
 
 import (
 	"github.com/Azure/go-autorest/autorest"
diff --git a/pkg/azureclients/doc.go b/pkg/azureclients/doc.go
index 471867b7a..1e9ffcd7c 100644
--- a/pkg/azureclients/doc.go
+++ b/pkg/azureclients/doc.go
@@ -14,5 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package clients contains a set of Azure ARM clients.
-package clients // import "sigs.k8s.io/cloud-provider-azure/pkg/azureclients"
+// Package azureclients contains a set of Azure ARM clients.
+package azureclients // import "sigs.k8s.io/cloud-provider-azure/pkg/azureclients"
diff --git a/pkg/provider/azure.go b/pkg/provider/azure.go
index 997d55980..27ec4d73f 100644
--- a/pkg/provider/azure.go
+++ b/pkg/provider/azure.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"fmt"
diff --git a/pkg/provider/azure_backoff.go b/pkg/provider/azure_backoff.go
index 660e3a20f..779529e5f 100644
--- a/pkg/provider/azure_backoff.go
+++ b/pkg/provider/azure_backoff.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"net/http"
diff --git a/pkg/provider/azure_blobDiskController.go b/pkg/provider/azure_blobDiskController.go
index 41b255a41..277516a7f 100644
--- a/pkg/provider/azure_blobDiskController.go
+++ b/pkg/provider/azure_blobDiskController.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"bytes"
diff --git a/pkg/provider/azure_config.go b/pkg/provider/azure_config.go
index 3d1225424..bccd7151b 100644
--- a/pkg/provider/azure_config.go
+++ b/pkg/provider/azure_config.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"context"
diff --git a/pkg/provider/azure_controller_common.go b/pkg/provider/azure_controller_common.go
index 28abb6a55..edd9d251e 100644
--- a/pkg/provider/azure_controller_common.go
+++ b/pkg/provider/azure_controller_common.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"context"
diff --git a/pkg/provider/azure_controller_standard.go b/pkg/provider/azure_controller_standard.go
index 72a847c58..ce3a9555f 100644
--- a/pkg/provider/azure_controller_standard.go
+++ b/pkg/provider/azure_controller_standard.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"net/http"
diff --git a/pkg/provider/azure_controller_vmss.go b/pkg/provider/azure_controller_vmss.go
index da6dcaf02..2609198f8 100644
--- a/pkg/provider/azure_controller_vmss.go
+++ b/pkg/provider/azure_controller_vmss.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"net/http"
diff --git a/pkg/provider/azure_fakes.go b/pkg/provider/azure_fakes.go
index 06312cbc5..614ffbf3c 100644
--- a/pkg/provider/azure_fakes.go
+++ b/pkg/provider/azure_fakes.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"fmt"
diff --git a/pkg/provider/azure_file.go b/pkg/provider/azure_file.go
index 344baf43e..e050af3ac 100644
--- a/pkg/provider/azure_file.go
+++ b/pkg/provider/azure_file.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-06-01/storage"
diff --git a/pkg/provider/azure_instance_metadata.go b/pkg/provider/azure_instance_metadata.go
index efeb1832c..797fe09c0 100644
--- a/pkg/provider/azure_instance_metadata.go
+++ b/pkg/provider/azure_instance_metadata.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"encoding/json"
diff --git a/pkg/provider/azure_instances.go b/pkg/provider/azure_instances.go
index 4dac91f0a..00038abda 100644
--- a/pkg/provider/azure_instances.go
+++ b/pkg/provider/azure_instances.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"context"
diff --git a/pkg/provider/azure_loadbalancer.go b/pkg/provider/azure_loadbalancer.go
index 74b0f0f12..5f9a536b0 100644
--- a/pkg/provider/azure_loadbalancer.go
+++ b/pkg/provider/azure_loadbalancer.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"context"
diff --git a/pkg/provider/azure_managedDiskController.go b/pkg/provider/azure_managedDiskController.go
index bd09d7d2d..26feecf40 100644
--- a/pkg/provider/azure_managedDiskController.go
+++ b/pkg/provider/azure_managedDiskController.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"context"
diff --git a/pkg/provider/azure_mock_vmsets.go b/pkg/provider/azure_mock_vmsets.go
index d4cb84c68..2a3869a81 100644
--- a/pkg/provider/azure_mock_vmsets.go
+++ b/pkg/provider/azure_mock_vmsets.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	reflect "reflect"
diff --git a/pkg/provider/azure_ratelimit.go b/pkg/provider/azure_ratelimit.go
index 3e0452f5c..52b7bd3b4 100644
--- a/pkg/provider/azure_ratelimit.go
+++ b/pkg/provider/azure_ratelimit.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	azclients "sigs.k8s.io/cloud-provider-azure/pkg/azureclients"
diff --git a/pkg/provider/azure_routes.go b/pkg/provider/azure_routes.go
index 89668cc21..7b2cfe0b2 100644
--- a/pkg/provider/azure_routes.go
+++ b/pkg/provider/azure_routes.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"context"
diff --git a/pkg/provider/azure_standard.go b/pkg/provider/azure_standard.go
index 4e239d44d..705f44531 100644
--- a/pkg/provider/azure_standard.go
+++ b/pkg/provider/azure_standard.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"context"
diff --git a/pkg/provider/azure_storage.go b/pkg/provider/azure_storage.go
index bebc8be99..e697c0a1b 100644
--- a/pkg/provider/azure_storage.go
+++ b/pkg/provider/azure_storage.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"fmt"
diff --git a/pkg/provider/azure_storageaccount.go b/pkg/provider/azure_storageaccount.go
index 84835747e..808721f92 100644
--- a/pkg/provider/azure_storageaccount.go
+++ b/pkg/provider/azure_storageaccount.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"fmt"
diff --git a/pkg/provider/azure_utils.go b/pkg/provider/azure_utils.go
index aba382127..cc8daf4d4 100644
--- a/pkg/provider/azure_utils.go
+++ b/pkg/provider/azure_utils.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"context"
diff --git a/pkg/provider/azure_vmsets.go b/pkg/provider/azure_vmsets.go
index 4e01a5110..acec7922b 100644
--- a/pkg/provider/azure_vmsets.go
+++ b/pkg/provider/azure_vmsets.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-30/compute"
diff --git a/pkg/provider/azure_vmss.go b/pkg/provider/azure_vmss.go
index adc5598f7..460b9c368 100644
--- a/pkg/provider/azure_vmss.go
+++ b/pkg/provider/azure_vmss.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"errors"
diff --git a/pkg/provider/azure_vmss_cache.go b/pkg/provider/azure_vmss_cache.go
index 8085fb436..4a8963700 100644
--- a/pkg/provider/azure_vmss_cache.go
+++ b/pkg/provider/azure_vmss_cache.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"context"
diff --git a/pkg/provider/azure_wrap.go b/pkg/provider/azure_wrap.go
index 98608cf56..c7a38df66 100644
--- a/pkg/provider/azure_wrap.go
+++ b/pkg/provider/azure_wrap.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"fmt"
diff --git a/pkg/provider/azure_zones.go b/pkg/provider/azure_zones.go
index d6ef51d6e..0b6120a49 100644
--- a/pkg/provider/azure_zones.go
+++ b/pkg/provider/azure_zones.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"context"
diff --git a/pkg/provider/doc.go b/pkg/provider/doc.go
index e7a2c3cd9..26587698b 100644
--- a/pkg/provider/doc.go
+++ b/pkg/provider/doc.go
@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package azure is an implementation of CloudProvider Interface, LoadBalancer
+// Package provider is an implementation of CloudProvider Interface, LoadBalancer
 // and Instances for Azure.
-package azure // import "sigs.k8s.io/cloud-provider-azure/pkg/provider
+package provider // import "sigs.k8s.io/cloud-provider-azure/pkg/provider


Test patch:
diff --git a/pkg/azureclients/azure_client_config_test.go b/pkg/azureclients/azure_client_config_test.go
index 6fc14cc5f..f9df84ee9 100644
--- a/pkg/azureclients/azure_client_config_test.go
+++ b/pkg/azureclients/azure_client_config_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package clients
+package azureclients
 
 import (
 	"testing"
diff --git a/pkg/provider/azure_backoff_test.go b/pkg/provider/azure_backoff_test.go
index 91178ae80..9842147fe 100644
--- a/pkg/provider/azure_backoff_test.go
+++ b/pkg/provider/azure_backoff_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"fmt"
diff --git a/pkg/provider/azure_blobDiskController_test.go b/pkg/provider/azure_blobDiskController_test.go
index cb0563d6a..81c44c5a6 100644
--- a/pkg/provider/azure_blobDiskController_test.go
+++ b/pkg/provider/azure_blobDiskController_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"fmt"
diff --git a/pkg/provider/azure_config_test.go b/pkg/provider/azure_config_test.go
index 747c06657..e877952d3 100644
--- a/pkg/provider/azure_config_test.go
+++ b/pkg/provider/azure_config_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"context"
diff --git a/pkg/provider/azure_controller_common_test.go b/pkg/provider/azure_controller_common_test.go
index 11b215887..1ad4369d3 100644
--- a/pkg/provider/azure_controller_common_test.go
+++ b/pkg/provider/azure_controller_common_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"fmt"
diff --git a/pkg/provider/azure_controller_standard_test.go b/pkg/provider/azure_controller_standard_test.go
index 7209ff730..cb235f8fa 100644
--- a/pkg/provider/azure_controller_standard_test.go
+++ b/pkg/provider/azure_controller_standard_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"net/http"
diff --git a/pkg/provider/azure_controller_vmss_test.go b/pkg/provider/azure_controller_vmss_test.go
index 81fa63d97..84581ebcc 100644
--- a/pkg/provider/azure_controller_vmss_test.go
+++ b/pkg/provider/azure_controller_vmss_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"fmt"
diff --git a/pkg/provider/azure_instances_test.go b/pkg/provider/azure_instances_test.go
index 511593355..3009a2c98 100644
--- a/pkg/provider/azure_instances_test.go
+++ b/pkg/provider/azure_instances_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"context"
diff --git a/pkg/provider/azure_loadbalancer_test.go b/pkg/provider/azure_loadbalancer_test.go
index 74762418f..d7da33437 100644
--- a/pkg/provider/azure_loadbalancer_test.go
+++ b/pkg/provider/azure_loadbalancer_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"context"
diff --git a/pkg/provider/azure_managedDiskController_test.go b/pkg/provider/azure_managedDiskController_test.go
index 34c5bbe6a..a1a987c86 100644
--- a/pkg/provider/azure_managedDiskController_test.go
+++ b/pkg/provider/azure_managedDiskController_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"context"
diff --git a/pkg/provider/azure_ratelimit_test.go b/pkg/provider/azure_ratelimit_test.go
index d54eb356e..fc3229eec 100644
--- a/pkg/provider/azure_ratelimit_test.go
+++ b/pkg/provider/azure_ratelimit_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"bytes"
diff --git a/pkg/provider/azure_routes_test.go b/pkg/provider/azure_routes_test.go
index 56f535001..16445b05e 100644
--- a/pkg/provider/azure_routes_test.go
+++ b/pkg/provider/azure_routes_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"context"
diff --git a/pkg/provider/azure_standard_test.go b/pkg/provider/azure_standard_test.go
index bc0f228f4..240aec19c 100644
--- a/pkg/provider/azure_standard_test.go
+++ b/pkg/provider/azure_standard_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"fmt"
diff --git a/pkg/provider/azure_storage_test.go b/pkg/provider/azure_storage_test.go
index 05e5b7ddf..23e688faf 100644
--- a/pkg/provider/azure_storage_test.go
+++ b/pkg/provider/azure_storage_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"fmt"
diff --git a/pkg/provider/azure_storageaccount_test.go b/pkg/provider/azure_storageaccount_test.go
index 2074f226d..d0560b706 100644
--- a/pkg/provider/azure_storageaccount_test.go
+++ b/pkg/provider/azure_storageaccount_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"fmt"
diff --git a/pkg/provider/azure_test.go b/pkg/provider/azure_test.go
index 5261f50f6..bf41af2fd 100644
--- a/pkg/provider/azure_test.go
+++ b/pkg/provider/azure_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"context"
diff --git a/pkg/provider/azure_utils_test.go b/pkg/provider/azure_utils_test.go
index 99d0f2fee..203959383 100644
--- a/pkg/provider/azure_utils_test.go
+++ b/pkg/provider/azure_utils_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"reflect"
diff --git a/pkg/provider/azure_vmss_cache_test.go b/pkg/provider/azure_vmss_cache_test.go
index 4ac0570f8..19a7fa62e 100644
--- a/pkg/provider/azure_vmss_cache_test.go
+++ b/pkg/provider/azure_vmss_cache_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"sync"
diff --git a/pkg/provider/azure_vmss_test.go b/pkg/provider/azure_vmss_test.go
index 182c2d7e4..98af8faaf 100644
--- a/pkg/provider/azure_vmss_test.go
+++ b/pkg/provider/azure_vmss_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"fmt"
diff --git a/pkg/provider/azure_wrap_test.go b/pkg/provider/azure_wrap_test.go
index fdf391689..2486eeeab 100644
--- a/pkg/provider/azure_wrap_test.go
+++ b/pkg/provider/azure_wrap_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"net/http"
diff --git a/pkg/provider/azure_zones_test.go b/pkg/provider/azure_zones_test.go
index da78b2117..d725a6ca8 100644
--- a/pkg/provider/azure_zones_test.go
+++ b/pkg/provider/azure_zones_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"context"
diff --git a/pkg/provider/main_test.go b/pkg/provider/main_test.go
index 5a94752fb..902b8d3c9 100644
--- a/pkg/provider/main_test.go
+++ b/pkg/provider/main_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package azure
+package provider
 
 import (
 	"math/rand"
diff --git a/tests/e2e/network/ensureloadbalancer.go b/tests/e2e/network/ensureloadbalancer.go
index f7c54d3e8..04f13f26c 100644
--- a/tests/e2e/network/ensureloadbalancer.go
+++ b/tests/e2e/network/ensureloadbalancer.go
@@ -30,7 +30,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/apimachinery/pkg/util/wait"
 	clientset "k8s.io/client-go/kubernetes"
-	azure "sigs.k8s.io/cloud-provider-azure/pkg/provider"
+	azureprovider "sigs.k8s.io/cloud-provider-azure/pkg/provider"
 	"sigs.k8s.io/cloud-provider-azure/tests/e2e/utils"
 
 	. "github.com/onsi/ginkgo"
@@ -85,7 +85,7 @@ var _ = Describe("Ensure LoadBalancer", func() {
 	// Public w/o IP -> Public w/ IP
 	It("should support assigning to specific IP when updating public service", func() {
 		annotation := map[string]string{
-			azure.ServiceAnnotationLoadBalancerInternal: "false",
+			azureprovider.ServiceAnnotationLoadBalancerInternal: "false",
 		}
 		ipName := basename + "-public-none-IP" + string(uuid.NewUUID())[0:4]
 
@@ -131,7 +131,7 @@ var _ = Describe("Ensure LoadBalancer", func() {
 		Skip("Skip the ILB test scenarios since there're some issues in underlying SLB")
 
 		annotation := map[string]string{
-			azure.ServiceAnnotationLoadBalancerInternal: "true",
+			azureprovider.ServiceAnnotationLoadBalancerInternal: "true",
 		}
 		ip1, err := utils.SelectAvailablePrivateIP(tc)
 		Expect(err).NotTo(HaveOccurred())
@@ -177,7 +177,7 @@ var _ = Describe("Ensure LoadBalancer", func() {
 		Skip("Skip the ILB test scenarios since there're some issues in underlying SLB")
 
 		annotation := map[string]string{
-			azure.ServiceAnnotationLoadBalancerInternal: "true",
+			azureprovider.ServiceAnnotationLoadBalancerInternal: "true",
 		}
 		ipName := basename + "-internal-none-public-IP" + string(uuid.NewUUID())[0:4]
 
@@ -223,7 +223,7 @@ var _ = Describe("Ensure LoadBalancer", func() {
 
 	It("should have no operation since no change in service when update [Slow]", func() {
 		annotation := map[string]string{
-			azure.ServiceAnnotationLoadBalancerInternal: "false",
+			azureprovider.ServiceAnnotationLoadBalancerInternal: "false",
 		}
 		ipName := basename + "-public-remain" + string(uuid.NewUUID())[0:4]
 		pip, err := utils.WaitCreatePIP(tc, ipName, tc.GetResourceGroup(), defaultPublicIPAddress(ipName))
@@ -251,8 +251,8 @@ var _ = Describe("Ensure LoadBalancer", func() {
 		By("Update without changing the service and wait for a while")
 		utils.Logf("External IP is now %s", targetIP)
 		service, err = cs.CoreV1().Services(ns.Name).Get(context.TODO(), serviceName, metav1.GetOptions{})
-		service.Annotations[azure.ServiceAnnotationDNSLabelName] = "testlabel"
-		utils.Logf(service.Annotations[azure.ServiceAnnotationDNSLabelName])
+		service.Annotations[azureprovider.ServiceAnnotationDNSLabelName] = "testlabel"
+		utils.Logf(service.Annotations[azureprovider.ServiceAnnotationDNSLabelName])
 		_, err = cs.CoreV1().Services(ns.Name).Update(context.TODO(), service, metav1.UpdateOptions{})
 		Expect(err).NotTo(HaveOccurred())
 
@@ -354,7 +354,7 @@ var _ = Describe("Ensure LoadBalancer", func() {
 		Skip("Skip the ILB test scenarios since there're some issues in underlying SLB")
 
 		annotation := map[string]string{
-			azure.ServiceAnnotationLoadBalancerInternal: "true",
+			azureprovider.ServiceAnnotationLoadBalancerInternal: "true",
 		}
 		service1 := utils.CreateLoadBalancerServiceManifest("service1", annotation, labels, ns.Name, ports)
 		_, err := cs.CoreV1().Services(ns.Name).Create(context.TODO(), service1, metav1.CreateOptions{})
@@ -435,7 +435,7 @@ func waitForNodesInLBBackendPool(tc *utils.AzureTestClient, ip string, expectedN
 }
 
 func judgeInternal(service v1.Service) bool {
-	return service.Annotations[azure.ServiceAnnotationLoadBalancerInternal] == "true"
+	return service.Annotations[azureprovider.ServiceAnnotationLoadBalancerInternal] == "true"
 }
 
 func updateServiceBalanceIP(service *v1.Service, isInternal bool, ip string) (result *v1.Service) {
@@ -448,9 +448,9 @@ func updateServiceBalanceIP(service *v1.Service, isInternal bool, ip string) (re
 		return
 	}
 	if isInternal {
-		result.Annotations[azure.ServiceAnnotationLoadBalancerInternal] = "true"
+		result.Annotations[azureprovider.ServiceAnnotationLoadBalancerInternal] = "true"
 	} else {
-		delete(result.Annotations, azure.ServiceAnnotationLoadBalancerInternal)
+		delete(result.Annotations, azureprovider.ServiceAnnotationLoadBalancerInternal)
 	}
 	return
 }
diff --git a/tests/e2e/network/network_security_group.go b/tests/e2e/network/network_security_group.go
index 76bde2843..4276b3d86 100644
--- a/tests/e2e/network/network_security_group.go
+++ b/tests/e2e/network/network_security_group.go
@@ -30,7 +30,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	clientset "k8s.io/client-go/kubernetes"
 
-	"sigs.k8s.io/cloud-provider-azure/pkg/provider"
+	azureprovider "sigs.k8s.io/cloud-provider-azure/pkg/provider"
 	"sigs.k8s.io/cloud-provider-azure/tests/e2e/utils"
 
 	. "github.com/onsi/ginkgo"
@@ -138,7 +138,7 @@ var _ = Describe("Network security group", func() {
 	It("can set source IP prefixes automatically according to corresponding service tag", func() {
 		By("Creating service and wait it to expose")
 		annotation := map[string]string{
-			azure.ServiceAnnotationAllowedServiceTag: "AzureCloud",
+			azureprovider.ServiceAnnotationAllowedServiceTag: "AzureCloud",
 		}
 		_ = createAndExposeDefaultServiceWithAnnotation(cs, serviceName, ns.Name, labels, annotation, ports)
 
diff --git a/tests/e2e/network/service_annotations.go b/tests/e2e/network/service_annotations.go
index 0ef437d42..648bc04d9 100644
--- a/tests/e2e/network/service_annotations.go
+++ b/tests/e2e/network/service_annotations.go
@@ -37,7 +37,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	clientset "k8s.io/client-go/kubernetes"
 
-	azure "sigs.k8s.io/cloud-provider-azure/pkg/provider"
+	azureprovider "sigs.k8s.io/cloud-provider-azure/pkg/provider"
 	"sigs.k8s.io/cloud-provider-azure/tests/e2e/utils"
 
 	. "github.com/onsi/ginkgo"
@@ -111,7 +111,7 @@ var _ = Describe("Service with annotation", func() {
 		serviceDomainNamePrefix := serviceName + string(uuid.NewUUID())
 
 		annotation := map[string]string{
-			azure.ServiceAnnotationDNSLabelName: serviceDomainNamePrefix,
+			azureprovider.ServiceAnnotationDNSLabelName: serviceDomainNamePrefix,
 		}
 
 		// create service with given annotation and wait it to expose
@@ -154,7 +154,7 @@ var _ = Describe("Service with annotation", func() {
 		Skip("Skip the ILB test scenarios since there're some issues in underlying SLB")
 
 		annotation := map[string]string{
-			azure.ServiceAnnotationLoadBalancerInternal: "true",
+			azureprovider.ServiceAnnotationLoadBalancerInternal: "true",
 		}
 
 		// create service with given annotation and wait it to expose
@@ -204,8 +204,8 @@ var _ = Describe("Service with annotation", func() {
 		}
 
 		annotation := map[string]string{
-			azure.ServiceAnnotationLoadBalancerInternal:       "true",
-			azure.ServiceAnnotationLoadBalancerInternalSubnet: subnetName,
+			azureprovider.ServiceAnnotationLoadBalancerInternal:       "true",
+			azureprovider.ServiceAnnotationLoadBalancerInternalSubnet: subnetName,
 		}
 
 		// create service with given annotation and wait it to expose
@@ -225,7 +225,7 @@ var _ = Describe("Service with annotation", func() {
 
 	It("should support service annotation 'service.beta.kubernetes.io/azure-load-balancer-tcp-idle-timeout'", func() {
 		annotation := map[string]string{
-			azure.ServiceAnnotationLoadBalancerIdleTimeout: "5",
+			azureprovider.ServiceAnnotationLoadBalancerIdleTimeout: "5",
 		}
 
 		// create service with given annotation and wait it to expose
@@ -245,7 +245,7 @@ var _ = Describe("Service with annotation", func() {
 
 	// It("should support service annotation 'ServiceAnnotationLoadBalancerMixedProtocols'", func() {
 	// 	annotation := map[string]string{
-	// 		azure.ServiceAnnotationLoadBalancerMixedProtocols: "true",
+	// 		azureprovider.ServiceAnnotationLoadBalancerMixedProtocols: "true",
 	// 	}
 
 	// 	// create service with given annotation and wait it to expose
@@ -281,7 +281,7 @@ var _ = Describe("Service with annotation", func() {
 		}()
 
 		annotation := map[string]string{
-			azure.ServiceAnnotationLoadBalancerResourceGroup: to.String(rg.Name),
+			azureprovider.ServiceAnnotationLoadBalancerResourceGroup: to.String(rg.Name),
 		}
 		By("Creating service " + serviceName + " in namespace " + ns.Name)
 		service := utils.CreateLoadBalancerServiceManifest(serviceName, annotation, labels, ns.Name, ports)
@@ -302,7 +302,7 @@ var _ = Describe("Service with annotation", func() {
 	It("should support service annotation `service.beta.kubernetes.io/azure-shared-securityrule`", func() {
 		By("Exposing two services with shared security rule")
 		annotation := map[string]string{
-			azure.ServiceAnnotationSharedSecurityRule: "true",
+			azureprovider.ServiceAnnotationSharedSecurityRule: "true",
 		}
 		ip1 := createAndExposeDefaultServiceWithAnnotation(cs, serviceName, ns.Name, labels, annotation, ports)
 
@@ -331,7 +331,7 @@ var _ = Describe("Service with annotation", func() {
 	It("should support service annotation `service.beta.kubernetes.io/azure-pip-tags`", func() {
 		By("Creating a service with custom tags")
 		annotation := map[string]string{
-			azure.ServiceAnnotationAzurePIPTags: "a=b,c= d,e =, =f",
+			azureprovider.ServiceAnnotationAzurePIPTags: "a=b,c= d,e =, =f",
 		}
 		service := utils.CreateLoadBalancerServiceManifest(serviceName, annotation, labels, ns.Name, ports)
 		_, err := cs.CoreV1().Services(ns.Name).Create(context.TODO(), service, metav1.CreateOptions{})
@@ -368,7 +368,7 @@ var _ = Describe("Service with annotation", func() {
 		service, err = cs.CoreV1().Services(ns.Name).Get(context.TODO(), serviceName, metav1.GetOptions{})
 		Expect(err).NotTo(HaveOccurred())
 		service.Annotations = map[string]string{
-			azure.ServiceAnnotationAzurePIPTags: "a=c,x=y",
+			azureprovider.ServiceAnnotationAzurePIPTags: "a=c,x=y",
 		}
 		_, err = cs.CoreV1().Services(ns.Name).Update(context.TODO(), service, metav1.UpdateOptions{})
 		Expect(err).NotTo(HaveOccurred())
@@ -398,7 +398,7 @@ var _ = Describe("Service with annotation", func() {
 
 		By("Creating a service referring to the first pip")
 		annotation := map[string]string{
-			azure.ServiceAnnotationPIPName: "pip1",
+			azureprovider.ServiceAnnotationPIPName: "pip1",
 		}
 		service := utils.CreateLoadBalancerServiceManifest(serviceName, annotation, labels, ns.Name, ports)
 		_, err = cs.CoreV1().Services(ns.Name).Create(context.TODO(), service, metav1.CreateOptions{})
@@ -412,7 +412,7 @@ var _ = Describe("Service with annotation", func() {
 		By("Updating the service to refer to the second service")
 		service, err = cs.CoreV1().Services(ns.Name).Get(context.TODO(), serviceName, metav1.GetOptions{})
 		Expect(err).NotTo(HaveOccurred())
-		service.Annotations[azure.ServiceAnnotationPIPName] = "pip2"
+		service.Annotations[azureprovider.ServiceAnnotationPIPName] = "pip2"
 		_, err = cs.CoreV1().Services(ns.Name).Update(context.TODO(), service, metav1.UpdateOptions{})
 		Expect(err).NotTo(HaveOccurred())
 
@@ -686,7 +686,7 @@ func validateLoadBalancerBackendPools(tc *utils.AzureTestClient, vmssName string
 	// create annotation for LoadBalancer service
 	By("Creating service " + serviceName + " in namespace " + ns)
 	annotation := map[string]string{
-		azure.ServiceAnnotationLoadBalancerMode: vmssName,
+		azureprovider.ServiceAnnotationLoadBalancerMode: vmssName,
 	}
 	service := utils.CreateLoadBalancerServiceManifest(serviceName, annotation, labels, ns, ports)
 	_, err := cs.CoreV1().Services(ns).Create(context.TODO(), service, metav1.CreateOptions{})