Skip to content

Commit 8d7b6d6

Browse files
sivcharisivchari
committed
fix lint error
Signed-off-by: sivchari <[email protected]>
1 parent 85c0261 commit 8d7b6d6

File tree

113 files changed

+302
-364
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+302
-364
lines changed

Diff for: ‎bootstrap/kubeadm/internal/cloudinit/controlplane_init.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ type ControlPlaneInput struct {
6060
// NewInitControlPlane returns the user data string to be used on a controlplane instance.
6161
func NewInitControlPlane(input *ControlPlaneInput) ([]byte, error) {
6262
input.Header = cloudConfigHeader
63-
input.WriteFiles = input.Certificates.AsFiles()
63+
input.WriteFiles = input.AsFiles()
6464
input.WriteFiles = append(input.WriteFiles, input.AdditionalFiles...)
6565
input.SentinelFileCommand = sentinelFileCommand
6666
userData, err := generate("InitControlplane", controlPlaneCloudInit, input)

Diff for: ‎bootstrap/kubeadm/internal/cloudinit/controlplane_join.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ type ControlPlaneJoinInput struct {
5858
// NewJoinControlPlane returns the user data string to be used on a new control plane instance.
5959
func NewJoinControlPlane(input *ControlPlaneJoinInput) ([]byte, error) {
6060
// TODO: Consider validating that the correct certificates exist. It is different for external/stacked etcd
61-
input.WriteFiles = input.Certificates.AsFiles()
61+
input.WriteFiles = input.AsFiles()
6262
input.ControlPlane = true
6363
if err := input.prepare(); err != nil {
6464
return nil, err

Diff for: ‎bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -2646,7 +2646,7 @@ func addKubeadmConfigToMachine(config *bootstrapv1.KubeadmConfig, machine *clust
26462646
if machine == nil {
26472647
panic("no machine passed to function")
26482648
}
2649-
config.ObjectMeta.OwnerReferences = []metav1.OwnerReference{
2649+
config.OwnerReferences = []metav1.OwnerReference{
26502650
{
26512651
Kind: "Machine",
26522652
APIVersion: clusterv1.GroupVersion.String(),
@@ -2668,7 +2668,7 @@ func addKubeadmConfigToMachinePool(config *bootstrapv1.KubeadmConfig, machinePoo
26682668
if machinePool == nil {
26692669
panic("no machinePool passed to function")
26702670
}
2671-
config.ObjectMeta.OwnerReferences = []metav1.OwnerReference{
2671+
config.OwnerReferences = []metav1.OwnerReference{
26722672
{
26732673
Kind: "MachinePool",
26742674
APIVersion: expv1.GroupVersion.String(),

Diff for: ‎bootstrap/kubeadm/internal/ignition/ignition.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func NewJoinControlPlane(input *ControlPlaneJoinInput) ([]byte, string, error) {
7979
return nil, "", fmt.Errorf("controlplane join input can't be nil")
8080
}
8181

82-
input.WriteFiles = input.Certificates.AsFiles()
82+
input.WriteFiles = input.AsFiles()
8383
input.WriteFiles = append(input.WriteFiles, input.AdditionalFiles...)
8484
input.KubeadmCommand = fmt.Sprintf(kubeadmCommandTemplate, joinSubcommand, input.KubeadmVerbosity)
8585

@@ -96,7 +96,7 @@ func NewInitControlPlane(input *ControlPlaneInput) ([]byte, string, error) {
9696
return nil, "", fmt.Errorf("controlplane input can't be nil")
9797
}
9898

99-
input.WriteFiles = input.Certificates.AsFiles()
99+
input.WriteFiles = input.AsFiles()
100100
input.WriteFiles = append(input.WriteFiles, input.AdditionalFiles...)
101101
input.KubeadmCommand = fmt.Sprintf(kubeadmCommandTemplate, initSubcommand, input.KubeadmVerbosity)
102102

Diff for: ‎bootstrap/kubeadm/types/upstreamv1beta4/bootstraptokenstring.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func (bts *BootstrapTokenString) UnmarshalJSON(b []byte) error {
5959
}
6060

6161
// Remove unnecessary " characters coming from the JSON parser
62-
token := strings.Replace(string(b), `"`, ``, -1)
62+
token := strings.ReplaceAll(string(b), `"`, ``)
6363
// Convert the string Token to a BootstrapTokenString object
6464
newbts, err := NewBootstrapTokenString(token)
6565
if err != nil {

Diff for: ‎cmd/clusterctl/client/alpha/machinedeployment.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ func findMachineDeploymentRevision(toRevision int64, allMSs []*clusterv1.Machine
9191
)
9292
for _, ms := range allMSs {
9393
if v, err := revision(ms); err == nil {
94-
if toRevision == 0 {
94+
switch toRevision {
95+
case 0:
9596
if latestRevision < v {
9697
// newest one we've seen so far
9798
previousRevision = latestRevision
@@ -103,7 +104,7 @@ func findMachineDeploymentRevision(toRevision int64, allMSs []*clusterv1.Machine
103104
previousRevision = v
104105
previousMachineSet = ms
105106
}
106-
} else if toRevision == v {
107+
case v:
107108
return ms, nil
108109
}
109110
}

Diff for: ‎cmd/clusterctl/client/alpha/rollout_resumer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func resumeMachineDeployment(ctx context.Context, proxy cluster.Proxy, name, nam
7272
// resumeKubeadmControlPlane removes paused annotation.
7373
func resumeKubeadmControlPlane(ctx context.Context, proxy cluster.Proxy, name, namespace string) error {
7474
// In the paused annotation we must replace slashes to ~1, see https://datatracker.ietf.org/doc/html/rfc6901#section-3.
75-
pausedAnnotation := strings.Replace(clusterv1.PausedAnnotation, "/", "~1", -1)
75+
pausedAnnotation := strings.ReplaceAll(clusterv1.PausedAnnotation, "/", "~1")
7676
patch := client.RawPatch(types.JSONPatchType, []byte(fmt.Sprintf("[{\"op\": \"remove\", \"path\": \"/metadata/annotations/%s\"}]", pausedAnnotation)))
7777

7878
return patchKubeadmControlPlane(ctx, proxy, name, namespace, patch)

Diff for: ‎cmd/clusterctl/client/cluster/cert_manager.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ func (cm *certManagerClient) shouldUpgrade(desiredVersion string, objs, installO
347347
// the number of objects when version of objects are equal
348348
relevantObjs := []unstructured.Unstructured{}
349349
for _, o := range objs {
350-
if !(o.GetKind() == "Endpoints" || o.GetKind() == "EndpointSlice") {
350+
if o.GetKind() != "Endpoints" && o.GetKind() != "EndpointSlice" {
351351
relevantObjs = append(relevantObjs, o)
352352
}
353353
}

Diff for: ‎cmd/clusterctl/client/cluster/components_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ func Test_providerComponents_ValidateNoObjectsExist(t *testing.T) {
522522
},
523523
},
524524
}
525-
crd.ObjectMeta.Labels[clusterctlv1.ClusterctlLabel] = ""
525+
crd.Labels[clusterctlv1.ClusterctlLabel] = ""
526526

527527
cr := &unstructured.Unstructured{}
528528
cr.SetAPIVersion("some.group/v1")

Diff for: ‎cmd/clusterctl/client/cluster/mover_test.go

+9-31
Original file line numberDiff line numberDiff line change
@@ -726,8 +726,8 @@ var backupRestoreTests = []struct {
726726
}
727727

728728
func fixFilesGVS(file string) string {
729-
s := strings.Replace(file, "$CAPI", clusterv1.GroupVersion.String(), -1)
730-
return strings.Replace(s, "$INFRA", clusterv1.GroupVersionInfrastructure.String(), -1)
729+
s := strings.ReplaceAll(file, "$CAPI", clusterv1.GroupVersion.String())
730+
return strings.ReplaceAll(s, "$INFRA", clusterv1.GroupVersionInfrastructure.String())
731731
}
732732

733733
func Test_objectMover_backupTargetObject(t *testing.T) {
@@ -752,14 +752,10 @@ func Test_objectMover_backupTargetObject(t *testing.T) {
752752
fromProxy: graph.proxy,
753753
}
754754

755-
dir, err := os.MkdirTemp("/tmp", "cluster-api")
756-
if err != nil {
757-
t.Error(err)
758-
}
759-
defer os.RemoveAll(dir)
755+
dir := t.TempDir()
760756

761757
for _, node := range graph.uidToNode {
762-
err = mover.backupTargetObject(ctx, node, dir)
758+
err := mover.backupTargetObject(ctx, node, dir)
763759
if tt.wantErr {
764760
g.Expect(err).To(HaveOccurred())
765761
return
@@ -823,12 +819,7 @@ func Test_objectMover_restoreTargetObject(t *testing.T) {
823819

824820
ctx := context.Background()
825821

826-
// temporary directory
827-
dir, err := os.MkdirTemp("/tmp", "cluster-api")
828-
if err != nil {
829-
g.Expect(err).ToNot(HaveOccurred())
830-
}
831-
defer os.RemoveAll(dir)
822+
dir := t.TempDir()
832823

833824
// Create an objectGraph bound a source cluster with all the CRDs for the types involved in the test.
834825
graph := getObjectGraph()
@@ -952,13 +943,9 @@ func Test_objectMover_toDirectory(t *testing.T) {
952943
fromProxy: graph.proxy,
953944
}
954945

955-
dir, err := os.MkdirTemp("/tmp", "cluster-api")
956-
if err != nil {
957-
t.Error(err)
958-
}
959-
defer os.RemoveAll(dir)
946+
dir := t.TempDir()
960947

961-
err = mover.toDirectory(ctx, graph, dir)
948+
err := mover.toDirectory(ctx, graph, dir)
962949
if tt.wantErr {
963950
g.Expect(err).To(HaveOccurred())
964951
return
@@ -1013,11 +1000,7 @@ func Test_objectMover_filesToObjs(t *testing.T) {
10131000
t.Run(tt.name, func(t *testing.T) {
10141001
g := NewWithT(t)
10151002

1016-
dir, err := os.MkdirTemp("/tmp", "cluster-api")
1017-
if err != nil {
1018-
t.Error(err)
1019-
}
1020-
defer os.RemoveAll(dir)
1003+
dir := t.TempDir()
10211004

10221005
for _, fileName := range tt.files {
10231006
path := filepath.Join(dir, fileName)
@@ -1074,12 +1057,7 @@ func Test_objectMover_fromDirectory(t *testing.T) {
10741057

10751058
ctx := context.Background()
10761059

1077-
// temporary directory
1078-
dir, err := os.MkdirTemp("/tmp", "cluster-api")
1079-
if err != nil {
1080-
g.Expect(err).ToNot(HaveOccurred())
1081-
}
1082-
defer os.RemoveAll(dir)
1060+
dir := t.TempDir()
10831061

10841062
// Create an objectGraph bound a source cluster with all the CRDs for the types involved in the test.
10851063
graph := getObjectGraph()

Diff for: ‎cmd/clusterctl/client/cluster/proxy_test.go

+5-15
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,7 @@ func TestProxyGetConfig(t *testing.T) {
6464
for _, tt := range tests {
6565
t.Run(tt.name, func(t *testing.T) {
6666
g := NewWithT(t)
67-
dir, err := os.MkdirTemp("", "clusterctl")
68-
g.Expect(err).ToNot(HaveOccurred())
69-
defer os.RemoveAll(dir)
67+
dir := t.TempDir()
7068
configFile := filepath.Join(dir, ".test-kubeconfig.yaml")
7169
g.Expect(os.WriteFile(configFile, []byte(tt.kubeconfigContents), 0600)).To(Succeed())
7270

@@ -119,9 +117,7 @@ func TestProxyGetConfig(t *testing.T) {
119117
for _, tt := range tests {
120118
t.Run(tt.name, func(t *testing.T) {
121119
g := NewWithT(t)
122-
dir, err := os.MkdirTemp("", "clusterctl")
123-
g.Expect(err).ToNot(HaveOccurred())
124-
defer os.RemoveAll(dir)
120+
dir := t.TempDir()
125121
configFile := filepath.Join(dir, ".test-kubeconfig.yaml")
126122
g.Expect(os.WriteFile(configFile, []byte(kubeconfig("management", "default")), 0600)).To(Succeed())
127123

@@ -147,9 +143,7 @@ func TestKUBECONFIGEnvVar(t *testing.T) {
147143
)
148144

149145
g := NewWithT(t)
150-
dir, err := os.MkdirTemp("", "clusterctl")
151-
g.Expect(err).ToNot(HaveOccurred())
152-
defer os.RemoveAll(dir)
146+
dir := t.TempDir()
153147
configFile := filepath.Join(dir, ".test-kubeconfig.yaml")
154148
g.Expect(os.WriteFile(configFile, []byte(kubeconfigContents), 0600)).To(Succeed())
155149

@@ -175,9 +169,7 @@ func TestKUBECONFIGEnvVar(t *testing.T) {
175169
expectedHost = "https://kind-server:38790"
176170
)
177171
g := NewWithT(t)
178-
dir, err := os.MkdirTemp("", "clusterctl")
179-
g.Expect(err).ToNot(HaveOccurred())
180-
defer os.RemoveAll(dir)
172+
dir := t.TempDir()
181173
configFile := filepath.Join(dir, ".test-kubeconfig.yaml")
182174
g.Expect(os.WriteFile(configFile, []byte(kubeconfigContents), 0600)).To(Succeed())
183175

@@ -252,9 +244,7 @@ func TestProxyCurrentNamespace(t *testing.T) {
252244
if tt.kubeconfigPath != "" {
253245
configFile = tt.kubeconfigPath
254246
} else {
255-
dir, err := os.MkdirTemp("", "clusterctl")
256-
g.Expect(err).ToNot(HaveOccurred())
257-
defer os.RemoveAll(dir)
247+
dir := t.TempDir()
258248
configFile = filepath.Join(dir, ".test-kubeconfig.yaml")
259249
g.Expect(os.WriteFile(configFile, []byte(tt.kubeconfigContents), 0600)).To(Succeed())
260250
}

Diff for: ‎cmd/clusterctl/client/cluster/template_test.go

+2-6
Original file line numberDiff line numberDiff line change
@@ -279,9 +279,7 @@ func Test_templateClient_getRawUrlFileContent(t *testing.T) {
279279
func Test_templateClient_getLocalFileContent(t *testing.T) {
280280
g := NewWithT(t)
281281

282-
tmpDir, err := os.MkdirTemp("", "cc")
283-
g.Expect(err).ToNot(HaveOccurred())
284-
defer os.RemoveAll(tmpDir)
282+
tmpDir := t.TempDir()
285283

286284
path := filepath.Join(tmpDir, "cluster-template.yaml")
287285
g.Expect(os.WriteFile(path, []byte(template), 0600)).To(Succeed())
@@ -333,9 +331,7 @@ func Test_templateClient_getLocalFileContent(t *testing.T) {
333331
func Test_templateClient_GetFromURL(t *testing.T) {
334332
g := NewWithT(t)
335333

336-
tmpDir, err := os.MkdirTemp("", "cc")
337-
g.Expect(err).ToNot(HaveOccurred())
338-
defer os.RemoveAll(tmpDir)
334+
tmpDir := t.TempDir()
339335

340336
configClient, err := config.New(context.Background(), "", config.InjectReader(test.NewFakeReader()))
341337
g.Expect(err).ToNot(HaveOccurred())

Diff for: ‎cmd/clusterctl/client/cluster/upgrader.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -371,9 +371,9 @@ func (u *providerUpgrader) doUpgrade(ctx context.Context, upgradePlan *UpgradePl
371371
// rules for out of tree providers.
372372
minVersionSkew := semver.MustParse("1.10.0")
373373
for _, upgradeItem := range upgradePlan.Providers {
374-
if !(upgradeItem.Type == string(clusterctlv1.CoreProviderType) ||
375-
(upgradeItem.Type == string(clusterctlv1.BootstrapProviderType) && upgradeItem.ProviderName == config.KubeadmBootstrapProviderName) ||
376-
(upgradeItem.Type == string(clusterctlv1.ControlPlaneProviderType) && upgradeItem.ProviderName == config.KubeadmControlPlaneProviderName)) {
374+
if upgradeItem.Type != string(clusterctlv1.CoreProviderType) &&
375+
(upgradeItem.Type != string(clusterctlv1.BootstrapProviderType) || upgradeItem.ProviderName != config.KubeadmBootstrapProviderName) &&
376+
(upgradeItem.Type != string(clusterctlv1.ControlPlaneProviderType) || upgradeItem.ProviderName != config.KubeadmControlPlaneProviderName) {
377377
continue
378378
}
379379

Diff for: ‎cmd/clusterctl/client/config/reader_viper.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ func (v *viperReader) Init(ctx context.Context, path string) error {
9393
return errors.Wrap(err, "failed to url parse the config path")
9494
}
9595

96-
switch {
97-
case url.Scheme == "https" || url.Scheme == "http":
96+
switch url.Scheme {
97+
case "https", "http":
9898
var configDirectory string
9999
if len(v.configPaths) > 0 {
100100
configDirectory = v.configPaths[0]

Diff for: ‎cmd/clusterctl/client/config/reader_viper_test.go

+3-10
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,9 @@ func Test_viperReader_Init(t *testing.T) {
3434

3535
// Change HOME dir and do not specify config file
3636
// (.cluster-api/clusterctl) in it.
37-
clusterctlHomeDir, err := os.MkdirTemp("", "clusterctl-default")
38-
g.Expect(err).ToNot(HaveOccurred())
39-
defer os.RemoveAll(clusterctlHomeDir)
37+
clusterctlHomeDir := t.TempDir()
4038

41-
dir, err := os.MkdirTemp("", "clusterctl")
42-
g.Expect(err).ToNot(HaveOccurred())
43-
defer os.RemoveAll(dir)
39+
dir := t.TempDir()
4440

4541
configFile := filepath.Join(dir, "clusterctl.yaml")
4642
g.Expect(os.WriteFile(configFile, []byte("bar: bar"), 0600)).To(Succeed())
@@ -256,10 +252,7 @@ func Test_viperReader_Set(t *testing.T) {
256252

257253
func Test_viperReader_checkDefaultConfig(t *testing.T) {
258254
g := NewWithT(t)
259-
dir, err := os.MkdirTemp("", "clusterctl")
260-
g.Expect(err).ToNot(HaveOccurred())
261-
defer os.RemoveAll(dir)
262-
dir = strings.TrimSuffix(dir, "/")
255+
dir := strings.TrimSuffix(t.TempDir(), "/")
263256

264257
configFile := filepath.Join(dir, "clusterctl.yaml")
265258
g.Expect(os.WriteFile(configFile, []byte("bar: bar"), 0600)).To(Succeed())

Diff for: ‎cmd/clusterctl/client/config_test.go

+3-11
Original file line numberDiff line numberDiff line change
@@ -524,10 +524,7 @@ func Test_clusterctlClient_GetClusterTemplate(t *testing.T) {
524524

525525
rawTemplate := templateYAML("ns3", "${ CLUSTER_NAME }")
526526

527-
// Template on a file
528-
tmpDir, err := os.MkdirTemp("", "cc")
529-
g.Expect(err).ToNot(HaveOccurred())
530-
defer os.RemoveAll(tmpDir)
527+
tmpDir := t.TempDir()
531528

532529
path := filepath.Join(tmpDir, "cluster-template.yaml")
533530
g.Expect(os.WriteFile(path, rawTemplate, 0600)).To(Succeed())
@@ -744,10 +741,7 @@ func Test_clusterctlClient_GetClusterTemplate_onEmptyCluster(t *testing.T) {
744741

745742
rawTemplate := templateYAML("ns3", "${ CLUSTER_NAME }")
746743

747-
// Template on a file
748-
tmpDir, err := os.MkdirTemp("", "cc")
749-
g.Expect(err).ToNot(HaveOccurred())
750-
defer os.RemoveAll(tmpDir)
744+
tmpDir := t.TempDir()
751745

752746
path := filepath.Join(tmpDir, "cluster-template.yaml")
753747
g.Expect(os.WriteFile(path, rawTemplate, 0600)).To(Succeed())
@@ -1014,9 +1008,7 @@ func Test_clusterctlClient_ProcessYAML(t *testing.T) {
10141008
template := `v1: ${VAR1:=default1}
10151009
v2: ${VAR2=default2}
10161010
v3: ${VAR3:-default3}`
1017-
dir, err := os.MkdirTemp("", "clusterctl")
1018-
g.Expect(err).ToNot(HaveOccurred())
1019-
defer os.RemoveAll(dir)
1011+
dir := t.TempDir()
10201012

10211013
templateFile := filepath.Join(dir, "template.yaml")
10221014
g.Expect(os.WriteFile(templateFile, []byte(template), 0600)).To(Succeed())

Diff for: ‎cmd/clusterctl/client/move_test.go

+2-11
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package client
1818

1919
import (
2020
"context"
21-
"os"
2221
"testing"
2322

2423
. "github.com/onsi/gomega"
@@ -142,11 +141,7 @@ func Test_clusterctlClient_Move(t *testing.T) {
142141
}
143142

144143
func Test_clusterctlClient_ToDirectory(t *testing.T) {
145-
dir, err := os.MkdirTemp("/tmp", "cluster-api")
146-
if err != nil {
147-
t.Error(err)
148-
}
149-
defer os.RemoveAll(dir)
144+
dir := t.TempDir()
150145

151146
type fields struct {
152147
client *fakeClient
@@ -207,11 +202,7 @@ func Test_clusterctlClient_ToDirectory(t *testing.T) {
207202
}
208203

209204
func Test_clusterctlClient_FromDirectory(t *testing.T) {
210-
dir, err := os.MkdirTemp("/tmp", "cluster-api")
211-
if err != nil {
212-
t.Error(err)
213-
}
214-
defer os.RemoveAll(dir)
205+
dir := t.TempDir()
215206

216207
type fields struct {
217208
client *fakeClient

0 commit comments

Comments
 (0)