Skip to content

Commit 2a4e9ef

Browse files
committed
Remove unused client code
1 parent bbfce3d commit 2a4e9ef

File tree

7 files changed

+15
-384
lines changed

7 files changed

+15
-384
lines changed

azure/scope/machine_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ import (
4343
"sigs.k8s.io/cluster-api-provider-azure/azure/services/resourceskus"
4444
"sigs.k8s.io/cluster-api-provider-azure/azure/services/roleassignments"
4545
"sigs.k8s.io/cluster-api-provider-azure/azure/services/virtualmachineimages"
46-
"sigs.k8s.io/cluster-api-provider-azure/azure/services/virtualmachineimages/mock_virtualmachineimages"
4746
"sigs.k8s.io/cluster-api-provider-azure/azure/services/vmextensions"
4847
)
4948

@@ -1538,7 +1537,7 @@ func TestMachineScope_GetVMImage(t *testing.T) {
15381537
clusterMock.EXPECT().SubscriptionID().AnyTimes()
15391538
clusterMock.EXPECT().CloudEnvironment().AnyTimes()
15401539
clusterMock.EXPECT().Token().Return(&azidentity.DefaultAzureCredential{}).AnyTimes()
1541-
svc := virtualmachineimages.Service{Client: mock_virtualmachineimages.NewMockClient(mockCtrl)}
1540+
svc := virtualmachineimages.Service{}
15421541

15431542
tests := []struct {
15441543
name string

azure/services/virtualmachineimages/cache.go

Lines changed: 0 additions & 132 deletions
This file was deleted.

azure/services/virtualmachineimages/cache_test.go

Lines changed: 0 additions & 76 deletions
This file was deleted.

azure/services/virtualmachineimages/client.go

Lines changed: 0 additions & 70 deletions
This file was deleted.

azure/services/virtualmachineimages/images.go

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,25 @@ import (
2727
"sigs.k8s.io/cluster-api-provider-azure/util/tele"
2828
)
2929

30+
/* Reference images live in an Azure community gallery with this structure:
31+
. Gallery: "capzed-489de9a5-a0a0-4e79-a806-ad5479ec43a5"
32+
├── Image Definition: "capi-ubun2-2404"
33+
│ ├── Version: "1.30.4"
34+
│ ├── Version: "1.30.5"
35+
│ └── Version: "1.31.1"
36+
└── Image Definition: "capi-win-2022-containerd"
37+
├── Version: "1.30.4"
38+
├── Version: "1.30.5"
39+
└── Version: "1.31.1"
40+
*/
41+
3042
// Service provides operations on Azure VM Images.
3143
type Service struct {
32-
Client
33-
azure.Authorizer
3444
}
3545

3646
// New creates a VM Images service.
37-
func New(auth azure.Authorizer) (*Service, error) {
38-
client, err := NewClient(auth)
39-
if err != nil {
40-
return nil, err
41-
}
42-
return &Service{
43-
Client: client,
44-
Authorizer: auth,
45-
}, nil
47+
func New(_ azure.Authorizer) (*Service, error) {
48+
return &Service{}, nil
4649
}
4750

4851
// GetDefaultLinuxImage returns the default image spec for Ubuntu.

0 commit comments

Comments
 (0)