Skip to content

Commit d3fefd2

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1985 from sonasingh46/unparam_linter
chore(golangci-lint): add unparam linter
2 parents b680320 + 0d6102a commit d3fefd2

File tree

11 files changed

+67
-67
lines changed

11 files changed

+67
-67
lines changed

‎.golangci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ linters:
3838
- structcheck
3939
- typecheck
4040
- unconvert
41+
- unparam
4142
- unused
4243
- varcheck
4344
- whitespace

‎api/v1beta1/azuremachine_default_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ func TestAzureMachineSpec_SetDefaultSSHPublicKey(t *testing.T) {
3535
}
3636

3737
existingPublicKey := "testpublickey"
38-
publicKeyExistTest := test{machine: createMachineWithSSHPublicKey(t, existingPublicKey)}
39-
publicKeyNotExistTest := test{machine: createMachineWithSSHPublicKey(t, "")}
38+
publicKeyExistTest := test{machine: createMachineWithSSHPublicKey(existingPublicKey)}
39+
publicKeyNotExistTest := test{machine: createMachineWithSSHPublicKey("")}
4040

4141
err := publicKeyExistTest.machine.Spec.SetDefaultSSHPublicKey()
4242
g.Expect(err).To(BeNil())
@@ -250,12 +250,12 @@ func TestAzureMachineSpec_SetDataDisksDefaults(t *testing.T) {
250250
}
251251
}
252252

