diff --git a/.dockerignore b/.dockerignore index 6a029f49b77..8ec0c13eb6d 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,7 +3,7 @@ # Allow only these !/api/** -!/cloud/** +!/azure/** !/controllers/** !/exp/** !/feature/** diff --git a/cloud/converters/dns.go b/azure/converters/dns.go similarity index 100% rename from cloud/converters/dns.go rename to azure/converters/dns.go diff --git a/cloud/converters/dns_test.go b/azure/converters/dns_test.go similarity index 100% rename from cloud/converters/dns_test.go rename to azure/converters/dns_test.go diff --git a/cloud/converters/identity.go b/azure/converters/identity.go similarity index 100% rename from cloud/converters/identity.go rename to azure/converters/identity.go diff --git a/cloud/converters/identity_test.go b/azure/converters/identity_test.go similarity index 100% rename from cloud/converters/identity_test.go rename to azure/converters/identity_test.go diff --git a/cloud/converters/image.go b/azure/converters/image.go similarity index 100% rename from cloud/converters/image.go rename to azure/converters/image.go diff --git a/cloud/converters/loadbalancers.go b/azure/converters/loadbalancers.go similarity index 100% rename from cloud/converters/loadbalancers.go rename to azure/converters/loadbalancers.go diff --git a/cloud/converters/rules.go b/azure/converters/rules.go similarity index 100% rename from cloud/converters/rules.go rename to azure/converters/rules.go diff --git a/cloud/converters/spotinstances.go b/azure/converters/spotinstances.go similarity index 100% rename from cloud/converters/spotinstances.go rename to azure/converters/spotinstances.go diff --git a/cloud/converters/tags.go b/azure/converters/tags.go similarity index 100% rename from cloud/converters/tags.go rename to azure/converters/tags.go diff --git a/cloud/converters/vm.go b/azure/converters/vm.go similarity index 100% rename from cloud/converters/vm.go rename to azure/converters/vm.go diff --git a/cloud/converters/vmss.go b/azure/converters/vmss.go similarity index 100% rename from cloud/converters/vmss.go rename to azure/converters/vmss.go diff --git a/cloud/converters/vmss_test.go b/azure/converters/vmss_test.go similarity index 98% rename from cloud/converters/vmss_test.go rename to azure/converters/vmss_test.go index cc1a0076b9a..a4b936902b2 100644 --- a/cloud/converters/vmss_test.go +++ b/azure/converters/vmss_test.go @@ -24,7 +24,7 @@ import ( "github.com/Azure/go-autorest/autorest/to" "github.com/onsi/gomega" - "sigs.k8s.io/cluster-api-provider-azure/cloud/converters" + "sigs.k8s.io/cluster-api-provider-azure/azure/converters" infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha3" ) diff --git a/cloud/defaults.go b/azure/defaults.go similarity index 100% rename from cloud/defaults.go rename to azure/defaults.go diff --git a/cloud/defaults_test.go b/azure/defaults_test.go similarity index 100% rename from cloud/defaults_test.go rename to azure/defaults_test.go diff --git a/cloud/errors.go b/azure/errors.go similarity index 100% rename from cloud/errors.go rename to azure/errors.go diff --git a/cloud/interfaces.go b/azure/interfaces.go similarity index 95% rename from cloud/interfaces.go rename to azure/interfaces.go index 166593c1cd0..6cf74d29967 100644 --- a/cloud/interfaces.go +++ b/azure/interfaces.go @@ -24,9 +24,9 @@ import ( infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" ) -// Service is a generic interface used by components offering a type of service. +// Reconciler is a generic interface used by components offering a type of service. // Example: virtualnetworks service would offer Reconcile/Delete methods. -type Service interface { +type Reconciler interface { Reconcile(ctx context.Context) error Delete(ctx context.Context) error } @@ -42,7 +42,7 @@ type OldService interface { // CredentialGetter is a Service which knows how to retrieve credentials for an Azure // resource in a resource group. type CredentialGetter interface { - Service + Reconciler GetCredentials(ctx context.Context, group string, cluster string) ([]byte, error) } diff --git a/cloud/mocks/doc.go b/azure/mocks/doc.go similarity index 100% rename from cloud/mocks/doc.go rename to azure/mocks/doc.go diff --git a/cloud/mocks/service_mock.go b/azure/mocks/service_mock.go similarity index 97% rename from cloud/mocks/service_mock.go rename to azure/mocks/service_mock.go index e8cf1b80f11..d16409e1771 100644 --- a/cloud/mocks/service_mock.go +++ b/azure/mocks/service_mock.go @@ -28,31 +28,31 @@ import ( v1alpha3 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" ) -// MockService is a mock of Service interface. -type MockService struct { +// MockReconciler is a mock of Reconciler interface. +type MockReconciler struct { ctrl *gomock.Controller - recorder *MockServiceMockRecorder + recorder *MockReconcilerMockRecorder } -// MockServiceMockRecorder is the mock recorder for MockService. -type MockServiceMockRecorder struct { - mock *MockService +// MockReconcilerMockRecorder is the mock recorder for MockReconciler. +type MockReconcilerMockRecorder struct { + mock *MockReconciler } -// NewMockService creates a new mock instance. -func NewMockService(ctrl *gomock.Controller) *MockService { - mock := &MockService{ctrl: ctrl} - mock.recorder = &MockServiceMockRecorder{mock} +// NewMockReconciler creates a new mock instance. +func NewMockReconciler(ctrl *gomock.Controller) *MockReconciler { + mock := &MockReconciler{ctrl: ctrl} + mock.recorder = &MockReconcilerMockRecorder{mock} return mock } // EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockService) EXPECT() *MockServiceMockRecorder { +func (m *MockReconciler) EXPECT() *MockReconcilerMockRecorder { return m.recorder } // Reconcile mocks base method. -func (m *MockService) Reconcile(ctx context.Context) error { +func (m *MockReconciler) Reconcile(ctx context.Context) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Reconcile", ctx) ret0, _ := ret[0].(error) @@ -60,13 +60,13 @@ func (m *MockService) Reconcile(ctx context.Context) error { } // Reconcile indicates an expected call of Reconcile. -func (mr *MockServiceMockRecorder) Reconcile(ctx interface{}) *gomock.Call { +func (mr *MockReconcilerMockRecorder) Reconcile(ctx interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Reconcile", reflect.TypeOf((*MockService)(nil).Reconcile), ctx) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Reconcile", reflect.TypeOf((*MockReconciler)(nil).Reconcile), ctx) } // Delete mocks base method. -func (m *MockService) Delete(ctx context.Context) error { +func (m *MockReconciler) Delete(ctx context.Context) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Delete", ctx) ret0, _ := ret[0].(error) @@ -74,9 +74,9 @@ func (m *MockService) Delete(ctx context.Context) error { } // Delete indicates an expected call of Delete. -func (mr *MockServiceMockRecorder) Delete(ctx interface{}) *gomock.Call { +func (mr *MockReconcilerMockRecorder) Delete(ctx interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockService)(nil).Delete), ctx) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockReconciler)(nil).Delete), ctx) } // MockOldService is a mock of OldService interface. diff --git a/cloud/scope/clients.go b/azure/scope/clients.go similarity index 100% rename from cloud/scope/clients.go rename to azure/scope/clients.go diff --git a/cloud/scope/clients_test.go b/azure/scope/clients_test.go similarity index 100% rename from cloud/scope/clients_test.go rename to azure/scope/clients_test.go diff --git a/cloud/scope/cluster.go b/azure/scope/cluster.go similarity index 99% rename from cloud/scope/cluster.go rename to azure/scope/cluster.go index bb5b1ae482a..9aae60399fb 100644 --- a/cloud/scope/cluster.go +++ b/azure/scope/cluster.go @@ -35,7 +35,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" ) // ClusterScopeParams defines the input parameters used to create a new Scope. diff --git a/cloud/scope/identity.go b/azure/scope/identity.go similarity index 100% rename from cloud/scope/identity.go rename to azure/scope/identity.go diff --git a/cloud/scope/machine.go b/azure/scope/machine.go similarity index 99% rename from cloud/scope/machine.go rename to azure/scope/machine.go index 91996156268..7f3d23f8fea 100644 --- a/cloud/scope/machine.go +++ b/azure/scope/machine.go @@ -37,7 +37,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" ) // MachineScopeParams defines the input parameters used to create a new MachineScope. diff --git a/cloud/scope/machine_test.go b/azure/scope/machine_test.go similarity index 98% rename from cloud/scope/machine_test.go rename to azure/scope/machine_test.go index b4c9eadb24c..9cb0670165c 100644 --- a/cloud/scope/machine_test.go +++ b/azure/scope/machine_test.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3" ) diff --git a/cloud/scope/machinepool.go b/azure/scope/machinepool.go similarity index 99% rename from cloud/scope/machinepool.go rename to azure/scope/machinepool.go index 6c56edb3939..fbc3cd422b2 100644 --- a/cloud/scope/machinepool.go +++ b/azure/scope/machinepool.go @@ -37,7 +37,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha3" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/scope/machinepool_test.go b/azure/scope/machinepool_test.go similarity index 100% rename from cloud/scope/machinepool_test.go rename to azure/scope/machinepool_test.go diff --git a/cloud/scope/managedcontrolplane.go b/azure/scope/managedcontrolplane.go similarity index 99% rename from cloud/scope/managedcontrolplane.go rename to azure/scope/managedcontrolplane.go index 506dc1fc6ee..a4b0f10911b 100644 --- a/cloud/scope/managedcontrolplane.go +++ b/azure/scope/managedcontrolplane.go @@ -30,7 +30,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha3" ) diff --git a/cloud/services/agentpools/agentpools.go b/azure/services/agentpools/agentpools.go similarity index 98% rename from cloud/services/agentpools/agentpools.go rename to azure/services/agentpools/agentpools.go index c3dd6c85d4a..a39289ec46b 100644 --- a/cloud/services/agentpools/agentpools.go +++ b/azure/services/agentpools/agentpools.go @@ -24,7 +24,7 @@ import ( "github.com/pkg/errors" "k8s.io/klog" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/agentpools/agentpools_test.go b/azure/services/agentpools/agentpools_test.go similarity index 99% rename from cloud/services/agentpools/agentpools_test.go rename to azure/services/agentpools/agentpools_test.go index cb99f6ce71f..1b0ed16ee5f 100644 --- a/cloud/services/agentpools/agentpools_test.go +++ b/azure/services/agentpools/agentpools_test.go @@ -28,7 +28,7 @@ import ( "github.com/golang/mock/gomock" . "github.com/onsi/gomega" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/agentpools/mock_agentpools" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/agentpools/mock_agentpools" gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock" ) diff --git a/cloud/services/agentpools/client.go b/azure/services/agentpools/client.go similarity index 98% rename from cloud/services/agentpools/client.go rename to azure/services/agentpools/client.go index 33c9158d04a..dedc3fb8c9b 100644 --- a/cloud/services/agentpools/client.go +++ b/azure/services/agentpools/client.go @@ -23,7 +23,7 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/pkg/errors" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/agentpools/mock_agentpools/agentpools_mock.go b/azure/services/agentpools/mock_agentpools/agentpools_mock.go similarity index 100% rename from cloud/services/agentpools/mock_agentpools/agentpools_mock.go rename to azure/services/agentpools/mock_agentpools/agentpools_mock.go diff --git a/cloud/services/agentpools/mock_agentpools/doc.go b/azure/services/agentpools/mock_agentpools/doc.go similarity index 100% rename from cloud/services/agentpools/mock_agentpools/doc.go rename to azure/services/agentpools/mock_agentpools/doc.go diff --git a/cloud/services/agentpools/service.go b/azure/services/agentpools/service.go similarity index 93% rename from cloud/services/agentpools/service.go rename to azure/services/agentpools/service.go index 9e3ef623b4c..dadfa980de4 100644 --- a/cloud/services/agentpools/service.go +++ b/azure/services/agentpools/service.go @@ -17,7 +17,7 @@ limitations under the License. package agentpools import ( - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" ) // Service provides operations on azure resources diff --git a/cloud/services/availabilitysets/availabilitysets.go b/azure/services/availabilitysets/availabilitysets.go similarity index 96% rename from cloud/services/availabilitysets/availabilitysets.go rename to azure/services/availabilitysets/availabilitysets.go index ecb61456dd6..477a63f628a 100644 --- a/cloud/services/availabilitysets/availabilitysets.go +++ b/azure/services/availabilitysets/availabilitysets.go @@ -26,9 +26,9 @@ import ( "github.com/pkg/errors" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/converters" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/resourceskus" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/converters" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/resourceskus" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/availabilitysets/availabilitysets_test.go b/azure/services/availabilitysets/availabilitysets_test.go similarity index 98% rename from cloud/services/availabilitysets/availabilitysets_test.go rename to azure/services/availabilitysets/availabilitysets_test.go index aad522cf031..7102c467591 100644 --- a/cloud/services/availabilitysets/availabilitysets_test.go +++ b/azure/services/availabilitysets/availabilitysets_test.go @@ -27,11 +27,11 @@ import ( "github.com/golang/mock/gomock" . "github.com/onsi/gomega" "k8s.io/utils/pointer" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/resourceskus" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/resourceskus" gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock" "k8s.io/klog/klogr" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/availabilitysets/mock_availabilitysets" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/availabilitysets/mock_availabilitysets" ) func TestReconcileAvailabilitySets(t *testing.T) { diff --git a/cloud/services/availabilitysets/client.go b/azure/services/availabilitysets/client.go similarity index 98% rename from cloud/services/availabilitysets/client.go rename to azure/services/availabilitysets/client.go index c8685bce2e2..3cfa4bd8aa4 100644 --- a/cloud/services/availabilitysets/client.go +++ b/azure/services/availabilitysets/client.go @@ -21,7 +21,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-30/compute" "github.com/Azure/go-autorest/autorest" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/availabilitysets/mock_availabilitysets/availabilitysets_mock.go b/azure/services/availabilitysets/mock_availabilitysets/availabilitysets_mock.go similarity index 100% rename from cloud/services/availabilitysets/mock_availabilitysets/availabilitysets_mock.go rename to azure/services/availabilitysets/mock_availabilitysets/availabilitysets_mock.go diff --git a/cloud/services/availabilitysets/mock_availabilitysets/client_mock.go b/azure/services/availabilitysets/mock_availabilitysets/client_mock.go similarity index 100% rename from cloud/services/availabilitysets/mock_availabilitysets/client_mock.go rename to azure/services/availabilitysets/mock_availabilitysets/client_mock.go diff --git a/cloud/services/availabilitysets/mock_availabilitysets/doc.go b/azure/services/availabilitysets/mock_availabilitysets/doc.go similarity index 100% rename from cloud/services/availabilitysets/mock_availabilitysets/doc.go rename to azure/services/availabilitysets/mock_availabilitysets/doc.go diff --git a/cloud/services/bastionhosts/bastionhosts.go b/azure/services/bastionhosts/bastionhosts.go similarity index 96% rename from cloud/services/bastionhosts/bastionhosts.go rename to azure/services/bastionhosts/bastionhosts.go index 4f259d80d95..c6a3f80a090 100644 --- a/cloud/services/bastionhosts/bastionhosts.go +++ b/azure/services/bastionhosts/bastionhosts.go @@ -27,11 +27,11 @@ import ( "github.com/pkg/errors" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" - "sigs.k8s.io/cluster-api-provider-azure/cloud/converters" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/publicips" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/subnets" + "sigs.k8s.io/cluster-api-provider-azure/azure/converters" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/publicips" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/subnets" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/bastionhosts/bastionhosts_test.go b/azure/services/bastionhosts/bastionhosts_test.go similarity index 98% rename from cloud/services/bastionhosts/bastionhosts_test.go rename to azure/services/bastionhosts/bastionhosts_test.go index d7b76e1c90d..1d6b344beee 100644 --- a/cloud/services/bastionhosts/bastionhosts_test.go +++ b/azure/services/bastionhosts/bastionhosts_test.go @@ -22,10 +22,10 @@ import ( "testing" . "github.com/onsi/gomega" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - mock_bastionhosts "sigs.k8s.io/cluster-api-provider-azure/cloud/services/bastionhosts/mocks_bastionhosts" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/publicips/mock_publicips" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/subnets/mock_subnets" + "sigs.k8s.io/cluster-api-provider-azure/azure" + mock_bastionhosts "sigs.k8s.io/cluster-api-provider-azure/azure/services/bastionhosts/mocks_bastionhosts" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/publicips/mock_publicips" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/subnets/mock_subnets" gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock" "github.com/Azure/go-autorest/autorest" diff --git a/cloud/services/bastionhosts/client.go b/azure/services/bastionhosts/client.go similarity index 98% rename from cloud/services/bastionhosts/client.go rename to azure/services/bastionhosts/client.go index 613b493259f..5cd018fbd53 100644 --- a/cloud/services/bastionhosts/client.go +++ b/azure/services/bastionhosts/client.go @@ -22,7 +22,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-06-01/network" "github.com/Azure/go-autorest/autorest" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/bastionhosts/mocks_bastionhosts/bastionhosts_mock.go b/azure/services/bastionhosts/mocks_bastionhosts/bastionhosts_mock.go similarity index 99% rename from cloud/services/bastionhosts/mocks_bastionhosts/bastionhosts_mock.go rename to azure/services/bastionhosts/mocks_bastionhosts/bastionhosts_mock.go index 786e71a1ebd..c4b775f41fb 100644 --- a/cloud/services/bastionhosts/mocks_bastionhosts/bastionhosts_mock.go +++ b/azure/services/bastionhosts/mocks_bastionhosts/bastionhosts_mock.go @@ -26,7 +26,7 @@ import ( gomock "github.com/golang/mock/gomock" reflect "reflect" v1alpha3 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + azure "sigs.k8s.io/cluster-api-provider-azure/azure" ) // MockBastionScope is a mock of BastionScope interface. diff --git a/cloud/services/bastionhosts/mocks_bastionhosts/client_mock.go b/azure/services/bastionhosts/mocks_bastionhosts/client_mock.go similarity index 100% rename from cloud/services/bastionhosts/mocks_bastionhosts/client_mock.go rename to azure/services/bastionhosts/mocks_bastionhosts/client_mock.go diff --git a/cloud/services/bastionhosts/mocks_bastionhosts/doc.go b/azure/services/bastionhosts/mocks_bastionhosts/doc.go similarity index 100% rename from cloud/services/bastionhosts/mocks_bastionhosts/doc.go rename to azure/services/bastionhosts/mocks_bastionhosts/doc.go diff --git a/cloud/services/disks/client.go b/azure/services/disks/client.go similarity index 97% rename from cloud/services/disks/client.go rename to azure/services/disks/client.go index 2afeefd269e..353b22e56ab 100644 --- a/cloud/services/disks/client.go +++ b/azure/services/disks/client.go @@ -21,7 +21,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-30/compute" "github.com/Azure/go-autorest/autorest" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/disks/disks.go b/azure/services/disks/disks.go similarity index 97% rename from cloud/services/disks/disks.go rename to azure/services/disks/disks.go index 69ed42bac0f..8c2ffad7068 100644 --- a/cloud/services/disks/disks.go +++ b/azure/services/disks/disks.go @@ -22,7 +22,7 @@ import ( "github.com/go-logr/logr" "github.com/pkg/errors" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/disks/disks_test.go b/azure/services/disks/disks_test.go similarity index 97% rename from cloud/services/disks/disks_test.go rename to azure/services/disks/disks_test.go index b2fc3c7aa17..3077ab63b97 100644 --- a/cloud/services/disks/disks_test.go +++ b/azure/services/disks/disks_test.go @@ -31,9 +31,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/scope" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/disks/mock_disks" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/disks/mock_disks" gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock" ) diff --git a/cloud/services/disks/mock_disks/client_mock.go b/azure/services/disks/mock_disks/client_mock.go similarity index 100% rename from cloud/services/disks/mock_disks/client_mock.go rename to azure/services/disks/mock_disks/client_mock.go diff --git a/cloud/services/disks/mock_disks/disks_mock.go b/azure/services/disks/mock_disks/disks_mock.go similarity index 99% rename from cloud/services/disks/mock_disks/disks_mock.go rename to azure/services/disks/mock_disks/disks_mock.go index 5dea2717959..0e1108e542c 100644 --- a/cloud/services/disks/mock_disks/disks_mock.go +++ b/azure/services/disks/mock_disks/disks_mock.go @@ -26,7 +26,7 @@ import ( gomock "github.com/golang/mock/gomock" reflect "reflect" v1alpha3 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + azure "sigs.k8s.io/cluster-api-provider-azure/azure" ) // MockDiskScope is a mock of DiskScope interface. diff --git a/cloud/services/disks/mock_disks/doc.go b/azure/services/disks/mock_disks/doc.go similarity index 100% rename from cloud/services/disks/mock_disks/doc.go rename to azure/services/disks/mock_disks/doc.go diff --git a/cloud/services/groups/client.go b/azure/services/groups/client.go similarity index 98% rename from cloud/services/groups/client.go rename to azure/services/groups/client.go index 3a99675d8c9..106fa6c1efc 100644 --- a/cloud/services/groups/client.go +++ b/azure/services/groups/client.go @@ -22,7 +22,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-05-01/resources" "github.com/Azure/go-autorest/autorest" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/groups/groups.go b/azure/services/groups/groups.go similarity index 97% rename from cloud/services/groups/groups.go rename to azure/services/groups/groups.go index 9cca6037c6b..5038e8cba33 100644 --- a/cloud/services/groups/groups.go +++ b/azure/services/groups/groups.go @@ -25,8 +25,8 @@ import ( "github.com/pkg/errors" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/converters" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/converters" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/groups/groups_test.go b/azure/services/groups/groups_test.go similarity index 98% rename from cloud/services/groups/groups_test.go rename to azure/services/groups/groups_test.go index 9df36d258ae..0728e3dd39a 100644 --- a/cloud/services/groups/groups_test.go +++ b/azure/services/groups/groups_test.go @@ -28,9 +28,9 @@ import ( "k8s.io/klog/klogr" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/converters" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/groups/mock_groups" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/converters" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/groups/mock_groups" gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock" ) diff --git a/cloud/services/groups/mock_groups/client_mock.go b/azure/services/groups/mock_groups/client_mock.go similarity index 100% rename from cloud/services/groups/mock_groups/client_mock.go rename to azure/services/groups/mock_groups/client_mock.go diff --git a/cloud/services/groups/mock_groups/doc.go b/azure/services/groups/mock_groups/doc.go similarity index 100% rename from cloud/services/groups/mock_groups/doc.go rename to azure/services/groups/mock_groups/doc.go diff --git a/cloud/services/groups/mock_groups/groups_mock.go b/azure/services/groups/mock_groups/groups_mock.go similarity index 100% rename from cloud/services/groups/mock_groups/groups_mock.go rename to azure/services/groups/mock_groups/groups_mock.go diff --git a/cloud/services/inboundnatrules/client.go b/azure/services/inboundnatrules/client.go similarity index 98% rename from cloud/services/inboundnatrules/client.go rename to azure/services/inboundnatrules/client.go index 33d13eba54e..cdd0ff54a5d 100644 --- a/cloud/services/inboundnatrules/client.go +++ b/azure/services/inboundnatrules/client.go @@ -22,7 +22,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-06-01/network" "github.com/Azure/go-autorest/autorest" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/inboundnatrules/inboundnatrules.go b/azure/services/inboundnatrules/inboundnatrules.go similarity index 97% rename from cloud/services/inboundnatrules/inboundnatrules.go rename to azure/services/inboundnatrules/inboundnatrules.go index 60c03c75a64..b5cd11fc016 100644 --- a/cloud/services/inboundnatrules/inboundnatrules.go +++ b/azure/services/inboundnatrules/inboundnatrules.go @@ -24,8 +24,8 @@ import ( "github.com/go-logr/logr" "github.com/pkg/errors" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/loadbalancers" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/loadbalancers" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/inboundnatrules/inboundnatrules_test.go b/azure/services/inboundnatrules/inboundnatrules_test.go similarity index 99% rename from cloud/services/inboundnatrules/inboundnatrules_test.go rename to azure/services/inboundnatrules/inboundnatrules_test.go index 732ddeaef1f..b3c79c9f56c 100644 --- a/cloud/services/inboundnatrules/inboundnatrules_test.go +++ b/azure/services/inboundnatrules/inboundnatrules_test.go @@ -29,9 +29,9 @@ import ( "k8s.io/klog/klogr" "k8s.io/utils/pointer" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/inboundnatrules/mock_inboundnatrules" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/loadbalancers/mock_loadbalancers" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/inboundnatrules/mock_inboundnatrules" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/loadbalancers/mock_loadbalancers" gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock" ) diff --git a/cloud/services/inboundnatrules/mock_inboundnatrules/client_mock.go b/azure/services/inboundnatrules/mock_inboundnatrules/client_mock.go similarity index 100% rename from cloud/services/inboundnatrules/mock_inboundnatrules/client_mock.go rename to azure/services/inboundnatrules/mock_inboundnatrules/client_mock.go diff --git a/cloud/services/inboundnatrules/mock_inboundnatrules/doc.go b/azure/services/inboundnatrules/mock_inboundnatrules/doc.go similarity index 100% rename from cloud/services/inboundnatrules/mock_inboundnatrules/doc.go rename to azure/services/inboundnatrules/mock_inboundnatrules/doc.go diff --git a/cloud/services/inboundnatrules/mock_inboundnatrules/inboundnatrules_mock.go b/azure/services/inboundnatrules/mock_inboundnatrules/inboundnatrules_mock.go similarity index 99% rename from cloud/services/inboundnatrules/mock_inboundnatrules/inboundnatrules_mock.go rename to azure/services/inboundnatrules/mock_inboundnatrules/inboundnatrules_mock.go index 16a90f9d17d..7f0124335c2 100644 --- a/cloud/services/inboundnatrules/mock_inboundnatrules/inboundnatrules_mock.go +++ b/azure/services/inboundnatrules/mock_inboundnatrules/inboundnatrules_mock.go @@ -26,7 +26,7 @@ import ( gomock "github.com/golang/mock/gomock" reflect "reflect" v1alpha3 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + azure "sigs.k8s.io/cluster-api-provider-azure/azure" ) // MockInboundNatScope is a mock of InboundNatScope interface. diff --git a/cloud/services/loadbalancers/client.go b/azure/services/loadbalancers/client.go similarity index 98% rename from cloud/services/loadbalancers/client.go rename to azure/services/loadbalancers/client.go index 8cee15223e1..859581aae69 100644 --- a/cloud/services/loadbalancers/client.go +++ b/azure/services/loadbalancers/client.go @@ -22,7 +22,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-06-01/network" "github.com/Azure/go-autorest/autorest" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/loadbalancers/loadbalancers.go b/azure/services/loadbalancers/loadbalancers.go similarity index 98% rename from cloud/services/loadbalancers/loadbalancers.go rename to azure/services/loadbalancers/loadbalancers.go index 9f186308cc7..eb0651e79a0 100644 --- a/cloud/services/loadbalancers/loadbalancers.go +++ b/azure/services/loadbalancers/loadbalancers.go @@ -25,9 +25,9 @@ import ( "github.com/pkg/errors" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/converters" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/virtualnetworks" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/converters" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/virtualnetworks" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/loadbalancers/loadbalancers_test.go b/azure/services/loadbalancers/loadbalancers_test.go similarity index 99% rename from cloud/services/loadbalancers/loadbalancers_test.go rename to azure/services/loadbalancers/loadbalancers_test.go index d14729e4653..5051842c9be 100644 --- a/cloud/services/loadbalancers/loadbalancers_test.go +++ b/azure/services/loadbalancers/loadbalancers_test.go @@ -29,9 +29,9 @@ import ( "k8s.io/klog/klogr" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/loadbalancers/mock_loadbalancers" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/virtualnetworks/mock_virtualnetworks" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/loadbalancers/mock_loadbalancers" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/virtualnetworks/mock_virtualnetworks" gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock" ) diff --git a/cloud/services/loadbalancers/mock_loadbalancers/client_mock.go b/azure/services/loadbalancers/mock_loadbalancers/client_mock.go similarity index 100% rename from cloud/services/loadbalancers/mock_loadbalancers/client_mock.go rename to azure/services/loadbalancers/mock_loadbalancers/client_mock.go diff --git a/cloud/services/loadbalancers/mock_loadbalancers/doc.go b/azure/services/loadbalancers/mock_loadbalancers/doc.go similarity index 100% rename from cloud/services/loadbalancers/mock_loadbalancers/doc.go rename to azure/services/loadbalancers/mock_loadbalancers/doc.go diff --git a/cloud/services/loadbalancers/mock_loadbalancers/loadbalancers_mock.go b/azure/services/loadbalancers/mock_loadbalancers/loadbalancers_mock.go similarity index 99% rename from cloud/services/loadbalancers/mock_loadbalancers/loadbalancers_mock.go rename to azure/services/loadbalancers/mock_loadbalancers/loadbalancers_mock.go index 57f27aebf98..69efdbc2591 100644 --- a/cloud/services/loadbalancers/mock_loadbalancers/loadbalancers_mock.go +++ b/azure/services/loadbalancers/mock_loadbalancers/loadbalancers_mock.go @@ -26,7 +26,7 @@ import ( gomock "github.com/golang/mock/gomock" reflect "reflect" v1alpha3 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + azure "sigs.k8s.io/cluster-api-provider-azure/azure" ) // MockLBScope is a mock of LBScope interface. diff --git a/cloud/services/managedclusters/client.go b/azure/services/managedclusters/client.go similarity index 98% rename from cloud/services/managedclusters/client.go rename to azure/services/managedclusters/client.go index 00262d9d44a..d88a9c3c55f 100644 --- a/cloud/services/managedclusters/client.go +++ b/azure/services/managedclusters/client.go @@ -23,7 +23,7 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/pkg/errors" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/managedclusters/managedclusters.go b/azure/services/managedclusters/managedclusters.go similarity index 99% rename from cloud/services/managedclusters/managedclusters.go rename to azure/services/managedclusters/managedclusters.go index 0dfd8856c02..5fe6c0b4b3c 100644 --- a/cloud/services/managedclusters/managedclusters.go +++ b/azure/services/managedclusters/managedclusters.go @@ -25,7 +25,7 @@ import ( "github.com/pkg/errors" "k8s.io/klog" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/managedclusters/managedclusters_test.go b/azure/services/managedclusters/managedclusters_test.go similarity index 98% rename from cloud/services/managedclusters/managedclusters_test.go rename to azure/services/managedclusters/managedclusters_test.go index 7200184447e..461f1a95900 100644 --- a/cloud/services/managedclusters/managedclusters_test.go +++ b/azure/services/managedclusters/managedclusters_test.go @@ -26,7 +26,7 @@ import ( "github.com/golang/mock/gomock" . "github.com/onsi/gomega" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/managedclusters/mock_managedclusters" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/managedclusters/mock_managedclusters" gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock" ) diff --git a/cloud/services/managedclusters/mock_managedclusters/doc.go b/azure/services/managedclusters/mock_managedclusters/doc.go similarity index 100% rename from cloud/services/managedclusters/mock_managedclusters/doc.go rename to azure/services/managedclusters/mock_managedclusters/doc.go diff --git a/cloud/services/managedclusters/mock_managedclusters/managedclusters_mock.go b/azure/services/managedclusters/mock_managedclusters/managedclusters_mock.go similarity index 100% rename from cloud/services/managedclusters/mock_managedclusters/managedclusters_mock.go rename to azure/services/managedclusters/mock_managedclusters/managedclusters_mock.go diff --git a/cloud/services/managedclusters/service.go b/azure/services/managedclusters/service.go similarity index 93% rename from cloud/services/managedclusters/service.go rename to azure/services/managedclusters/service.go index dfc744d6f1a..7da1f26d5cc 100644 --- a/cloud/services/managedclusters/service.go +++ b/azure/services/managedclusters/service.go @@ -17,7 +17,7 @@ limitations under the License. package managedclusters import ( - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" ) // Service provides operations on azure resources diff --git a/cloud/services/networkinterfaces/client.go b/azure/services/networkinterfaces/client.go similarity index 98% rename from cloud/services/networkinterfaces/client.go rename to azure/services/networkinterfaces/client.go index 625b7b80a41..f0f24558b41 100644 --- a/cloud/services/networkinterfaces/client.go +++ b/azure/services/networkinterfaces/client.go @@ -22,7 +22,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-06-01/network" "github.com/Azure/go-autorest/autorest" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/networkinterfaces/mock_networkinterfaces/client_mock.go b/azure/services/networkinterfaces/mock_networkinterfaces/client_mock.go similarity index 100% rename from cloud/services/networkinterfaces/mock_networkinterfaces/client_mock.go rename to azure/services/networkinterfaces/mock_networkinterfaces/client_mock.go diff --git a/cloud/services/networkinterfaces/mock_networkinterfaces/doc.go b/azure/services/networkinterfaces/mock_networkinterfaces/doc.go similarity index 100% rename from cloud/services/networkinterfaces/mock_networkinterfaces/doc.go rename to azure/services/networkinterfaces/mock_networkinterfaces/doc.go diff --git a/cloud/services/networkinterfaces/mock_networkinterfaces/networkinterfaces_mock.go b/azure/services/networkinterfaces/mock_networkinterfaces/networkinterfaces_mock.go similarity index 99% rename from cloud/services/networkinterfaces/mock_networkinterfaces/networkinterfaces_mock.go rename to azure/services/networkinterfaces/mock_networkinterfaces/networkinterfaces_mock.go index b9093c44742..4c58fd4b945 100644 --- a/cloud/services/networkinterfaces/mock_networkinterfaces/networkinterfaces_mock.go +++ b/azure/services/networkinterfaces/mock_networkinterfaces/networkinterfaces_mock.go @@ -26,7 +26,7 @@ import ( gomock "github.com/golang/mock/gomock" reflect "reflect" v1alpha3 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + azure "sigs.k8s.io/cluster-api-provider-azure/azure" ) // MockNICScope is a mock of NICScope interface. diff --git a/cloud/services/networkinterfaces/networkinterfaces.go b/azure/services/networkinterfaces/networkinterfaces.go similarity index 98% rename from cloud/services/networkinterfaces/networkinterfaces.go rename to azure/services/networkinterfaces/networkinterfaces.go index edc43fbff07..3d21bef72e8 100644 --- a/cloud/services/networkinterfaces/networkinterfaces.go +++ b/azure/services/networkinterfaces/networkinterfaces.go @@ -24,8 +24,8 @@ import ( "github.com/go-logr/logr" "github.com/pkg/errors" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/resourceskus" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/resourceskus" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/networkinterfaces/networkinterfaces_test.go b/azure/services/networkinterfaces/networkinterfaces_test.go similarity index 99% rename from cloud/services/networkinterfaces/networkinterfaces_test.go rename to azure/services/networkinterfaces/networkinterfaces_test.go index 398a2bff00b..15f059ac5fc 100644 --- a/cloud/services/networkinterfaces/networkinterfaces_test.go +++ b/azure/services/networkinterfaces/networkinterfaces_test.go @@ -22,7 +22,7 @@ import ( "net/http" "testing" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-30/compute" @@ -33,8 +33,8 @@ import ( "github.com/google/go-cmp/cmp" . "github.com/onsi/gomega" "k8s.io/klog/klogr" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/networkinterfaces/mock_networkinterfaces" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/resourceskus" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/networkinterfaces/mock_networkinterfaces" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/resourceskus" ) func TestReconcileNetworkInterface(t *testing.T) { diff --git a/cloud/services/privatedns/client.go b/azure/services/privatedns/client.go similarity index 99% rename from cloud/services/privatedns/client.go rename to azure/services/privatedns/client.go index ca2d6181d44..c57866338cc 100644 --- a/cloud/services/privatedns/client.go +++ b/azure/services/privatedns/client.go @@ -22,7 +22,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns" "github.com/Azure/go-autorest/autorest" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/privatedns/mock_privatedns/client_mock.go b/azure/services/privatedns/mock_privatedns/client_mock.go similarity index 100% rename from cloud/services/privatedns/mock_privatedns/client_mock.go rename to azure/services/privatedns/mock_privatedns/client_mock.go diff --git a/cloud/services/privatedns/mock_privatedns/doc.go b/azure/services/privatedns/mock_privatedns/doc.go similarity index 100% rename from cloud/services/privatedns/mock_privatedns/doc.go rename to azure/services/privatedns/mock_privatedns/doc.go diff --git a/cloud/services/privatedns/mock_privatedns/privatedns_mock.go b/azure/services/privatedns/mock_privatedns/privatedns_mock.go similarity index 99% rename from cloud/services/privatedns/mock_privatedns/privatedns_mock.go rename to azure/services/privatedns/mock_privatedns/privatedns_mock.go index 1f04cbe5964..93ac41daf3b 100644 --- a/cloud/services/privatedns/mock_privatedns/privatedns_mock.go +++ b/azure/services/privatedns/mock_privatedns/privatedns_mock.go @@ -26,7 +26,7 @@ import ( gomock "github.com/golang/mock/gomock" reflect "reflect" v1alpha3 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + azure "sigs.k8s.io/cluster-api-provider-azure/azure" ) // MockScope is a mock of Scope interface. diff --git a/cloud/services/privatedns/privatedns.go b/azure/services/privatedns/privatedns.go similarity index 97% rename from cloud/services/privatedns/privatedns.go rename to azure/services/privatedns/privatedns.go index 4dca1a1d6d3..e6b3f6fcd4d 100644 --- a/cloud/services/privatedns/privatedns.go +++ b/azure/services/privatedns/privatedns.go @@ -24,8 +24,8 @@ import ( "github.com/go-logr/logr" "github.com/pkg/errors" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/converters" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/converters" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/privatedns/privatedns_test.go b/azure/services/privatedns/privatedns_test.go similarity index 99% rename from cloud/services/privatedns/privatedns_test.go rename to azure/services/privatedns/privatedns_test.go index bdf1eebd4c8..79f326747ae 100644 --- a/cloud/services/privatedns/privatedns_test.go +++ b/azure/services/privatedns/privatedns_test.go @@ -24,13 +24,13 @@ import ( "github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns" "github.com/Azure/go-autorest/autorest/to" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/privatedns/mock_privatedns" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/privatedns/mock_privatedns" gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock" "github.com/Azure/go-autorest/autorest" "github.com/golang/mock/gomock" . "github.com/onsi/gomega" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "k8s.io/klog/klogr" ) diff --git a/cloud/services/publicips/client.go b/azure/services/publicips/client.go similarity index 98% rename from cloud/services/publicips/client.go rename to azure/services/publicips/client.go index 9b3126be02a..a617d4c5f44 100644 --- a/cloud/services/publicips/client.go +++ b/azure/services/publicips/client.go @@ -22,7 +22,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-06-01/network" "github.com/Azure/go-autorest/autorest" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/publicips/mock_publicips/client_mock.go b/azure/services/publicips/mock_publicips/client_mock.go similarity index 100% rename from cloud/services/publicips/mock_publicips/client_mock.go rename to azure/services/publicips/mock_publicips/client_mock.go diff --git a/cloud/services/publicips/mock_publicips/doc.go b/azure/services/publicips/mock_publicips/doc.go similarity index 100% rename from cloud/services/publicips/mock_publicips/doc.go rename to azure/services/publicips/mock_publicips/doc.go diff --git a/cloud/services/publicips/mock_publicips/publicips_mock.go b/azure/services/publicips/mock_publicips/publicips_mock.go similarity index 99% rename from cloud/services/publicips/mock_publicips/publicips_mock.go rename to azure/services/publicips/mock_publicips/publicips_mock.go index 37477404cd0..77b9c6b3ca7 100644 --- a/cloud/services/publicips/mock_publicips/publicips_mock.go +++ b/azure/services/publicips/mock_publicips/publicips_mock.go @@ -26,7 +26,7 @@ import ( gomock "github.com/golang/mock/gomock" reflect "reflect" v1alpha3 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + azure "sigs.k8s.io/cluster-api-provider-azure/azure" ) // MockPublicIPScope is a mock of PublicIPScope interface. diff --git a/cloud/services/publicips/publicips.go b/azure/services/publicips/publicips.go similarity index 97% rename from cloud/services/publicips/publicips.go rename to azure/services/publicips/publicips.go index b61b9d2f5a5..ac717f60188 100644 --- a/cloud/services/publicips/publicips.go +++ b/azure/services/publicips/publicips.go @@ -26,8 +26,8 @@ import ( "github.com/pkg/errors" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/converters" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/converters" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/publicips/publicips_test.go b/azure/services/publicips/publicips_test.go similarity index 99% rename from cloud/services/publicips/publicips_test.go rename to azure/services/publicips/publicips_test.go index 487093859ed..18720320772 100644 --- a/cloud/services/publicips/publicips_test.go +++ b/azure/services/publicips/publicips_test.go @@ -25,10 +25,10 @@ import ( gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" . "github.com/onsi/gomega" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/publicips/mock_publicips" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/publicips/mock_publicips" "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/to" diff --git a/cloud/services/resourceskus/cache.go b/azure/services/resourceskus/cache.go similarity index 99% rename from cloud/services/resourceskus/cache.go rename to azure/services/resourceskus/cache.go index c7b73730fca..58ccf048550 100644 --- a/cloud/services/resourceskus/cache.go +++ b/azure/services/resourceskus/cache.go @@ -27,7 +27,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-30/compute" "github.com/pkg/errors" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/cache/ttllru" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/resourceskus/cache_test.go b/azure/services/resourceskus/cache_test.go similarity index 100% rename from cloud/services/resourceskus/cache_test.go rename to azure/services/resourceskus/cache_test.go diff --git a/cloud/services/resourceskus/client.go b/azure/services/resourceskus/client.go similarity index 97% rename from cloud/services/resourceskus/client.go rename to azure/services/resourceskus/client.go index b60bb8bb84c..00db8fc607f 100644 --- a/cloud/services/resourceskus/client.go +++ b/azure/services/resourceskus/client.go @@ -23,7 +23,7 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/pkg/errors" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/resourceskus/mock_resourceskus/doc.go b/azure/services/resourceskus/mock_resourceskus/doc.go similarity index 100% rename from cloud/services/resourceskus/mock_resourceskus/doc.go rename to azure/services/resourceskus/mock_resourceskus/doc.go diff --git a/cloud/services/resourceskus/mock_resourceskus/resourceskus_mock.go b/azure/services/resourceskus/mock_resourceskus/resourceskus_mock.go similarity index 100% rename from cloud/services/resourceskus/mock_resourceskus/resourceskus_mock.go rename to azure/services/resourceskus/mock_resourceskus/resourceskus_mock.go diff --git a/cloud/services/resourceskus/sku.go b/azure/services/resourceskus/sku.go similarity index 100% rename from cloud/services/resourceskus/sku.go rename to azure/services/resourceskus/sku.go diff --git a/cloud/services/roleassignments/client.go b/azure/services/roleassignments/client.go similarity index 98% rename from cloud/services/roleassignments/client.go rename to azure/services/roleassignments/client.go index 86e97d1be28..b4049f2cfbd 100644 --- a/cloud/services/roleassignments/client.go +++ b/azure/services/roleassignments/client.go @@ -22,7 +22,7 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2019-03-01/authorization/mgmt/authorization" "github.com/Azure/go-autorest/autorest" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/roleassignments/mock_roleassignments/client_mock.go b/azure/services/roleassignments/mock_roleassignments/client_mock.go similarity index 100% rename from cloud/services/roleassignments/mock_roleassignments/client_mock.go rename to azure/services/roleassignments/mock_roleassignments/client_mock.go diff --git a/cloud/services/roleassignments/mock_roleassignments/doc.go b/azure/services/roleassignments/mock_roleassignments/doc.go similarity index 100% rename from cloud/services/roleassignments/mock_roleassignments/doc.go rename to azure/services/roleassignments/mock_roleassignments/doc.go diff --git a/cloud/services/roleassignments/mock_roleassignments/roleassignments_mock.go b/azure/services/roleassignments/mock_roleassignments/roleassignments_mock.go similarity index 99% rename from cloud/services/roleassignments/mock_roleassignments/roleassignments_mock.go rename to azure/services/roleassignments/mock_roleassignments/roleassignments_mock.go index a848cc57fdf..161d4f422ef 100644 --- a/cloud/services/roleassignments/mock_roleassignments/roleassignments_mock.go +++ b/azure/services/roleassignments/mock_roleassignments/roleassignments_mock.go @@ -26,7 +26,7 @@ import ( gomock "github.com/golang/mock/gomock" reflect "reflect" v1alpha3 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + azure "sigs.k8s.io/cluster-api-provider-azure/azure" ) // MockRoleAssignmentScope is a mock of RoleAssignmentScope interface. diff --git a/cloud/services/roleassignments/roleassignments.go b/azure/services/roleassignments/roleassignments.go similarity index 96% rename from cloud/services/roleassignments/roleassignments.go rename to azure/services/roleassignments/roleassignments.go index a63ecc9ab5b..eb199ee340f 100644 --- a/cloud/services/roleassignments/roleassignments.go +++ b/azure/services/roleassignments/roleassignments.go @@ -25,9 +25,9 @@ import ( "github.com/go-logr/logr" "github.com/pkg/errors" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/scalesets" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/virtualmachines" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/scalesets" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/virtualmachines" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/roleassignments/roleassignments_test.go b/azure/services/roleassignments/roleassignments_test.go similarity index 97% rename from cloud/services/roleassignments/roleassignments_test.go rename to azure/services/roleassignments/roleassignments_test.go index 0983be52670..28ac1cfee36 100644 --- a/cloud/services/roleassignments/roleassignments_test.go +++ b/azure/services/roleassignments/roleassignments_test.go @@ -30,10 +30,10 @@ import ( "k8s.io/klog/klogr" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/roleassignments/mock_roleassignments" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/scalesets/mock_scalesets" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/virtualmachines/mock_virtualmachines" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/roleassignments/mock_roleassignments" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/scalesets/mock_scalesets" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/virtualmachines/mock_virtualmachines" gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock" ) diff --git a/cloud/services/routetables/client.go b/azure/services/routetables/client.go similarity index 98% rename from cloud/services/routetables/client.go rename to azure/services/routetables/client.go index af9ca81cba4..629b3727ca3 100644 --- a/cloud/services/routetables/client.go +++ b/azure/services/routetables/client.go @@ -22,7 +22,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-06-01/network" "github.com/Azure/go-autorest/autorest" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/routetables/mock_routetables/client_mock.go b/azure/services/routetables/mock_routetables/client_mock.go similarity index 100% rename from cloud/services/routetables/mock_routetables/client_mock.go rename to azure/services/routetables/mock_routetables/client_mock.go diff --git a/cloud/services/routetables/mock_routetables/doc.go b/azure/services/routetables/mock_routetables/doc.go similarity index 100% rename from cloud/services/routetables/mock_routetables/doc.go rename to azure/services/routetables/mock_routetables/doc.go diff --git a/cloud/services/routetables/mock_routetables/routetables_mock.go b/azure/services/routetables/mock_routetables/routetables_mock.go similarity index 99% rename from cloud/services/routetables/mock_routetables/routetables_mock.go rename to azure/services/routetables/mock_routetables/routetables_mock.go index 7debbc52f6d..eb16b15c41f 100644 --- a/cloud/services/routetables/mock_routetables/routetables_mock.go +++ b/azure/services/routetables/mock_routetables/routetables_mock.go @@ -26,7 +26,7 @@ import ( gomock "github.com/golang/mock/gomock" reflect "reflect" v1alpha3 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + azure "sigs.k8s.io/cluster-api-provider-azure/azure" ) // MockRouteTableScope is a mock of RouteTableScope interface. diff --git a/cloud/services/routetables/routetables.go b/azure/services/routetables/routetables.go similarity index 97% rename from cloud/services/routetables/routetables.go rename to azure/services/routetables/routetables.go index f0d2b1eab7f..a38469c182e 100644 --- a/cloud/services/routetables/routetables.go +++ b/azure/services/routetables/routetables.go @@ -24,8 +24,8 @@ import ( "github.com/go-logr/logr" "github.com/pkg/errors" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/scope" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/routetables/routetables_test.go b/azure/services/routetables/routetables_test.go similarity index 99% rename from cloud/services/routetables/routetables_test.go rename to azure/services/routetables/routetables_test.go index 496ad8b4966..4238414d49a 100644 --- a/cloud/services/routetables/routetables_test.go +++ b/azure/services/routetables/routetables_test.go @@ -31,8 +31,8 @@ import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/routetables/mock_routetables" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/routetables/mock_routetables" gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock" ) diff --git a/cloud/services/scalesets/client.go b/azure/services/scalesets/client.go similarity index 99% rename from cloud/services/scalesets/client.go rename to azure/services/scalesets/client.go index 37cbb9cfd23..5781e7e367c 100644 --- a/cloud/services/scalesets/client.go +++ b/azure/services/scalesets/client.go @@ -29,7 +29,7 @@ import ( "github.com/pkg/errors" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/scalesets/mock_scalesets/client_mock.go b/azure/services/scalesets/mock_scalesets/client_mock.go similarity index 100% rename from cloud/services/scalesets/mock_scalesets/client_mock.go rename to azure/services/scalesets/mock_scalesets/client_mock.go diff --git a/cloud/services/scalesets/mock_scalesets/doc.go b/azure/services/scalesets/mock_scalesets/doc.go similarity index 100% rename from cloud/services/scalesets/mock_scalesets/doc.go rename to azure/services/scalesets/mock_scalesets/doc.go diff --git a/cloud/services/scalesets/mock_scalesets/scalesets_mock.go b/azure/services/scalesets/mock_scalesets/scalesets_mock.go similarity index 99% rename from cloud/services/scalesets/mock_scalesets/scalesets_mock.go rename to azure/services/scalesets/mock_scalesets/scalesets_mock.go index 5446fb24518..8b9de0cfa1a 100644 --- a/cloud/services/scalesets/mock_scalesets/scalesets_mock.go +++ b/azure/services/scalesets/mock_scalesets/scalesets_mock.go @@ -27,7 +27,7 @@ import ( gomock "github.com/golang/mock/gomock" reflect "reflect" v1alpha3 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + azure "sigs.k8s.io/cluster-api-provider-azure/azure" v1alpha30 "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha3" ) diff --git a/cloud/services/scalesets/scalesets.go b/azure/services/scalesets/scalesets.go similarity index 99% rename from cloud/services/scalesets/scalesets.go rename to azure/services/scalesets/scalesets.go index a177cb1232d..2e123b89b23 100644 --- a/cloud/services/scalesets/scalesets.go +++ b/azure/services/scalesets/scalesets.go @@ -30,9 +30,9 @@ import ( "sigs.k8s.io/cluster-api-provider-azure/util/generators" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/converters" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/resourceskus" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/converters" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/resourceskus" infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha3" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/scalesets/scalesets_test.go b/azure/services/scalesets/scalesets_test.go similarity index 99% rename from cloud/services/scalesets/scalesets_test.go rename to azure/services/scalesets/scalesets_test.go index e5a1fe2023c..0c397f37d81 100644 --- a/cloud/services/scalesets/scalesets_test.go +++ b/azure/services/scalesets/scalesets_test.go @@ -36,11 +36,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/converters" - "sigs.k8s.io/cluster-api-provider-azure/cloud/scope" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/resourceskus" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/scalesets/mock_scalesets" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/converters" + "sigs.k8s.io/cluster-api-provider-azure/azure/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/resourceskus" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/scalesets/mock_scalesets" infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha3" gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock" ) diff --git a/cloud/services/securitygroups/client.go b/azure/services/securitygroups/client.go similarity index 98% rename from cloud/services/securitygroups/client.go rename to azure/services/securitygroups/client.go index b86f98045da..2a7f18f955b 100644 --- a/cloud/services/securitygroups/client.go +++ b/azure/services/securitygroups/client.go @@ -22,7 +22,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-06-01/network" "github.com/Azure/go-autorest/autorest" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/securitygroups/mock_securitygroups/client_mock.go b/azure/services/securitygroups/mock_securitygroups/client_mock.go similarity index 100% rename from cloud/services/securitygroups/mock_securitygroups/client_mock.go rename to azure/services/securitygroups/mock_securitygroups/client_mock.go diff --git a/cloud/services/securitygroups/mock_securitygroups/doc.go b/azure/services/securitygroups/mock_securitygroups/doc.go similarity index 100% rename from cloud/services/securitygroups/mock_securitygroups/doc.go rename to azure/services/securitygroups/mock_securitygroups/doc.go diff --git a/cloud/services/securitygroups/mock_securitygroups/securitygroups_mock.go b/azure/services/securitygroups/mock_securitygroups/securitygroups_mock.go similarity index 99% rename from cloud/services/securitygroups/mock_securitygroups/securitygroups_mock.go rename to azure/services/securitygroups/mock_securitygroups/securitygroups_mock.go index 8b6bdb66f42..5353a4c254c 100644 --- a/cloud/services/securitygroups/mock_securitygroups/securitygroups_mock.go +++ b/azure/services/securitygroups/mock_securitygroups/securitygroups_mock.go @@ -26,7 +26,7 @@ import ( gomock "github.com/golang/mock/gomock" reflect "reflect" v1alpha3 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + azure "sigs.k8s.io/cluster-api-provider-azure/azure" ) // MockNSGScope is a mock of NSGScope interface. diff --git a/cloud/services/securitygroups/securitygroups.go b/azure/services/securitygroups/securitygroups.go similarity index 97% rename from cloud/services/securitygroups/securitygroups.go rename to azure/services/securitygroups/securitygroups.go index 74e07a953f6..a5afe2af482 100644 --- a/cloud/services/securitygroups/securitygroups.go +++ b/azure/services/securitygroups/securitygroups.go @@ -25,8 +25,8 @@ import ( "github.com/go-logr/logr" "github.com/pkg/errors" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/converters" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/converters" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/securitygroups/securitygroups_test.go b/azure/services/securitygroups/securitygroups_test.go similarity index 99% rename from cloud/services/securitygroups/securitygroups_test.go rename to azure/services/securitygroups/securitygroups_test.go index aac6a3ec5a8..099f3dcd550 100644 --- a/cloud/services/securitygroups/securitygroups_test.go +++ b/azure/services/securitygroups/securitygroups_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/klog/klogr" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/securitygroups/mock_securitygroups" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/securitygroups/mock_securitygroups" gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock" ) diff --git a/cloud/services/subnets/client.go b/azure/services/subnets/client.go similarity index 98% rename from cloud/services/subnets/client.go rename to azure/services/subnets/client.go index b227de3e8bb..670b36bc524 100644 --- a/cloud/services/subnets/client.go +++ b/azure/services/subnets/client.go @@ -22,7 +22,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-06-01/network" "github.com/Azure/go-autorest/autorest" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/subnets/mock_subnets/client_mock.go b/azure/services/subnets/mock_subnets/client_mock.go similarity index 100% rename from cloud/services/subnets/mock_subnets/client_mock.go rename to azure/services/subnets/mock_subnets/client_mock.go diff --git a/cloud/services/subnets/mock_subnets/doc.go b/azure/services/subnets/mock_subnets/doc.go similarity index 100% rename from cloud/services/subnets/mock_subnets/doc.go rename to azure/services/subnets/mock_subnets/doc.go diff --git a/cloud/services/subnets/mock_subnets/subnets_mock.go b/azure/services/subnets/mock_subnets/subnets_mock.go similarity index 99% rename from cloud/services/subnets/mock_subnets/subnets_mock.go rename to azure/services/subnets/mock_subnets/subnets_mock.go index 59b7f5bb2fd..1a4945f48e9 100644 --- a/cloud/services/subnets/mock_subnets/subnets_mock.go +++ b/azure/services/subnets/mock_subnets/subnets_mock.go @@ -26,7 +26,7 @@ import ( gomock "github.com/golang/mock/gomock" reflect "reflect" v1alpha3 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + azure "sigs.k8s.io/cluster-api-provider-azure/azure" ) // MockSubnetScope is a mock of SubnetScope interface. diff --git a/cloud/services/subnets/subnets.go b/azure/services/subnets/subnets.go similarity index 99% rename from cloud/services/subnets/subnets.go rename to azure/services/subnets/subnets.go index fb817fd23fc..34790b29b2d 100644 --- a/cloud/services/subnets/subnets.go +++ b/azure/services/subnets/subnets.go @@ -26,7 +26,7 @@ import ( "github.com/pkg/errors" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/subnets/subnets_test.go b/azure/services/subnets/subnets_test.go similarity index 99% rename from cloud/services/subnets/subnets_test.go rename to azure/services/subnets/subnets_test.go index b928a38b759..81be787b38e 100644 --- a/cloud/services/subnets/subnets_test.go +++ b/azure/services/subnets/subnets_test.go @@ -25,8 +25,8 @@ import ( . "github.com/onsi/gomega" "k8s.io/klog/klogr" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/subnets/mock_subnets" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/subnets/mock_subnets" "github.com/golang/mock/gomock" diff --git a/cloud/services/tags/client.go b/azure/services/tags/client.go similarity index 97% rename from cloud/services/tags/client.go rename to azure/services/tags/client.go index 74317a6c5e2..d64844a9991 100644 --- a/cloud/services/tags/client.go +++ b/azure/services/tags/client.go @@ -22,7 +22,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-10-01/resources" "github.com/Azure/go-autorest/autorest" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/tags/mock_tags/client_mock.go b/azure/services/tags/mock_tags/client_mock.go similarity index 100% rename from cloud/services/tags/mock_tags/client_mock.go rename to azure/services/tags/mock_tags/client_mock.go diff --git a/cloud/services/tags/mock_tags/doc.go b/azure/services/tags/mock_tags/doc.go similarity index 100% rename from cloud/services/tags/mock_tags/doc.go rename to azure/services/tags/mock_tags/doc.go diff --git a/cloud/services/tags/mock_tags/tags_mock.go b/azure/services/tags/mock_tags/tags_mock.go similarity index 99% rename from cloud/services/tags/mock_tags/tags_mock.go rename to azure/services/tags/mock_tags/tags_mock.go index 44e7e606a13..1e5bb924233 100644 --- a/cloud/services/tags/mock_tags/tags_mock.go +++ b/azure/services/tags/mock_tags/tags_mock.go @@ -26,7 +26,7 @@ import ( gomock "github.com/golang/mock/gomock" reflect "reflect" v1alpha3 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + azure "sigs.k8s.io/cluster-api-provider-azure/azure" ) // MockTagScope is a mock of TagScope interface. diff --git a/cloud/services/tags/tags.go b/azure/services/tags/tags.go similarity index 98% rename from cloud/services/tags/tags.go rename to azure/services/tags/tags.go index 8fe1191dbd5..1769634a2d3 100644 --- a/cloud/services/tags/tags.go +++ b/azure/services/tags/tags.go @@ -24,7 +24,7 @@ import ( "github.com/go-logr/logr" "github.com/pkg/errors" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/tags/tags_test.go b/azure/services/tags/tags_test.go similarity index 98% rename from cloud/services/tags/tags_test.go rename to azure/services/tags/tags_test.go index 6ed42234f1f..7ffdb42ba85 100644 --- a/cloud/services/tags/tags_test.go +++ b/azure/services/tags/tags_test.go @@ -28,8 +28,8 @@ import ( . "github.com/onsi/gomega" "k8s.io/klog/klogr" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/tags/mock_tags" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/tags/mock_tags" gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock" ) diff --git a/cloud/services/virtualmachines/client.go b/azure/services/virtualmachines/client.go similarity index 98% rename from cloud/services/virtualmachines/client.go rename to azure/services/virtualmachines/client.go index 7db8818a9f3..e9e7417a21d 100644 --- a/cloud/services/virtualmachines/client.go +++ b/azure/services/virtualmachines/client.go @@ -23,7 +23,7 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/to" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/virtualmachines/mock_virtualmachines/client_mock.go b/azure/services/virtualmachines/mock_virtualmachines/client_mock.go similarity index 100% rename from cloud/services/virtualmachines/mock_virtualmachines/client_mock.go rename to azure/services/virtualmachines/mock_virtualmachines/client_mock.go diff --git a/cloud/services/virtualmachines/mock_virtualmachines/doc.go b/azure/services/virtualmachines/mock_virtualmachines/doc.go similarity index 100% rename from cloud/services/virtualmachines/mock_virtualmachines/doc.go rename to azure/services/virtualmachines/mock_virtualmachines/doc.go diff --git a/cloud/services/virtualmachines/mock_virtualmachines/virtualmachines_mock.go b/azure/services/virtualmachines/mock_virtualmachines/virtualmachines_mock.go similarity index 99% rename from cloud/services/virtualmachines/mock_virtualmachines/virtualmachines_mock.go rename to azure/services/virtualmachines/mock_virtualmachines/virtualmachines_mock.go index c32fc6aa98d..2267be73355 100644 --- a/cloud/services/virtualmachines/mock_virtualmachines/virtualmachines_mock.go +++ b/azure/services/virtualmachines/mock_virtualmachines/virtualmachines_mock.go @@ -28,7 +28,7 @@ import ( v1 "k8s.io/api/core/v1" reflect "reflect" v1alpha3 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + azure "sigs.k8s.io/cluster-api-provider-azure/azure" ) // MockVMScope is a mock of VMScope interface. diff --git a/cloud/services/virtualmachines/virtualmachines.go b/azure/services/virtualmachines/virtualmachines.go similarity index 97% rename from cloud/services/virtualmachines/virtualmachines.go rename to azure/services/virtualmachines/virtualmachines.go index 0c25023aaab..a346d949d93 100644 --- a/cloud/services/virtualmachines/virtualmachines.go +++ b/azure/services/virtualmachines/virtualmachines.go @@ -29,12 +29,12 @@ import ( corev1 "k8s.io/api/core/v1" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/converters" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/availabilitysets" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/networkinterfaces" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/publicips" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/resourceskus" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/converters" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/availabilitysets" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/networkinterfaces" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/publicips" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/resourceskus" "sigs.k8s.io/cluster-api-provider-azure/util/generators" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/virtualmachines/virtualmachines_test.go b/azure/services/virtualmachines/virtualmachines_test.go similarity index 99% rename from cloud/services/virtualmachines/virtualmachines_test.go rename to azure/services/virtualmachines/virtualmachines_test.go index 853f5577697..6657077e33e 100644 --- a/cloud/services/virtualmachines/virtualmachines_test.go +++ b/azure/services/virtualmachines/virtualmachines_test.go @@ -31,12 +31,12 @@ import ( "k8s.io/klog/klogr" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/availabilitysets/mock_availabilitysets" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/networkinterfaces/mock_networkinterfaces" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/publicips/mock_publicips" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/resourceskus" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/virtualmachines/mock_virtualmachines" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/availabilitysets/mock_availabilitysets" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/networkinterfaces/mock_networkinterfaces" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/publicips/mock_publicips" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/resourceskus" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/virtualmachines/mock_virtualmachines" gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock" ) diff --git a/cloud/services/virtualnetworks/client.go b/azure/services/virtualnetworks/client.go similarity index 98% rename from cloud/services/virtualnetworks/client.go rename to azure/services/virtualnetworks/client.go index 00011ffeea5..fdc6b2339ef 100644 --- a/cloud/services/virtualnetworks/client.go +++ b/azure/services/virtualnetworks/client.go @@ -22,7 +22,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-06-01/network" "github.com/Azure/go-autorest/autorest" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/virtualnetworks/mock_virtualnetworks/client_mock.go b/azure/services/virtualnetworks/mock_virtualnetworks/client_mock.go similarity index 100% rename from cloud/services/virtualnetworks/mock_virtualnetworks/client_mock.go rename to azure/services/virtualnetworks/mock_virtualnetworks/client_mock.go diff --git a/cloud/services/virtualnetworks/mock_virtualnetworks/doc.go b/azure/services/virtualnetworks/mock_virtualnetworks/doc.go similarity index 100% rename from cloud/services/virtualnetworks/mock_virtualnetworks/doc.go rename to azure/services/virtualnetworks/mock_virtualnetworks/doc.go diff --git a/cloud/services/virtualnetworks/mock_virtualnetworks/virtualnetworks_mock.go b/azure/services/virtualnetworks/mock_virtualnetworks/virtualnetworks_mock.go similarity index 99% rename from cloud/services/virtualnetworks/mock_virtualnetworks/virtualnetworks_mock.go rename to azure/services/virtualnetworks/mock_virtualnetworks/virtualnetworks_mock.go index 8af098b4caa..83c9625066a 100644 --- a/cloud/services/virtualnetworks/mock_virtualnetworks/virtualnetworks_mock.go +++ b/azure/services/virtualnetworks/mock_virtualnetworks/virtualnetworks_mock.go @@ -26,7 +26,7 @@ import ( gomock "github.com/golang/mock/gomock" reflect "reflect" v1alpha3 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + azure "sigs.k8s.io/cluster-api-provider-azure/azure" ) // MockVNetScope is a mock of VNetScope interface. diff --git a/cloud/services/virtualnetworks/virtualnetworks.go b/azure/services/virtualnetworks/virtualnetworks.go similarity index 97% rename from cloud/services/virtualnetworks/virtualnetworks.go rename to azure/services/virtualnetworks/virtualnetworks.go index 26aefeb3a0a..06f78f9a5d6 100644 --- a/cloud/services/virtualnetworks/virtualnetworks.go +++ b/azure/services/virtualnetworks/virtualnetworks.go @@ -25,8 +25,8 @@ import ( "github.com/pkg/errors" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/converters" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/converters" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/virtualnetworks/virtualnetworks_test.go b/azure/services/virtualnetworks/virtualnetworks_test.go similarity index 99% rename from cloud/services/virtualnetworks/virtualnetworks_test.go rename to azure/services/virtualnetworks/virtualnetworks_test.go index 0f95401dd61..91cbe0eb4f9 100644 --- a/cloud/services/virtualnetworks/virtualnetworks_test.go +++ b/azure/services/virtualnetworks/virtualnetworks_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/klog/klogr" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/virtualnetworks/mock_virtualnetworks" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/virtualnetworks/mock_virtualnetworks" gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock" ) diff --git a/cloud/services/vmextensions/client.go b/azure/services/vmextensions/client.go similarity index 98% rename from cloud/services/vmextensions/client.go rename to azure/services/vmextensions/client.go index f4d87f82fb0..697509c0801 100644 --- a/cloud/services/vmextensions/client.go +++ b/azure/services/vmextensions/client.go @@ -21,7 +21,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-30/compute" "github.com/Azure/go-autorest/autorest" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/vmextensions/mock_vmextensions/client_mock.go b/azure/services/vmextensions/mock_vmextensions/client_mock.go similarity index 100% rename from cloud/services/vmextensions/mock_vmextensions/client_mock.go rename to azure/services/vmextensions/mock_vmextensions/client_mock.go diff --git a/cloud/services/vmextensions/mock_vmextensions/doc.go b/azure/services/vmextensions/mock_vmextensions/doc.go similarity index 100% rename from cloud/services/vmextensions/mock_vmextensions/doc.go rename to azure/services/vmextensions/mock_vmextensions/doc.go diff --git a/cloud/services/vmextensions/mock_vmextensions/vmextensions_mock.go b/azure/services/vmextensions/mock_vmextensions/vmextensions_mock.go similarity index 99% rename from cloud/services/vmextensions/mock_vmextensions/vmextensions_mock.go rename to azure/services/vmextensions/mock_vmextensions/vmextensions_mock.go index 34b7f8351e5..e17c34c9f2c 100644 --- a/cloud/services/vmextensions/mock_vmextensions/vmextensions_mock.go +++ b/azure/services/vmextensions/mock_vmextensions/vmextensions_mock.go @@ -26,7 +26,7 @@ import ( gomock "github.com/golang/mock/gomock" reflect "reflect" v1alpha3 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + azure "sigs.k8s.io/cluster-api-provider-azure/azure" ) // MockVMExtensionScope is a mock of VMExtensionScope interface. diff --git a/cloud/services/vmextensions/vmextensions.go b/azure/services/vmextensions/vmextensions.go similarity index 97% rename from cloud/services/vmextensions/vmextensions.go rename to azure/services/vmextensions/vmextensions.go index e2471db8e1a..2dfabc073a7 100644 --- a/cloud/services/vmextensions/vmextensions.go +++ b/azure/services/vmextensions/vmextensions.go @@ -24,7 +24,7 @@ import ( "github.com/go-logr/logr" "github.com/pkg/errors" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/vmextensions/vmextensions_test.go b/azure/services/vmextensions/vmextensions_test.go similarity index 97% rename from cloud/services/vmextensions/vmextensions_test.go rename to azure/services/vmextensions/vmextensions_test.go index fddab690d24..dc4873a1396 100644 --- a/cloud/services/vmextensions/vmextensions_test.go +++ b/azure/services/vmextensions/vmextensions_test.go @@ -23,12 +23,12 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/latest/compute/mgmt/compute" "github.com/Azure/go-autorest/autorest" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/vmextensions/mock_vmextensions" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/vmextensions/mock_vmextensions" "github.com/golang/mock/gomock" . "github.com/onsi/gomega" "k8s.io/klog/klogr" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock" ) diff --git a/cloud/services/vmssextensions/client.go b/azure/services/vmssextensions/client.go similarity index 98% rename from cloud/services/vmssextensions/client.go rename to azure/services/vmssextensions/client.go index a9a2e368250..52d8cae57b7 100644 --- a/cloud/services/vmssextensions/client.go +++ b/azure/services/vmssextensions/client.go @@ -21,7 +21,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-30/compute" "github.com/Azure/go-autorest/autorest" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/vmssextensions/mock_vmssextensions/client_mock.go b/azure/services/vmssextensions/mock_vmssextensions/client_mock.go similarity index 100% rename from cloud/services/vmssextensions/mock_vmssextensions/client_mock.go rename to azure/services/vmssextensions/mock_vmssextensions/client_mock.go diff --git a/cloud/services/vmssextensions/mock_vmssextensions/doc.go b/azure/services/vmssextensions/mock_vmssextensions/doc.go similarity index 100% rename from cloud/services/vmssextensions/mock_vmssextensions/doc.go rename to azure/services/vmssextensions/mock_vmssextensions/doc.go diff --git a/cloud/services/vmssextensions/mock_vmssextensions/vmssextensions_mock.go b/azure/services/vmssextensions/mock_vmssextensions/vmssextensions_mock.go similarity index 99% rename from cloud/services/vmssextensions/mock_vmssextensions/vmssextensions_mock.go rename to azure/services/vmssextensions/mock_vmssextensions/vmssextensions_mock.go index 86d78a21577..8092d828013 100644 --- a/cloud/services/vmssextensions/mock_vmssextensions/vmssextensions_mock.go +++ b/azure/services/vmssextensions/mock_vmssextensions/vmssextensions_mock.go @@ -26,7 +26,7 @@ import ( gomock "github.com/golang/mock/gomock" reflect "reflect" v1alpha3 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + azure "sigs.k8s.io/cluster-api-provider-azure/azure" ) // MockVMSSExtensionScope is a mock of VMSSExtensionScope interface. diff --git a/cloud/services/vmssextensions/vmssextensions.go b/azure/services/vmssextensions/vmssextensions.go similarity index 97% rename from cloud/services/vmssextensions/vmssextensions.go rename to azure/services/vmssextensions/vmssextensions.go index 81c56ce72c1..58d3bb22778 100644 --- a/cloud/services/vmssextensions/vmssextensions.go +++ b/azure/services/vmssextensions/vmssextensions.go @@ -24,7 +24,7 @@ import ( "github.com/go-logr/logr" "github.com/pkg/errors" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/cloud/services/vmssextensions/vmssextensions_test.go b/azure/services/vmssextensions/vmssextensions_test.go similarity index 97% rename from cloud/services/vmssextensions/vmssextensions_test.go rename to azure/services/vmssextensions/vmssextensions_test.go index 7639979535d..8c3474119d8 100644 --- a/cloud/services/vmssextensions/vmssextensions_test.go +++ b/azure/services/vmssextensions/vmssextensions_test.go @@ -23,12 +23,12 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/latest/compute/mgmt/compute" "github.com/Azure/go-autorest/autorest" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/vmssextensions/mock_vmssextensions" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/vmssextensions/mock_vmssextensions" "github.com/golang/mock/gomock" . "github.com/onsi/gomega" "k8s.io/klog/klogr" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock" ) diff --git a/cloud/types.go b/azure/types.go similarity index 100% rename from cloud/types.go rename to azure/types.go diff --git a/controllers/azurecluster_controller.go b/controllers/azurecluster_controller.go index e983a45d307..4571d4e7557 100644 --- a/controllers/azurecluster_controller.go +++ b/controllers/azurecluster_controller.go @@ -43,7 +43,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/source" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - "sigs.k8s.io/cluster-api-provider-azure/cloud/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure/scope" "sigs.k8s.io/cluster-api-provider-azure/util/reconciler" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/controllers/azurecluster_reconciler.go b/controllers/azurecluster_reconciler.go index d4b3a15552f..a39d9403880 100644 --- a/controllers/azurecluster_reconciler.go +++ b/controllers/azurecluster_reconciler.go @@ -22,31 +22,31 @@ import ( "github.com/pkg/errors" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/scope" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/groups" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/loadbalancers" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/privatedns" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/publicips" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/resourceskus" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/routetables" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/securitygroups" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/subnets" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/virtualnetworks" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/groups" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/loadbalancers" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/privatedns" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/publicips" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/resourceskus" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/routetables" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/securitygroups" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/subnets" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/virtualnetworks" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) // azureClusterService is the reconciler called by the AzureCluster controller type azureClusterService struct { scope *scope.ClusterScope - groupsSvc azure.Service - vnetSvc azure.Service - securityGroupSvc azure.Service - routeTableSvc azure.Service - subnetsSvc azure.Service - publicIPSvc azure.Service - loadBalancerSvc azure.Service - privateDNSSvc azure.Service + groupsSvc azure.Reconciler + vnetSvc azure.Reconciler + securityGroupSvc azure.Reconciler + routeTableSvc azure.Reconciler + subnetsSvc azure.Reconciler + publicIPSvc azure.Reconciler + loadBalancerSvc azure.Reconciler + privateDNSSvc azure.Reconciler skuCache *resourceskus.Cache } @@ -71,7 +71,7 @@ func newAzureClusterService(scope *scope.ClusterScope) (*azureClusterService, er }, nil } -var _ azure.Service = (*azureClusterService)(nil) +var _ azure.Reconciler = (*azureClusterService)(nil) // Reconcile reconciles all the services in pre determined order func (s *azureClusterService) Reconcile(ctx context.Context) error { diff --git a/controllers/azurecluster_reconciler_test.go b/controllers/azurecluster_reconciler_test.go index 7055f1bb1ea..ba31646364b 100644 --- a/controllers/azurecluster_reconciler_test.go +++ b/controllers/azurecluster_reconciler_test.go @@ -26,14 +26,14 @@ import ( . "github.com/onsi/gomega" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/mocks" - "sigs.k8s.io/cluster-api-provider-azure/cloud/scope" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/resourceskus" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/mocks" + "sigs.k8s.io/cluster-api-provider-azure/azure/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/resourceskus" gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock" ) -type expect func(grp *mocks.MockServiceMockRecorder, vnet *mocks.MockServiceMockRecorder, sg *mocks.MockServiceMockRecorder, rt *mocks.MockServiceMockRecorder, sn *mocks.MockServiceMockRecorder, pip *mocks.MockServiceMockRecorder, lb *mocks.MockServiceMockRecorder, dns *mocks.MockServiceMockRecorder) +type expect func(grp *mocks.MockReconcilerMockRecorder, vnet *mocks.MockReconcilerMockRecorder, sg *mocks.MockReconcilerMockRecorder, rt *mocks.MockReconcilerMockRecorder, sn *mocks.MockReconcilerMockRecorder, pip *mocks.MockReconcilerMockRecorder, lb *mocks.MockReconcilerMockRecorder, dns *mocks.MockReconcilerMockRecorder) func TestAzureClusterReconcilerDelete(t *testing.T) { cases := map[string]struct { @@ -42,21 +42,21 @@ func TestAzureClusterReconcilerDelete(t *testing.T) { }{ "Resource Group is deleted successfully": { expectedError: "", - expect: func(grp *mocks.MockServiceMockRecorder, vnet *mocks.MockServiceMockRecorder, sg *mocks.MockServiceMockRecorder, rt *mocks.MockServiceMockRecorder, sn *mocks.MockServiceMockRecorder, pip *mocks.MockServiceMockRecorder, lb *mocks.MockServiceMockRecorder, dns *mocks.MockServiceMockRecorder) { + expect: func(grp *mocks.MockReconcilerMockRecorder, vnet *mocks.MockReconcilerMockRecorder, sg *mocks.MockReconcilerMockRecorder, rt *mocks.MockReconcilerMockRecorder, sn *mocks.MockReconcilerMockRecorder, pip *mocks.MockReconcilerMockRecorder, lb *mocks.MockReconcilerMockRecorder, dns *mocks.MockReconcilerMockRecorder) { gomock.InOrder( grp.Delete(gomockinternal.AContext()).Return(nil)) }, }, "Resource Group delete fails": { expectedError: "failed to delete resource group: internal error", - expect: func(grp *mocks.MockServiceMockRecorder, vnet *mocks.MockServiceMockRecorder, sg *mocks.MockServiceMockRecorder, rt *mocks.MockServiceMockRecorder, sn *mocks.MockServiceMockRecorder, pip *mocks.MockServiceMockRecorder, lb *mocks.MockServiceMockRecorder, dns *mocks.MockServiceMockRecorder) { + expect: func(grp *mocks.MockReconcilerMockRecorder, vnet *mocks.MockReconcilerMockRecorder, sg *mocks.MockReconcilerMockRecorder, rt *mocks.MockReconcilerMockRecorder, sn *mocks.MockReconcilerMockRecorder, pip *mocks.MockReconcilerMockRecorder, lb *mocks.MockReconcilerMockRecorder, dns *mocks.MockReconcilerMockRecorder) { gomock.InOrder( grp.Delete(gomockinternal.AContext()).Return(errors.New("internal error"))) }, }, "Resource Group not owned by cluster": { expectedError: "", - expect: func(grp *mocks.MockServiceMockRecorder, vnet *mocks.MockServiceMockRecorder, sg *mocks.MockServiceMockRecorder, rt *mocks.MockServiceMockRecorder, sn *mocks.MockServiceMockRecorder, pip *mocks.MockServiceMockRecorder, lb *mocks.MockServiceMockRecorder, dns *mocks.MockServiceMockRecorder) { + expect: func(grp *mocks.MockReconcilerMockRecorder, vnet *mocks.MockReconcilerMockRecorder, sg *mocks.MockReconcilerMockRecorder, rt *mocks.MockReconcilerMockRecorder, sn *mocks.MockReconcilerMockRecorder, pip *mocks.MockReconcilerMockRecorder, lb *mocks.MockReconcilerMockRecorder, dns *mocks.MockReconcilerMockRecorder) { gomock.InOrder( grp.Delete(gomockinternal.AContext()).Return(azure.ErrNotOwned), dns.Delete(gomockinternal.AContext()), @@ -71,7 +71,7 @@ func TestAzureClusterReconcilerDelete(t *testing.T) { }, "Load Balancer delete fails": { expectedError: "failed to delete load balancer: some error happened", - expect: func(grp *mocks.MockServiceMockRecorder, vnet *mocks.MockServiceMockRecorder, sg *mocks.MockServiceMockRecorder, rt *mocks.MockServiceMockRecorder, sn *mocks.MockServiceMockRecorder, pip *mocks.MockServiceMockRecorder, lb *mocks.MockServiceMockRecorder, dns *mocks.MockServiceMockRecorder) { + expect: func(grp *mocks.MockReconcilerMockRecorder, vnet *mocks.MockReconcilerMockRecorder, sg *mocks.MockReconcilerMockRecorder, rt *mocks.MockReconcilerMockRecorder, sn *mocks.MockReconcilerMockRecorder, pip *mocks.MockReconcilerMockRecorder, lb *mocks.MockReconcilerMockRecorder, dns *mocks.MockReconcilerMockRecorder) { gomock.InOrder( grp.Delete(gomockinternal.AContext()).Return(azure.ErrNotOwned), dns.Delete(gomockinternal.AContext()), @@ -81,7 +81,7 @@ func TestAzureClusterReconcilerDelete(t *testing.T) { }, "Route table delete fails": { expectedError: "failed to delete route table: some error happened", - expect: func(grp *mocks.MockServiceMockRecorder, vnet *mocks.MockServiceMockRecorder, sg *mocks.MockServiceMockRecorder, rt *mocks.MockServiceMockRecorder, sn *mocks.MockServiceMockRecorder, pip *mocks.MockServiceMockRecorder, lb *mocks.MockServiceMockRecorder, dns *mocks.MockServiceMockRecorder) { + expect: func(grp *mocks.MockReconcilerMockRecorder, vnet *mocks.MockReconcilerMockRecorder, sg *mocks.MockReconcilerMockRecorder, rt *mocks.MockReconcilerMockRecorder, sn *mocks.MockReconcilerMockRecorder, pip *mocks.MockReconcilerMockRecorder, lb *mocks.MockReconcilerMockRecorder, dns *mocks.MockReconcilerMockRecorder) { gomock.InOrder( grp.Delete(gomockinternal.AContext()).Return(azure.ErrNotOwned), dns.Delete(gomockinternal.AContext()), @@ -102,14 +102,14 @@ func TestAzureClusterReconcilerDelete(t *testing.T) { t.Parallel() mockCtrl := gomock.NewController(t) defer mockCtrl.Finish() - groupsMock := mocks.NewMockService(mockCtrl) - vnetMock := mocks.NewMockService(mockCtrl) - sgMock := mocks.NewMockService(mockCtrl) - rtMock := mocks.NewMockService(mockCtrl) - subnetsMock := mocks.NewMockService(mockCtrl) - publicIPMock := mocks.NewMockService(mockCtrl) - lbMock := mocks.NewMockService(mockCtrl) - dnsMock := mocks.NewMockService(mockCtrl) + groupsMock := mocks.NewMockReconciler(mockCtrl) + vnetMock := mocks.NewMockReconciler(mockCtrl) + sgMock := mocks.NewMockReconciler(mockCtrl) + rtMock := mocks.NewMockReconciler(mockCtrl) + subnetsMock := mocks.NewMockReconciler(mockCtrl) + publicIPMock := mocks.NewMockReconciler(mockCtrl) + lbMock := mocks.NewMockReconciler(mockCtrl) + dnsMock := mocks.NewMockReconciler(mockCtrl) tc.expect(groupsMock.EXPECT(), vnetMock.EXPECT(), sgMock.EXPECT(), rtMock.EXPECT(), subnetsMock.EXPECT(), publicIPMock.EXPECT(), lbMock.EXPECT(), dnsMock.EXPECT()) diff --git a/controllers/azurejson_machine_controller.go b/controllers/azurejson_machine_controller.go index 902464476cb..4037fd88776 100644 --- a/controllers/azurejson_machine_controller.go +++ b/controllers/azurejson_machine_controller.go @@ -40,7 +40,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - "sigs.k8s.io/cluster-api-provider-azure/cloud/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure/scope" "sigs.k8s.io/cluster-api-provider-azure/util/reconciler" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/controllers/azurejson_machinepool_controller.go b/controllers/azurejson_machinepool_controller.go index 3544167fd21..3b6ef6f5fce 100644 --- a/controllers/azurejson_machinepool_controller.go +++ b/controllers/azurejson_machinepool_controller.go @@ -36,7 +36,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - "sigs.k8s.io/cluster-api-provider-azure/cloud/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure/scope" expv1 "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha3" "sigs.k8s.io/cluster-api-provider-azure/util/reconciler" "sigs.k8s.io/cluster-api-provider-azure/util/tele" diff --git a/controllers/azurejson_machinetemplate_controller.go b/controllers/azurejson_machinetemplate_controller.go index d1c38ffaa25..594d475308f 100644 --- a/controllers/azurejson_machinetemplate_controller.go +++ b/controllers/azurejson_machinetemplate_controller.go @@ -37,7 +37,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - "sigs.k8s.io/cluster-api-provider-azure/cloud/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure/scope" "sigs.k8s.io/cluster-api-provider-azure/util/reconciler" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/controllers/azuremachine_controller.go b/controllers/azuremachine_controller.go index 1cf810ebf9e..341807f1f01 100644 --- a/controllers/azuremachine_controller.go +++ b/controllers/azuremachine_controller.go @@ -42,8 +42,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/source" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/scope" "sigs.k8s.io/cluster-api-provider-azure/util/reconciler" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) diff --git a/controllers/azuremachine_controller_test.go b/controllers/azuremachine_controller_test.go index 247c4ecd98d..424f3217759 100644 --- a/controllers/azuremachine_controller_test.go +++ b/controllers/azuremachine_controller_test.go @@ -34,7 +34,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - "sigs.k8s.io/cluster-api-provider-azure/cloud/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure/scope" "sigs.k8s.io/cluster-api-provider-azure/internal/test" "sigs.k8s.io/cluster-api-provider-azure/util/reconciler" ) diff --git a/controllers/azuremachine_reconciler.go b/controllers/azuremachine_reconciler.go index 9aa0c4831dc..d4d127a2fc5 100644 --- a/controllers/azuremachine_reconciler.go +++ b/controllers/azuremachine_reconciler.go @@ -21,36 +21,36 @@ import ( "github.com/pkg/errors" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/scope" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/availabilitysets" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/disks" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/inboundnatrules" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/networkinterfaces" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/publicips" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/resourceskus" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/roleassignments" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/tags" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/virtualmachines" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/vmextensions" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/availabilitysets" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/disks" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/inboundnatrules" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/networkinterfaces" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/publicips" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/resourceskus" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/roleassignments" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/tags" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/virtualmachines" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/vmextensions" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) // azureMachineService is the group of services called by the AzureMachine controller. type azureMachineService struct { - networkInterfacesSvc azure.Service - inboundNatRulesSvc azure.Service - virtualMachinesSvc azure.Service - roleAssignmentsSvc azure.Service - disksSvc azure.Service - publicIPsSvc azure.Service - tagsSvc azure.Service - vmExtensionsSvc azure.Service - availabilitySetsSvc azure.Service + networkInterfacesSvc azure.Reconciler + inboundNatRulesSvc azure.Reconciler + virtualMachinesSvc azure.Reconciler + roleAssignmentsSvc azure.Reconciler + disksSvc azure.Reconciler + publicIPsSvc azure.Reconciler + tagsSvc azure.Reconciler + vmExtensionsSvc azure.Reconciler + availabilitySetsSvc azure.Reconciler skuCache *resourceskus.Cache } -var _ azure.Service = (*azureMachineService)(nil) +var _ azure.Reconciler = (*azureMachineService)(nil) // newAzureMachineService populates all the services based on input scope. func newAzureMachineService(machineScope *scope.MachineScope) (*azureMachineService, error) { diff --git a/controllers/helpers.go b/controllers/helpers.go index 599876e9b7d..5160e3b1e64 100644 --- a/controllers/helpers.go +++ b/controllers/helpers.go @@ -21,8 +21,8 @@ import ( "encoding/json" "fmt" - "sigs.k8s.io/cluster-api-provider-azure/cloud/scope" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/groups" + "sigs.k8s.io/cluster-api-provider-azure/azure/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/groups" "sigs.k8s.io/cluster-api-provider-azure/util/tele" "github.com/go-logr/logr" @@ -44,7 +44,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/handler" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/reconciler" ) diff --git a/controllers/helpers_test.go b/controllers/helpers_test.go index 1e59a9a70a3..0b89c501d78 100644 --- a/controllers/helpers_test.go +++ b/controllers/helpers_test.go @@ -39,7 +39,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - "sigs.k8s.io/cluster-api-provider-azure/cloud/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure/scope" "sigs.k8s.io/cluster-api-provider-azure/internal/test/mock_log" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3" ) diff --git a/exp/controllers/azuremachinepool_controller.go b/exp/controllers/azuremachinepool_controller.go index 5c64d6f7a92..e7099251a8c 100644 --- a/exp/controllers/azuremachinepool_controller.go +++ b/exp/controllers/azuremachinepool_controller.go @@ -43,8 +43,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/source" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/scope" infracontroller "sigs.k8s.io/cluster-api-provider-azure/controllers" infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha3" "sigs.k8s.io/cluster-api-provider-azure/util/reconciler" diff --git a/exp/controllers/azuremachinepool_controller_unit_test.go b/exp/controllers/azuremachinepool_controller_unit_test.go index 645b6425864..9e808e0f6fd 100644 --- a/exp/controllers/azuremachinepool_controller_unit_test.go +++ b/exp/controllers/azuremachinepool_controller_unit_test.go @@ -29,8 +29,8 @@ import ( clusterv1exp "sigs.k8s.io/cluster-api/exp/api/v1alpha3" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - "sigs.k8s.io/cluster-api-provider-azure/cloud/mocks" - "sigs.k8s.io/cluster-api-provider-azure/cloud/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure/mocks" + "sigs.k8s.io/cluster-api-provider-azure/azure/scope" infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha3" ) diff --git a/exp/controllers/azuremachinepool_reconciler.go b/exp/controllers/azuremachinepool_reconciler.go index 097bbbfac4d..99f70ab51df 100644 --- a/exp/controllers/azuremachinepool_reconciler.go +++ b/exp/controllers/azuremachinepool_reconciler.go @@ -19,27 +19,27 @@ package controllers import ( "context" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/vmssextensions" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/vmssextensions" "github.com/pkg/errors" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/scope" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/resourceskus" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/roleassignments" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/scalesets" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/resourceskus" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/roleassignments" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/scalesets" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) // azureMachinePoolService is the group of services called by the AzureMachinePool controller. type azureMachinePoolService struct { - virtualMachinesScaleSetSvc azure.Service + virtualMachinesScaleSetSvc azure.Reconciler skuCache *resourceskus.Cache - roleAssignmentsSvc azure.Service - vmssExtensionSvc azure.Service + roleAssignmentsSvc azure.Reconciler + vmssExtensionSvc azure.Reconciler } -var _ azure.Service = (*azureMachinePoolService)(nil) +var _ azure.Reconciler = (*azureMachinePoolService)(nil) // newAzureMachinePoolService populates all the services based on input scope. func newAzureMachinePoolService(machinePoolScope *scope.MachinePoolScope) (*azureMachinePoolService, error) { diff --git a/exp/controllers/azuremanagedmachinepool_controller.go b/exp/controllers/azuremanagedmachinepool_controller.go index 8dc7aef99f3..21d15bdb8f9 100644 --- a/exp/controllers/azuremanagedmachinepool_controller.go +++ b/exp/controllers/azuremanagedmachinepool_controller.go @@ -40,7 +40,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/source" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - "sigs.k8s.io/cluster-api-provider-azure/cloud/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure/scope" infracontroller "sigs.k8s.io/cluster-api-provider-azure/controllers" infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha3" "sigs.k8s.io/cluster-api-provider-azure/util/reconciler" diff --git a/exp/controllers/azuremanagedmachinepool_reconciler.go b/exp/controllers/azuremanagedmachinepool_reconciler.go index 5e278eaf8f8..9948f742868 100644 --- a/exp/controllers/azuremanagedmachinepool_reconciler.go +++ b/exp/controllers/azuremanagedmachinepool_reconciler.go @@ -23,10 +23,10 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-30/compute" "github.com/pkg/errors" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/scope" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/agentpools" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/scalesets" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/agentpools" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/scalesets" "sigs.k8s.io/cluster-api-provider-azure/util/tele" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/exp/controllers/azuremangedcontrolplane_controller.go b/exp/controllers/azuremangedcontrolplane_controller.go index 6a785fee095..a0fc533c475 100644 --- a/exp/controllers/azuremangedcontrolplane_controller.go +++ b/exp/controllers/azuremangedcontrolplane_controller.go @@ -39,7 +39,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/source" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3" - "sigs.k8s.io/cluster-api-provider-azure/cloud/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure/scope" infracontroller "sigs.k8s.io/cluster-api-provider-azure/controllers" infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha3" "sigs.k8s.io/cluster-api-provider-azure/util/reconciler" diff --git a/exp/controllers/azuremangedcontrolplane_reconciler.go b/exp/controllers/azuremangedcontrolplane_reconciler.go index 4fd615231aa..03d4ecd022f 100644 --- a/exp/controllers/azuremangedcontrolplane_reconciler.go +++ b/exp/controllers/azuremangedcontrolplane_reconciler.go @@ -32,12 +32,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" - "sigs.k8s.io/cluster-api-provider-azure/cloud/scope" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/groups" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/managedclusters" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/subnets" - "sigs.k8s.io/cluster-api-provider-azure/cloud/services/virtualnetworks" + "sigs.k8s.io/cluster-api-provider-azure/azure" + "sigs.k8s.io/cluster-api-provider-azure/azure/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/groups" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/managedclusters" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/subnets" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/virtualnetworks" infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha3" "sigs.k8s.io/cluster-api-provider-azure/util/tele" ) @@ -46,9 +46,9 @@ import ( type azureManagedControlPlaneReconciler struct { kubeclient client.Client managedClustersSvc *managedclusters.Service - groupsSvc azure.Service - vnetSvc azure.Service - subnetsSvc azure.Service + groupsSvc azure.Reconciler + vnetSvc azure.Reconciler + subnetsSvc azure.Reconciler } // newAzureManagedControlPlaneReconciler populates all the services based on input scope diff --git a/test/e2e/helpers.go b/test/e2e/helpers.go index 52006cd2b54..c028aed678c 100644 --- a/test/e2e/helpers.go +++ b/test/e2e/helpers.go @@ -46,7 +46,7 @@ import ( typedappsv1 "k8s.io/client-go/kubernetes/typed/apps/v1" typedbatchv1 "k8s.io/client-go/kubernetes/typed/batch/v1" typedcorev1 "k8s.io/client-go/kubernetes/typed/core/v1" - azure "sigs.k8s.io/cluster-api-provider-azure/cloud" + "sigs.k8s.io/cluster-api-provider-azure/azure" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3" clusterv1exp "sigs.k8s.io/cluster-api/exp/api/v1alpha3" "sigs.k8s.io/cluster-api/test/framework"