Skip to content

Commit d22011c

Browse files
jackfrancisjackfrancis
committed
Replace autorest/to with k8s.io/utils/ptr
1 parent 4adcc6f commit d22011c

15 files changed

+155
-158
lines changed

‎cluster-autoscaler/cloudprovider/azure/azure_agent_pool.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2022-08-01/compute"
2828
"github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources"
2929
azStorage "github.com/Azure/azure-sdk-for-go/storage"
30-
"github.com/Azure/go-autorest/autorest/to"
30+
"k8s.io/utils/ptr"
3131

3232
apiv1 "k8s.io/api/core/v1"
3333
utilerrors "k8s.io/apimachinery/pkg/util/errors"
@@ -516,7 +516,7 @@ func (as *AgentPool) deleteBlob(accountName, vhdContainer, vhdBlob string) error
516516
}
517517

518518
keys := *storageKeysResult.Keys
519-
client, err := azStorage.NewBasicClientOnSovereignCloud(accountName, to.String(keys[0].Value), as.manager.env)
519+
client, err := azStorage.NewBasicClientOnSovereignCloud(accountName, ptr.Deref(keys[0].Value, ""), as.manager.env)
520520
if err != nil {
521521
return err
522522
}

‎cluster-autoscaler/cloudprovider/azure/azure_agent_pool_test.go‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525