253-
func createMachineWithSSHPublicKey(t *testing.T, sshPublicKey string) *AzureMachine {
253+
func createMachineWithSSHPublicKey(sshPublicKey string) *AzureMachine {
254254
machine := hardcodedAzureMachineWithSSHKey(sshPublicKey)
255255
return machine
256256
}
257257

258-
func createMachineWithUserAssignedIdentities(t *testing.T, identitiesList []UserAssignedIdentity) *AzureMachine {
258+
func createMachineWithUserAssignedIdentities(identitiesList []UserAssignedIdentity) *AzureMachine {
259259
machine := hardcodedAzureMachineWithSSHKey(generateSSHPublicKey(true))
260260
machine.Spec.Identity = VMIdentityUserAssigned
261261
machine.Spec.UserAssignedIdentities = identitiesList

‎api/v1beta1/azuremachine_webhook_test.go‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -41,67 +41,67 @@ func TestAzureMachine_ValidateCreate(t *testing.T) {
4141
}{
4242
{
4343
name: "azuremachine with marketplace image - full",
44-
machine: createMachineWithtMarketPlaceImage(t, "PUB1234", "OFFER1234", "SKU1234", "1.0.0"),
44+
machine: createMachineWithtMarketPlaceImage("PUB1234", "OFFER1234", "SKU1234", "1.0.0"),
4545
wantErr: false,
4646
},
4747
{
4848
name: "azuremachine with marketplace image - missing publisher",
49-
machine: createMachineWithtMarketPlaceImage(t, "", "OFFER1234", "SKU1234", "1.0.0"),
49+
machine: createMachineWithtMarketPlaceImage("", "OFFER1235", "SKU1235", "2.0.0"),
5050
wantErr: true,
5151
},
5252
{
5353
name: "azuremachine with shared gallery image - full",
54-
machine: createMachineWithSharedImage(t, "SUB123", "RG123", "NAME123", "GALLERY1", "1.0.0"),
54+
machine: createMachineWithSharedImage("SUB123", "RG123", "NAME123", "GALLERY1", "1.0.0"),
5555
wantErr: false,
5656
},
5757
{
5858
name: "azuremachine with marketplace image - missing subscription",
59-
machine: createMachineWithSharedImage(t, "", "RG123", "NAME123", "GALLERY1", "1.0.0"),
59+
machine: createMachineWithSharedImage("", "RG124", "NAME124", "GALLERY1", "2.0.0"),
6060
wantErr: true,
6161
},
6262
{
6363
name: "azuremachine with image by - with id",
64-
machine: createMachineWithImageByID(t, "ID123"),
64+
machine: createMachineWithImageByID("ID123"),
6565
wantErr: false,
6666
},
6767
{
6868
name: "azuremachine with image by - without id",
69-
machine: createMachineWithImageByID(t, ""),
69+
machine: createMachineWithImageByID(""),
7070
wantErr: true,
7171
},
7272
{
7373
name: "azuremachine with valid SSHPublicKey",
74-
machine: createMachineWithSSHPublicKey(t, validSSHPublicKey),
74+
machine: createMachineWithSSHPublicKey(validSSHPublicKey),
7575
wantErr: false,
7676
},
7777
{
7878
name: "azuremachine without SSHPublicKey",
79-
machine: createMachineWithSSHPublicKey(t, ""),
79+
machine: createMachineWithSSHPublicKey(""),
8080
wantErr: true,
8181
},
8282
{
8383
name: "azuremachine with invalid SSHPublicKey",
84-
machine: createMachineWithSSHPublicKey(t, "invalid ssh key"),
84+
machine: createMachineWithSSHPublicKey("invalid ssh key"),
8585
wantErr: true,
8686
},
8787
{
8888
name: "azuremachine with list of user-assigned identities",
89-
machine: createMachineWithUserAssignedIdentities(t, []UserAssignedIdentity{{ProviderID: "azure:///123"}, {ProviderID: "azure:///456"}}),
89+
machine: createMachineWithUserAssignedIdentities([]UserAssignedIdentity{{ProviderID: "azure:///123"}, {ProviderID: "azure:///456"}}),
9090
wantErr: false,
9191
},
9292
{
9393
name: "azuremachine with empty list of user-assigned identities",
94-
machine: createMachineWithUserAssignedIdentities(t, []UserAssignedIdentity{}),
94+
machine: createMachineWithUserAssignedIdentities([]UserAssignedIdentity{}),
9595
wantErr: true,
9696
},
9797
{
9898
name: "azuremachine with valid osDisk cache type",
99-
machine: createMachineWithOsDiskCacheType(t, string(compute.PossibleCachingTypesValues()[1])),
99+
machine: createMachineWithOsDiskCacheType(string(compute.PossibleCachingTypesValues()[1])),
100100
wantErr: false,
101101
},
102102
{
103103
name: "azuremachine with invalid osDisk cache type",
104-
machine: createMachineWithOsDiskCacheType(t, "invalid_cache_type"),
104+
machine: createMachineWithOsDiskCacheType("invalid_cache_type"),
105105
wantErr: true,
106106
},
107107
}
@@ -531,8 +531,8 @@ func TestAzureMachine_Default(t *testing.T) {
531531
}
532532

533533
existingPublicKey := validSSHPublicKey
534-
publicKeyExistTest := test{machine: createMachineWithSSHPublicKey(t, existingPublicKey)}
535-
publicKeyNotExistTest := test{machine: createMachineWithSSHPublicKey(t, "")}
534+
publicKeyExistTest := test{machine: createMachineWithSSHPublicKey(existingPublicKey)}
535+
publicKeyNotExistTest := test{machine: createMachineWithSSHPublicKey("")}
536536

537537
publicKeyExistTest.machine.Default()
538538
g.Expect(publicKeyExistTest.machine.Spec.SSHPublicKey).To(Equal(existingPublicKey))
@@ -551,7 +551,7 @@ func TestAzureMachine_Default(t *testing.T) {
551551
}
552552
}
553553

554-
func createMachineWithSharedImage(t *testing.T, subscriptionID, resourceGroup, name, gallery, version string) *AzureMachine {
554+
func createMachineWithSharedImage(subscriptionID, resourceGroup, name, gallery, version string) *AzureMachine {
555555
image := &Image{
556556
SharedGallery: &AzureSharedGalleryImage{
557557
SubscriptionID: subscriptionID,
@@ -571,7 +571,7 @@ func createMachineWithSharedImage(t *testing.T, subscriptionID, resourceGroup, n
571571
}
572572
}
573573

574-
func createMachineWithtMarketPlaceImage(t *testing.T, publisher, offer, sku, version string) *AzureMachine {
574+
func createMachineWithtMarketPlaceImage(publisher, offer, sku, version string) *AzureMachine {
575575
image := &Image{
576576
Marketplace: &AzureMarketplaceImage{
577577
Publisher: publisher,
@@ -590,7 +590,7 @@ func createMachineWithtMarketPlaceImage(t *testing.T, publisher, offer, sku, ver
590590
}
591591
}
592592

593-
func createMachineWithImageByID(t *testing.T, imageID string) *AzureMachine {
593+
func createMachineWithImageByID(imageID string) *AzureMachine {
594594
image := &Image{
595595
ID: &imageID,
596596
}
@@ -604,7 +604,7 @@ func createMachineWithImageByID(t *testing.T, imageID string) *AzureMachine {
604604
}
605605
}
606606

607-
func createMachineWithOsDiskCacheType(t *testing.T, cacheType string) *AzureMachine {
607+
func createMachineWithOsDiskCacheType(cacheType string) *AzureMachine {
608608
machine := &AzureMachine{
609609
Spec: AzureMachineSpec{
610610
SSHPublicKey: validSSHPublicKey,

‎api/v1beta1/azuremachinetemplate_webhook_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,91 +36,91 @@ func TestAzureMachineTemplate_ValidateCreate(t *testing.T) {
3636
{
3737
name: "azuremachinetemplate with marketplane image - full",
3838
machineTemplate: createAzureMachineTemplateFromMachine(
39-
createMachineWithtMarketPlaceImage(t, "PUB1234", "OFFER1234", "SKU1234", "1.0.0"),
39+
createMachineWithtMarketPlaceImage("PUB1234", "OFFER1234", "SKU1234", "1.0.0"),
4040
),
4141
wantErr: false,
4242
},
4343
{
4444
name: "azuremachinetemplate with marketplace image - missing publisher",
4545
machineTemplate: createAzureMachineTemplateFromMachine(
46-
createMachineWithtMarketPlaceImage(t, "", "OFFER1234", "SKU1234", "1.0.0"),
46+
createMachineWithtMarketPlaceImage("", "OFFER1234", "SKU1234", "1.0.0"),
4747
),
4848
wantErr: true,
4949
},
5050
{
5151
name: "azuremachinetemplate with shared gallery image - full",
5252
machineTemplate: createAzureMachineTemplateFromMachine(
53-
createMachineWithSharedImage(t, "SUB123", "RG123", "NAME123", "GALLERY1", "1.0.0"),
53+
createMachineWithSharedImage("SUB123", "RG123", "NAME123", "GALLERY1", "1.0.0"),
5454
),
5555
wantErr: false,
5656
},
5757
{
5858
name: "azuremachinetemplate with marketplace image - missing subscription",
5959
machineTemplate: createAzureMachineTemplateFromMachine(
60-
createMachineWithSharedImage(t, "", "RG123", "NAME123", "GALLERY1", "1.0.0"),
60+
createMachineWithSharedImage("", "RG123", "NAME123", "GALLERY2", "1.0.0"),
6161
),
6262
wantErr: true,
6363
},
6464
{
6565
name: "azuremachinetemplate with image by - with id",
6666
machineTemplate: createAzureMachineTemplateFromMachine(
67-
createMachineWithImageByID(t, "ID123"),
67+
createMachineWithImageByID("ID123"),
6868
),
6969
wantErr: false,
7070
},
7171
{
7272
name: "azuremachinetemplate with image by - without id",
7373
machineTemplate: createAzureMachineTemplateFromMachine(
74-
createMachineWithImageByID(t, ""),
74+
createMachineWithImageByID(""),
7575
),
7676
wantErr: true,
7777
},
7878
{
7979
name: "azuremachinetemplate with valid SSHPublicKey",
8080
machineTemplate: createAzureMachineTemplateFromMachine(
81-
createMachineWithSSHPublicKey(t, validSSHPublicKey),
81+
createMachineWithSSHPublicKey(validSSHPublicKey),
8282
),
8383
wantErr: false,
8484
},
8585
{
8686
name: "azuremachinetemplate without SSHPublicKey",
8787
machineTemplate: createAzureMachineTemplateFromMachine(
88-
createMachineWithSSHPublicKey(t, ""),
88+
createMachineWithSSHPublicKey(""),
8989
),
9090
wantErr: true,
9191
},
9292
{
9393
name: "azuremachinetemplate with invalid SSHPublicKey",
9494
machineTemplate: createAzureMachineTemplateFromMachine(
95-
createMachineWithSSHPublicKey(t, "invalid ssh key"),
95+
createMachineWithSSHPublicKey("invalid ssh key"),
9696
),
9797
wantErr: true,
9898
},
9999
{
100100
name: "azuremachinetemplate with list of user-assigned identities",
101101
machineTemplate: createAzureMachineTemplateFromMachine(
102-
createMachineWithUserAssignedIdentities(t, []UserAssignedIdentity{{ProviderID: "azure:///123"}, {ProviderID: "azure:///456"}}),
102+
createMachineWithUserAssignedIdentities([]UserAssignedIdentity{{ProviderID: "azure:///123"}, {ProviderID: "azure:///456"}}),
103103
),
104104
wantErr: false,
105105
},
106106
{
107107
name: "azuremachinetemplate with empty list of user-assigned identities",
108108
machineTemplate: createAzureMachineTemplateFromMachine(
109-
createMachineWithUserAssignedIdentities(t, []UserAssignedIdentity{}),
109+
createMachineWithUserAssignedIdentities([]UserAssignedIdentity{}),
110110
),
111111
wantErr: true,
112112
},
113113
{
114114
name: "azuremachinetemplate with valid osDisk cache type",
115115
machineTemplate: createAzureMachineTemplateFromMachine(
116-
createMachineWithOsDiskCacheType(t, string(compute.PossibleCachingTypesValues()[1])),
116+
createMachineWithOsDiskCacheType(string(compute.PossibleCachingTypesValues()[1])),
117117
),
118118
wantErr: false,
119119
},
120120
{
121121
name: "azuremachinetemplate with invalid osDisk cache type",
122122
machineTemplate: createAzureMachineTemplateFromMachine(
123-
createMachineWithOsDiskCacheType(t, "invalid_cache_type"),
123+
createMachineWithOsDiskCacheType("invalid_cache_type"),
124124
),
125125
wantErr: true,
126126
},

‎azure/services/scalesets/scalesets_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ func TestReconcileVMSS(t *testing.T) {
265265
s.ScaleSetSpec().Return(defaultSpec).AnyTimes()
266266
createdVMSS := newDefaultVMSS("VM_SIZE")
267267
instances := newDefaultInstances()
268-
_ = setupDefaultVMSSInProgressOperationDoneExpectations(s, m, createdVMSS, instances)
268+
setupDefaultVMSSInProgressOperationDoneExpectations(s, m, createdVMSS, instances)
269269
s.DeleteLongRunningOperationState(defaultSpec.Name, scope.ScalesetsServiceName)
270270
},
271271
},
@@ -277,7 +277,7 @@ func TestReconcileVMSS(t *testing.T) {
277277
s.ScaleSetSpec().Return(defaultSpec).AnyTimes()
278278
createdVMSS := newDefaultWindowsVMSS()
279279
instances := newDefaultInstances()
280-
_ = setupDefaultVMSSInProgressOperationDoneExpectations(s, m, createdVMSS, instances)
280+
setupDefaultVMSSInProgressOperationDoneExpectations(s, m, createdVMSS, instances)
281281
s.DeleteLongRunningOperationState(defaultSpec.Name, scope.ScalesetsServiceName)
282282
},
283283
},
@@ -1194,7 +1194,7 @@ func newDefaultInstances() []compute.VirtualMachineScaleSetVM {
11941194
}
11951195
}
11961196

1197-
func setupDefaultVMSSInProgressOperationDoneExpectations(s *mock_scalesets.MockScaleSetScopeMockRecorder, m *mock_scalesets.MockClientMockRecorder, createdVMSS compute.VirtualMachineScaleSet, instances []compute.VirtualMachineScaleSetVM) compute.VirtualMachineScaleSet {
1197+
func setupDefaultVMSSInProgressOperationDoneExpectations(s *mock_scalesets.MockScaleSetScopeMockRecorder, m *mock_scalesets.MockClientMockRecorder, createdVMSS compute.VirtualMachineScaleSet, instances []compute.VirtualMachineScaleSetVM) {
11981198
createdVMSS.ID = to.StringPtr("vmss-id")
11991199
createdVMSS.ProvisioningState = to.StringPtr(string(infrav1.Succeeded))
12001200
setupDefaultVMSSExpectations(s)
@@ -1210,7 +1210,6 @@ func setupDefaultVMSSInProgressOperationDoneExpectations(s *mock_scalesets.MockS
12101210
s.MaxSurge().Return(1, nil)
12111211
s.SetVMSSState(gomock.Any())
12121212
s.SetProviderID(azure.ProviderIDPrefix + *createdVMSS.ID)
1213-
return createdVMSS
12141213
}
12151214

12161215
func setupDefaultVMSSStartCreatingExpectations(s *mock_scalesets.MockScaleSetScopeMockRecorder, m *mock_scalesets.MockClientMockRecorder) {

‎controllers/helpers_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ func TestGetCloudProviderConfig(t *testing.T) {
8787

8888
cluster := newCluster("foo")
8989
cluster.Default()
90-
azureCluster := newAzureCluster("foo", "bar")
90+
azureCluster := newAzureCluster("bar")
9191
azureCluster.Default()
92-
azureClusterCustomVnet := newAzureClusterWithCustomVnet("foo", "bar")
92+
azureClusterCustomVnet := newAzureClusterWithCustomVnet("bar")
9393
azureClusterCustomVnet.Default()
9494

9595
cases := map[string]struct {
@@ -255,7 +255,7 @@ func TestReconcileAzureSecret(t *testing.T) {
255255
}
256256

257257
cluster := newCluster("foo")
258-
azureCluster := newAzureCluster("foo", "bar")
258+
azureCluster := newAzureCluster("bar")
259259

260260
cluster.Default()
261261
azureCluster.Default()
@@ -356,7 +356,7 @@ func newCluster(name string) *clusterv1.Cluster {
356356
}
357357
}
358358

359-
func newAzureCluster(name, location string) *infrav1.AzureCluster {
359+
func newAzureCluster(location string) *infrav1.AzureCluster {
360360
return &infrav1.AzureCluster{
361361
ObjectMeta: metav1.ObjectMeta{
362362
Name: "foo",
@@ -407,7 +407,7 @@ func withbackOffConfig(ac infrav1.AzureCluster) *infrav1.AzureCluster {
407407
return &ac
408408
}
409409

410-
func newAzureClusterWithCustomVnet(name, location string) *infrav1.AzureCluster {
410+
func newAzureClusterWithCustomVnet(location string) *infrav1.AzureCluster {
411411
return &infrav1.AzureCluster{
412412
ObjectMeta: metav1.ObjectMeta{
413413
Name: "foo",

‎exp/api/v1beta1/azuremanagedcontrolplane_default_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ func TestAzureManagedControlPlane_SetDefaultSSHPublicKey(t *testing.T) {
3030
}
3131

3232
existingPublicKey := "testpublickey"
33-
publicKeyExistTest := test{r: createAzureManagedControlPlaneWithSSHPublicKey(t, existingPublicKey)}
34-
publicKeyNotExistTest := test{r: createAzureManagedControlPlaneWithSSHPublicKey(t, "")}
33+
publicKeyExistTest := test{r: createAzureManagedControlPlaneWithSSHPublicKey(existingPublicKey)}
34+
publicKeyNotExistTest := test{r: createAzureManagedControlPlaneWithSSHPublicKey("")}
3535

3636
err := publicKeyExistTest.r.setDefaultSSHPublicKey()
3737
g.Expect(err).To(BeNil())
@@ -42,7 +42,7 @@ func TestAzureManagedControlPlane_SetDefaultSSHPublicKey(t *testing.T) {
4242
g.Expect(publicKeyNotExistTest.r.Spec.SSHPublicKey).NotTo(BeEmpty())
4343
}
4444

45-
func createAzureManagedControlPlaneWithSSHPublicKey(t *testing.T, sshPublicKey string) *AzureManagedControlPlane {
45+
func createAzureManagedControlPlaneWithSSHPublicKey(sshPublicKey string) *AzureManagedControlPlane {
4646
return hardcodedAzureManagedControlPlaneWithSSHKey(sshPublicKey)
4747
}
4848

0 commit comments

Comments
 (0)