Remove unused client code

kubernetes-sigs · Oct 9, 2024 · 2a4e9ef · 2a4e9ef
1 parent bbfce3d
commit 2a4e9ef
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 384 deletions.
diff --git a/azure/scope/machine_test.go b/azure/scope/machine_test.go
@@ -43,7 +43,6 @@ import (
 	"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/virtualmachineimages"
-	"sigs.k8s.io/cluster-api-provider-azure/azure/services/virtualmachineimages/mock_virtualmachineimages"
 	"sigs.k8s.io/cluster-api-provider-azure/azure/services/vmextensions"
 )
 
@@ -1538,7 +1537,7 @@ func TestMachineScope_GetVMImage(t *testing.T) {
 	clusterMock.EXPECT().SubscriptionID().AnyTimes()
 	clusterMock.EXPECT().CloudEnvironment().AnyTimes()
 	clusterMock.EXPECT().Token().Return(&azidentity.DefaultAzureCredential{}).AnyTimes()
-	svc := virtualmachineimages.Service{Client: mock_virtualmachineimages.NewMockClient(mockCtrl)}
+	svc := virtualmachineimages.Service{}
 
 	tests := []struct {
 		name         string

diff --git a/azure/services/virtualmachineimages/cache.go b/azure/services/virtualmachineimages/cache.go
diff --git a/azure/services/virtualmachineimages/cache_test.go b/azure/services/virtualmachineimages/cache_test.go
diff --git a/azure/services/virtualmachineimages/client.go b/azure/services/virtualmachineimages/client.go
diff --git a/azure/services/virtualmachineimages/images.go b/azure/services/virtualmachineimages/images.go
@@ -27,22 +27,25 @@ import (
 	"sigs.k8s.io/cluster-api-provider-azure/util/tele"
 )
 
+/* Reference images live in an Azure community gallery with this structure:
+. Gallery: "capzed-489de9a5-a0a0-4e79-a806-ad5479ec43a5"
+├── Image Definition: "capi-ubun2-2404"
+│   ├── Version: "1.30.4"
+│   ├── Version: "1.30.5"
+│   └── Version: "1.31.1"
+└── Image Definition: "capi-win-2022-containerd"
+    ├── Version: "1.30.4"
+    ├── Version: "1.30.5"
+    └── Version: "1.31.1"
+*/
+
 // Service provides operations on Azure VM Images.
 type Service struct {
-	Client
-	azure.Authorizer
 }
 
 // New creates a VM Images service.
-func New(auth azure.Authorizer) (*Service, error) {
-	client, err := NewClient(auth)
-	if err != nil {
-		return nil, err
-	}
-	return &Service{
-		Client:     client,
-		Authorizer: auth,
-	}, nil
+func New(_ azure.Authorizer) (*Service, error) {
+	return &Service{}, nil
 }
 
 // GetDefaultLinuxImage returns the default image spec for Ubuntu.