2626
apiv1 "k8s.io/api/core/v1"
2727
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
28+
"k8s.io/utils/ptr"
2829
"sigs.k8s.io/cloud-provider-azure/pkg/azureclients/storageaccountclient/mockstorageaccountclient"
2930
"sigs.k8s.io/cloud-provider-azure/pkg/azureclients/vmclient/mockvmclient"
3031
providerazureconsts "sigs.k8s.io/cloud-provider-azure/pkg/consts"
@@ -33,7 +34,6 @@ import (
3334
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2022-08-01/compute"
3435
"github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources"
3536
"github.com/Azure/go-autorest/autorest/date"
36-
"github.com/Azure/go-autorest/autorest/to"
3737
"github.com/stretchr/testify/assert"
3838
"go.uber.org/mock/gomock"
3939
)
@@ -62,14 +62,14 @@ func newTestAgentPool(manager *AzureManager, name string) *AgentPool {
6262
func getExpectedVMs() []compute.VirtualMachine {
6363
expectedVMs := []compute.VirtualMachine{
6464
{
65-
Name: to.StringPtr("000-0-00000000-0"),
66-
ID: to.StringPtr("/subscriptions/sub/resourceGroups/rg/providers/provider/0"),
67-
Tags: map[string]*string{"poolName": to.StringPtr("as")},
65+
Name: ptr.To("000-0-00000000-0"),
66+
ID: ptr.To("/subscriptions/sub/resourceGroups/rg/providers/provider/0"),
67+
Tags: map[string]*string{"poolName": ptr.To("as")},
6868
VirtualMachineProperties: &compute.VirtualMachineProperties{
6969
StorageProfile: &compute.StorageProfile{
7070
OsDisk: &compute.OSDisk{
7171
OsType: compute.OperatingSystemTypesLinux,
72-
Vhd: &compute.VirtualHardDisk{URI: to.StringPtr("https://foo.blob/vhds/bar.vhd")},
72+
Vhd: &compute.VirtualHardDisk{URI: ptr.To("https://foo.blob/vhds/bar.vhd")},
7373
},
7474
},
7575
NetworkProfile: &compute.NetworkProfile{
@@ -80,9 +80,9 @@ func getExpectedVMs() []compute.VirtualMachine {
8080
},
8181
},
8282
{
83-
Name: to.StringPtr("00000000001"),
84-
ID: to.StringPtr("/subscriptions/sub/resourceGroups/rg/providers/provider/0"),
85-
Tags: map[string]*string{"poolName": to.StringPtr("as")},
83+
Name: ptr.To("00000000001"),
84+
ID: ptr.To("/subscriptions/sub/resourceGroups/rg/providers/provider/0"),
85+
Tags: map[string]*string{"poolName": ptr.To("as")},
8686
VirtualMachineProperties: &compute.VirtualMachineProperties{
8787
StorageProfile: &compute.StorageProfile{
8888
OsDisk: &compute.OSDisk{OsType: compute.OperatingSystemTypesWindows},
@@ -115,30 +115,30 @@ func TestDeleteOutdatedDeployments(t *testing.T) {
115115
{
116116
deployments: map[string]resources.DeploymentExtended{
117117
"non-cluster-autoscaler-0000": {
118-
Name: to.StringPtr("non-cluster-autoscaler-0000"),
118+
Name: ptr.To("non-cluster-autoscaler-0000"),
119119
Properties: &resources.DeploymentPropertiesExtended{
120-
ProvisioningState: to.StringPtr("Succeeded"),
120+
ProvisioningState: ptr.To("Succeeded"),
121121
Timestamp: &date.Time{Time: timeBenchMark.Add(2 * time.Minute)},
122122
},
123123
},
124124
"cluster-autoscaler-0000": {
125-
Name: to.StringPtr("cluster-autoscaler-0000"),
125+
Name: ptr.To("cluster-autoscaler-0000"),
126126
Properties: &resources.DeploymentPropertiesExtended{
127-
ProvisioningState: to.StringPtr("Succeeded"),
127+
ProvisioningState: ptr.To("Succeeded"),
128128
Timestamp: &date.Time{Time: timeBenchMark},
129129
},
130130
},
131131
"cluster-autoscaler-0001": {
132-
Name: to.StringPtr("cluster-autoscaler-0001"),
132+
Name: ptr.To("cluster-autoscaler-0001"),
133133
Properties: &resources.DeploymentPropertiesExtended{
134-
ProvisioningState: to.StringPtr("Succeeded"),
134+
ProvisioningState: ptr.To("Succeeded"),
135135
Timestamp: &date.Time{Time: timeBenchMark.Add(time.Minute)},
136136
},
137137
},
138138
"cluster-autoscaler-0002": {
139-
Name: to.StringPtr("cluster-autoscaler-0002"),
139+
Name: ptr.To("cluster-autoscaler-0002"),
140140
Properties: &resources.DeploymentPropertiesExtended{
141-
ProvisioningState: to.StringPtr("Succeeded"),
141+
ProvisioningState: ptr.To("Succeeded"),
142142
Timestamp: &date.Time{Time: timeBenchMark.Add(2 * time.Minute)},
143143
},
144144
},
@@ -177,7 +177,7 @@ func TestAgentPoolGetVMsFromCache(t *testing.T) {
177177
testAS := newTestAgentPool(newTestAzureManager(t), "testAS")
178178
expectedVMs := []compute.VirtualMachine{
179179
{
180-
Tags: map[string]*string{"poolName": to.StringPtr("testAS")},
180+
Tags: map[string]*string{"poolName": ptr.To("testAS")},
181181
},
182182
}
183183

@@ -213,7 +213,7 @@ func TestGetVMIndexes(t *testing.T) {
213213
assert.Equal(t, 2, len(sortedIndexes))
214214
assert.Equal(t, 2, len(indexToVM))
215215

216-
expectedVMs[0].ID = to.StringPtr("foo")
216+
expectedVMs[0].ID = ptr.To("foo")
217217
mockVMClient.EXPECT().List(gomock.Any(), as.manager.config.ResourceGroup).Return(expectedVMs, nil)
218218
err = as.manager.forceRefresh()
219219
assert.NoError(t, err)
@@ -223,7 +223,7 @@ func TestGetVMIndexes(t *testing.T) {
223223
assert.Nil(t, sortedIndexes)
224224
assert.Nil(t, indexToVM)
225225

226-
expectedVMs[0].Name = to.StringPtr("foo")
226+
expectedVMs[0].Name = ptr.To("foo")
227227
mockVMClient.EXPECT().List(gomock.Any(), as.manager.config.ResourceGroup).Return(expectedVMs, nil)
228228
err = as.manager.forceRefresh()
229229
sortedIndexes, indexToVM, err = as.GetVMIndexes()
@@ -461,11 +461,11 @@ func TestAgentPoolNodes(t *testing.T) {
461461
as := newTestAgentPool(newTestAzureManager(t), "as")
462462
expectedVMs := []compute.VirtualMachine{
463463
{
464-
Tags: map[string]*string{"poolName": to.StringPtr("as")},
465-
ID: to.StringPtr(""),
464+
Tags: map[string]*string{"poolName": ptr.To("as")},
465+
ID: ptr.To(""),
466466
},
467467
{
468-
Tags: map[string]*string{"poolName": to.StringPtr("as")},
468+
Tags: map[string]*string{"poolName": ptr.To("as")},
469469
ID: &testValidProviderID0,
470470
},
471471
}
@@ -484,8 +484,8 @@ func TestAgentPoolNodes(t *testing.T) {
484484

485485
expectedVMs = []compute.VirtualMachine{
486486
{
487-
Tags: map[string]*string{"poolName": to.StringPtr("as")},
488-
ID: to.StringPtr("foo"),
487+
Tags: map[string]*string{"poolName": ptr.To("as")},
488+
ID: ptr.To("foo"),
489489
},
490490
}
491491
mockVMClient.EXPECT().List(gomock.Any(), as.manager.config.ResourceGroup).Return(expectedVMs, nil)

‎cluster-autoscaler/cloudprovider/azure/azure_cache.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727

2828
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v5"
2929
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2022-08-01/compute"
30-
"github.com/Azure/go-autorest/autorest/to"
3130
"github.com/Azure/skewer"
3231
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
3332
providerazureconsts "sigs.k8s.io/cloud-provider-azure/pkg/consts"
@@ -289,11 +288,9 @@ func (m *azureCache) fetchVirtualMachines() (map[string][]compute.VirtualMachine
289288
if vmPoolName == nil {
290289
vmPoolName = tags[legacyAgentpoolNameTag]
291290
}
292-
if vmPoolName == nil {
293-
continue
291+
if vmPoolName != nil {
292+
instances[*vmPoolName] = append(instances[*vmPoolName], instance)
294293
}
295-
296-
instances[to.String(vmPoolName)] = append(instances[to.String(vmPoolName)], instance)
297294
}
298295
return instances, nil
299296
}

‎cluster-autoscaler/cloudprovider/azure/azure_cache_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323
providerazureconsts "sigs.k8s.io/cloud-provider-azure/pkg/consts"
2424

2525
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v5"
26-
"github.com/Azure/go-autorest/autorest/to"
2726
"github.com/stretchr/testify/assert"
2827
"go.uber.org/mock/gomock"
28+
"k8s.io/utils/ptr"
2929
)
3030

3131
func TestFetchVMsPools(t *testing.T) {
@@ -40,7 +40,7 @@ func TestFetchVMsPools(t *testing.T) {
4040
vmsPool := getTestVMsAgentPool(false)
4141
vmssPoolType := armcontainerservice.AgentPoolTypeVirtualMachineScaleSets
4242
vmssPool := armcontainerservice.AgentPool{
43-
Name: to.StringPtr("vmsspool1"),
43+
Name: ptr.To("vmsspool1"),
4444
Properties: &armcontainerservice.ManagedClusterAgentPoolProfileProperties{
4545
Type: &vmssPoolType,
4646
},
@@ -54,7 +54,7 @@ func TestFetchVMsPools(t *testing.T) {
5454
assert.NoError(t, err)
5555
assert.Equal(t, 1, len(vmsPoolMap))
5656

57-
_, ok := vmsPoolMap[to.String(vmsPool.Name)]
57+
_, ok := vmsPoolMap[ptr.Deref(vmsPool.Name, "")]
5858
assert.True(t, ok)
5959
}
6060

‎cluster-autoscaler/cloudprovider/azure/azure_cloud_provider_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v5"
2424
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2022-08-01/compute"
2525
"github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources"
26-
"github.com/Azure/go-autorest/autorest/to"
2726

2827
apiv1 "k8s.io/api/core/v1"
2928
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
29+
"k8s.io/utils/ptr"
3030

3131
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
3232
"sigs.k8s.io/cloud-provider-azure/pkg/azureclients/vmclient/mockvmclient"
@@ -74,7 +74,7 @@ func newTestAzureManager(t *testing.T) *AzureManager {
7474
deploymentClient: &DeploymentClientMock{
7575
FakeStore: map[string]resources.DeploymentExtended{
7676
"deployment": {
77-
Name: to.StringPtr("deployment"),
77+
Name: ptr.To("deployment"),
7878
Properties: &resources.DeploymentPropertiesExtended{Template: map[string]interface{}{
7979
resourcesFieldName: []interface{}{
8080
map[string]interface{}{
@@ -166,7 +166,7 @@ func TestHasInstance(t *testing.T) {
166166
mockVMSSVMClient.EXPECT().List(gomock.Any(), provider.azureManager.config.ResourceGroup, "test-asg", gomock.Any()).Return(expectedVMSSVMs, nil).AnyTimes()
167167
vmssType := armcontainerservice.AgentPoolTypeVirtualMachineScaleSets
168168
vmssPool := armcontainerservice.AgentPool{
169-
Name: to.StringPtr("test-asg"),
169+
Name: ptr.To("test-asg"),
170170
Properties: &armcontainerservice.ManagedClusterAgentPoolProfileProperties{
171171
Type: &vmssType,
172172
},
@@ -303,7 +303,7 @@ func TestMixedNodeGroups(t *testing.T) {
303303

304304
vmssType := armcontainerservice.AgentPoolTypeVirtualMachineScaleSets
305305
vmssPool := armcontainerservice.AgentPool{
306-
Name: to.StringPtr("test-asg"),
306+
Name: ptr.To("test-asg"),
307307
Properties: &armcontainerservice.ManagedClusterAgentPoolProfileProperties{
308308
Type: &vmssType,
309309
},

‎cluster-autoscaler/cloudprovider/azure/azure_manager_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ import (
3030
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2022-08-01/compute"
3131
"github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources"
3232
"github.com/Azure/go-autorest/autorest/date"
33-
"github.com/Azure/go-autorest/autorest/to"
3433
"github.com/stretchr/testify/assert"
3534
"go.uber.org/mock/gomock"
3635
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
3736
"k8s.io/autoscaler/cluster-autoscaler/config"
37+
"k8s.io/utils/ptr"
3838
azclient "sigs.k8s.io/cloud-provider-azure/pkg/azclient"
3939
azclients "sigs.k8s.io/cloud-provider-azure/pkg/azureclients"
4040
"sigs.k8s.io/cloud-provider-azure/pkg/azureclients/vmssclient/mockvmssclient"
@@ -1069,9 +1069,9 @@ func TestFetchExplicitNodeGroups(t *testing.T) {
10691069
testAS.manager.azClient.deploymentClient = &DeploymentClientMock{
10701070
FakeStore: map[string]resources.DeploymentExtended{
10711071
"cluster-autoscaler-0001": {
1072-
Name: to.StringPtr("cluster-autoscaler-0001"),
1072+
Name: ptr.To("cluster-autoscaler-0001"),
10731073
Properties: &resources.DeploymentPropertiesExtended{
1074-
ProvisioningState: to.StringPtr("Succeeded"),
1074+
ProvisioningState: ptr.To("Succeeded"),
10751075
Timestamp: &date.Time{Time: timeBenchMark.Add(2 * time.Minute)},
10761076
},
10771077
},

‎cluster-autoscaler/cloudprovider/azure/azure_scale_set.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ import (
2929
"k8s.io/autoscaler/cluster-autoscaler/config/dynamic"
3030
klog "k8s.io/klog/v2"
3131
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework"
32+
"k8s.io/utils/ptr"
3233
"sigs.k8s.io/cloud-provider-azure/pkg/retry"
3334

3435
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2022-08-01/compute"
3536
"github.com/Azure/go-autorest/autorest/azure"
36-
"github.com/Azure/go-autorest/autorest/to"
3737
)
3838

3939
var (
@@ -209,7 +209,7 @@ func (scaleSet *ScaleSet) getCurSize() (int64, *GetVMSSFailedError) {
209209
// // If VMSS state is updating, return the currentSize which would've been proactively incremented or decremented by CA
210210
// // unless it's -1. In that case, its better to initialize it.
211211
// if scaleSet.curSize != -1 && set.VirtualMachineScaleSetProperties != nil &&
212-
// strings.EqualFold(to.String(set.VirtualMachineScaleSetProperties.ProvisioningState), string(compute.GalleryProvisioningStateUpdating)) {
212+
// strings.EqualFold(ptr.Deref(set.VirtualMachineScaleSetProperties.ProvisioningState, ""), string(compute.GalleryProvisioningStateUpdating)) {
213213
// klog.V(3).Infof("VMSS %q is in updating state, returning cached size: %d", scaleSet.Name, scaleSet.curSize)
214214
// return scaleSet.curSize, nil
215215
// }
@@ -879,10 +879,10 @@ func (scaleSet *ScaleSet) cseErrors(extensions *[]compute.VirtualMachineExtensio
879879
failed := false
880880
if extensions != nil {
881881
for _, extension := range *extensions {
882-
if strings.EqualFold(to.String(extension.Name), vmssCSEExtensionName) && extension.Statuses != nil {
882+
if strings.EqualFold(ptr.Deref(extension.Name, ""), vmssCSEExtensionName) && extension.Statuses != nil {
883883
for _, status := range *extension.Statuses {
884884
if status.Level == "Error" {
885-
errs = append(errs, to.String(status.Message))
885+
errs = append(errs, ptr.Deref(status.Message, ""))
886886
failed = true
887887
}
888888
}
@@ -898,7 +898,7 @@ func (scaleSet *ScaleSet) getSKU() string {
898898
klog.Errorf("Failed to get information for VMSS (%q): %v", scaleSet.Name, err)
899899
return ""
900900
}
901-
return to.String(vmssInfo.Sku.Name)
901+
return ptr.Deref(vmssInfo.Sku.Name, "")
902902
}
903903

904904
func (scaleSet *ScaleSet) verifyNodeGroup(instance *azureRef, commonNgID string) error {

‎cluster-autoscaler/cloudprovider/azure/azure_scale_set_instance_cache.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323
"time"
2424

2525
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2022-08-01/compute"
26-
"github.com/Azure/go-autorest/autorest/to"
2726

2827
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
2928
"k8s.io/klog/v2"
29+
"k8s.io/utils/ptr"
3030
)
3131

3232
/*
@@ -227,7 +227,7 @@ func (scaleSet *ScaleSet) instanceStatusFromVM(vm *compute.VirtualMachineScaleSe
227227
case string(compute.GalleryProvisioningStateFailed):
228228
status.State = cloudprovider.InstanceRunning
229229

230-
klog.V(3).Infof("VM %s reports failed provisioning state with power state: %s, eligible for fast delete: %s", to.String(vm.ID), powerState, strconv.FormatBool(scaleSet.enableFastDeleteOnFailedProvisioning))
230+
klog.V(3).Infof("VM %s reports failed provisioning state with power state: %s, eligible for fast delete: %s", ptr.Deref(vm.ID, ""), powerState, strconv.FormatBool(scaleSet.enableFastDeleteOnFailedProvisioning))
231231
if scaleSet.enableFastDeleteOnFailedProvisioning {
232232
// Provisioning can fail both during instance creation or after the instance is running.
233233
// Per https://learn.microsoft.com/en-us/azure/virtual-machines/states-billing#provisioning-states,
@@ -253,12 +253,12 @@ func (scaleSet *ScaleSet) instanceStatusFromVM(vm *compute.VirtualMachineScaleSe
253253
// Add vmssCSE Provisioning Failed Message in error info body for vmssCSE Extensions if enableDetailedCSEMessage is true
254254
if scaleSet.enableDetailedCSEMessage && vm.InstanceView != nil {
255255
if err, failed := scaleSet.cseErrors(vm.InstanceView.Extensions); failed {
256-
klog.V(3).Infof("VM %s reports CSE failure: %v, with provisioning state %s, power state %s", to.String(vm.ID), err, to.String(vm.ProvisioningState), powerState)
256+
klog.V(3).Infof("VM %s reports CSE failure: %v, with provisioning state %s, power state %s", ptr.Deref(vm.ID, ""), err, ptr.Deref(vm.ProvisioningState, ""), powerState)
257257
status.State = cloudprovider.InstanceCreating
258258
errorInfo := &cloudprovider.InstanceErrorInfo{
259259
ErrorClass: cloudprovider.OtherErrorClass,
260260
ErrorCode: vmssExtensionProvisioningFailed,
261-
ErrorMessage: fmt.Sprintf("%s: %v", to.String(vm.Name), err),
261+
ErrorMessage: fmt.Sprintf("%s: %v", ptr.Deref(vm.Name, ""), err),
262262
}
263263
status.ErrorInfo = errorInfo
264264
}

0 commit comments

Comments
 (0)