Skip to content

Commit 0f55253

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2231 from chrischdi/pr-golangci-sync-importas
🌱 lint: fix import aliases via importas linter
2 parents 5378cb0 + d38b918 commit 0f55253

File tree

60 files changed

+367
-367
lines changed

Some content is hidden

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

60 files changed

+367
-367
lines changed

‎.golangci.yml

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -85,56 +85,56 @@ linters-settings:
8585
# - wrapperFunc
8686
# - rangeValCopy
8787
# - hugeParam
88-
# importas:
89-
# no-unaliased: true
90-
# alias:
91-
# # Kubernetes
92-
# - pkg: k8s.io/api/core/v1
93-
# alias: corev1
94-
# - pkg: k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
95-
# alias: apiextensionsv1
96-
# - pkg: k8s.io/apimachinery/pkg/apis/meta/v1
97-
# alias: metav1
98-
# - pkg: k8s.io/apimachinery/pkg/api/errors
99-
# alias: apierrors
100-
# - pkg: k8s.io/apimachinery/pkg/util/errors
101-
# alias: kerrors
102-
# - pkg: k8s.io/component-base/logs/api/v1
103-
# alias: logsv1
104-
# # Controller Runtime
105-
# - pkg: sigs.k8s.io/controller-runtime
106-
# alias: ctrl
107-
# # CAPV
108-
# - pkg: sigs.k8s.io/cluster-api-provider-vsphere/apis/v1beta1
109-
# alias: infrav1
110-
# - pkg: sigs.k8s.io/cluster-api-provider-vsphere/apis/v1alpha3
111-
# alias: infrav1alpha3
112-
# - pkg: sigs.k8s.io/cluster-api-provider-vsphere/apis/v1alpha4
113-
# alias: infrav1alpha4
114-
# - pkg: sigs.k8s.io/cluster-api-provider-vsphere/apis/vmware/v1beta1
115-
# alias: vmwarev1
116-
# # VMware Operator
117-
# - pkg: "github.com/vmware-tanzu/vm-operator/api/v1alpha1"
118-
# alias: vmoprv1
119-
# # CABPK
120-
# - pkg: sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1
121-
# alias: bootstrapv1
122-
# # KCP
123-
# - pkg: sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1
124-
# alias: controlplanev1
125-
# # CAPI
126-
# - pkg: sigs.k8s.io/cluster-api/api/v1alpha3
127-
# alias: clusterv1alpha3
128-
# - pkg: sigs.k8s.io/cluster-api/api/v1alpha4
129-
# alias: clusterv1alpha4
130-
# - pkg: sigs.k8s.io/cluster-api/api/v1beta1
131-
# alias: clusterv1
132-
# # CAPI exp
133-
# - pkg: sigs.k8s.io/cluster-api/exp/api/v1beta1
134-
# alias: expv1
135-
# # CAPI exp addons
136-
# - pkg: sigs.k8s.io/cluster-api/exp/addons/api/v1beta1
137-
# alias: addonsv1
88+
importas:
89+
no-unaliased: true
90+
alias:
91+
# Kubernetes
92+
- pkg: k8s.io/api/core/v1
93+
alias: corev1
94+
- pkg: k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
95+
alias: apiextensionsv1
96+
- pkg: k8s.io/apimachinery/pkg/apis/meta/v1
97+
alias: metav1
98+
- pkg: k8s.io/apimachinery/pkg/api/errors
99+
alias: apierrors
100+
- pkg: k8s.io/apimachinery/pkg/util/errors
101+
alias: kerrors
102+
- pkg: k8s.io/component-base/logs/api/v1
103+
alias: logsv1
104+
# Controller Runtime
105+
- pkg: sigs.k8s.io/controller-runtime
106+
alias: ctrl
107+
# CAPV
108+
- pkg: sigs.k8s.io/cluster-api-provider-vsphere/apis/v1beta1
109+
alias: infrav1
110+
- pkg: sigs.k8s.io/cluster-api-provider-vsphere/apis/v1alpha3
111+
alias: infrav1alpha3
112+
- pkg: sigs.k8s.io/cluster-api-provider-vsphere/apis/v1alpha4
113+
alias: infrav1alpha4
114+
- pkg: sigs.k8s.io/cluster-api-provider-vsphere/apis/vmware/v1beta1
115+
alias: vmwarev1
116+
# VMware Operator
117+
- pkg: "github.com/vmware-tanzu/vm-operator/api/v1alpha1"
118+
alias: vmoprv1
119+
# CABPK
120+
- pkg: sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1
121+
alias: bootstrapv1
122+
# KCP
123+
- pkg: sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1
124+
alias: controlplanev1
125+
# CAPI
126+
- pkg: sigs.k8s.io/cluster-api/api/v1alpha3
127+
alias: clusterv1alpha3
128+
- pkg: sigs.k8s.io/cluster-api/api/v1alpha4
129+
alias: clusterv1alpha4
130+
- pkg: sigs.k8s.io/cluster-api/api/v1beta1
131+
alias: clusterv1
132+
# CAPI exp
133+
- pkg: sigs.k8s.io/cluster-api/exp/api/v1beta1
134+
alias: expv1
135+
# CAPI exp addons
136+
- pkg: sigs.k8s.io/cluster-api/exp/addons/api/v1beta1
137+
alias: addonsv1
138138
nolintlint:
139139
allow-unused: false
140140
allow-leading-space: false

‎apis/v1alpha3/vspherecluster_conversion.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ import (
2222
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
2323
"sigs.k8s.io/controller-runtime/pkg/conversion"
2424

25-
infrav1beta1 "sigs.k8s.io/cluster-api-provider-vsphere/apis/v1beta1"
25+
infrav1 "sigs.k8s.io/cluster-api-provider-vsphere/apis/v1beta1"
2626
)
2727

2828
// ConvertTo converts this VSphereCluster to the Hub version (v1beta1).
2929
func (src *VSphereCluster) ConvertTo(dstRaw conversion.Hub) error {
30-
dst := dstRaw.(*infrav1beta1.VSphereCluster)
30+
dst := dstRaw.(*infrav1.VSphereCluster)
3131
if err := Convert_v1alpha3_VSphereCluster_To_v1beta1_VSphereCluster(src, dst, nil); err != nil {
3232
return err
3333
}
3434

3535
// Manually restore data.
36-
restored := &infrav1beta1.VSphereCluster{}
36+
restored := &infrav1.VSphereCluster{}
3737
if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok {
3838
return err
3939
}
@@ -45,7 +45,7 @@ func (src *VSphereCluster) ConvertTo(dstRaw conversion.Hub) error {
4545

4646
// ConvertFrom converts from the Hub version (v1beta1) to this VSphereCluster.
4747
func (dst *VSphereCluster) ConvertFrom(srcRaw conversion.Hub) error {
48-
src := srcRaw.(*infrav1beta1.VSphereCluster)
48+
src := srcRaw.(*infrav1.VSphereCluster)
4949
if err := Convert_v1beta1_VSphereCluster_To_v1alpha3_VSphereCluster(src, dst, nil); err != nil {
5050
return err
5151
}
@@ -59,16 +59,16 @@ func (dst *VSphereCluster) ConvertFrom(srcRaw conversion.Hub) error {
5959

6060
// ConvertTo converts this VSphereClusterList to the Hub version (v1beta1).
6161
func (src *VSphereClusterList) ConvertTo(dstRaw conversion.Hub) error {
62-
dst := dstRaw.(*infrav1beta1.VSphereClusterList)
62+
dst := dstRaw.(*infrav1.VSphereClusterList)
6363
return Convert_v1alpha3_VSphereClusterList_To_v1beta1_VSphereClusterList(src, dst, nil)
6464
}
6565

6666
// ConvertFrom converts this VSphereVM to the Hub version (v1beta1).
6767
func (dst *VSphereClusterList) ConvertFrom(srcRaw conversion.Hub) error {
68-
src := srcRaw.(*infrav1beta1.VSphereClusterList)
68+
src := srcRaw.(*infrav1.VSphereClusterList)
6969
return Convert_v1beta1_VSphereClusterList_To_v1alpha3_VSphereClusterList(src, dst, nil)
7070
}
7171

72-
func Convert_v1alpha3_VSphereClusterSpec_To_v1beta1_VSphereClusterSpec(in *VSphereClusterSpec, out *infrav1beta1.VSphereClusterSpec, s apiconversion.Scope) error {
72+
func Convert_v1alpha3_VSphereClusterSpec_To_v1beta1_VSphereClusterSpec(in *VSphereClusterSpec, out *infrav1.VSphereClusterSpec, s apiconversion.Scope) error {
7373
return autoConvert_v1alpha3_VSphereClusterSpec_To_v1beta1_VSphereClusterSpec(in, out, s)
7474
}

‎apis/v1alpha3/vsphereclusteridentity_conversion.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ package v1alpha3
1919
import (
2020
"sigs.k8s.io/controller-runtime/pkg/conversion"
2121

22-
infrav1beta1 "sigs.k8s.io/cluster-api-provider-vsphere/apis/v1beta1"
22+
infrav1 "sigs.k8s.io/cluster-api-provider-vsphere/apis/v1beta1"
2323
)
2424

2525
// ConvertTo converts this VSphereClusterIdentity to the Hub version (v1beta1).
2626
func (src *VSphereClusterIdentity) ConvertTo(dstRaw conversion.Hub) error {
27-
dst := dstRaw.(*infrav1beta1.VSphereClusterIdentity)
27+
dst := dstRaw.(*infrav1.VSphereClusterIdentity)
2828
if err := Convert_v1alpha3_VSphereClusterIdentity_To_v1beta1_VSphereClusterIdentity(src, dst, nil); err != nil {
2929
return err
3030
}
@@ -33,7 +33,7 @@ func (src *VSphereClusterIdentity) ConvertTo(dstRaw conversion.Hub) error {
3333

3434
// ConvertFrom converts from the Hub version (v1beta1) to this VSphereClusterIdentity.
3535
func (dst *VSphereClusterIdentity) ConvertFrom(srcRaw conversion.Hub) error { // nolint
36-
src := srcRaw.(*infrav1beta1.VSphereClusterIdentity)
36+
src := srcRaw.(*infrav1.VSphereClusterIdentity)
3737
if err := Convert_v1beta1_VSphereClusterIdentity_To_v1alpha3_VSphereClusterIdentity(src, dst, nil); err != nil {
3838
return err
3939
}
@@ -42,12 +42,12 @@ func (dst *VSphereClusterIdentity) ConvertFrom(srcRaw conversion.Hub) error { //
4242

4343
// ConvertTo converts this VSphereClusterIdentityList to the Hub version (v1beta1).
4444
func (src *VSphereClusterIdentityList) ConvertTo(dstRaw conversion.Hub) error {
45-
dst := dstRaw.(*infrav1beta1.VSphereClusterIdentityList)
45+
dst := dstRaw.(*infrav1.VSphereClusterIdentityList)
4646
return Convert_v1alpha3_VSphereClusterIdentityList_To_v1beta1_VSphereClusterIdentityList(src, dst, nil)
4747
}
4848

4949
// ConvertFrom converts from the Hub version (v1beta1) to this VSphereClusterIdentityList.
5050
func (dst *VSphereClusterIdentityList) ConvertFrom(srcRaw conversion.Hub) error { // nolint
51-
src := srcRaw.(*infrav1beta1.VSphereClusterIdentityList)
51+
src := srcRaw.(*infrav1.VSphereClusterIdentityList)
5252
return Convert_v1beta1_VSphereClusterIdentityList_To_v1alpha3_VSphereClusterIdentityList(src, dst, nil)
5353
}

‎apis/v1alpha3/vspheredeploymentzone_conversion.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,29 @@ package v1alpha3
1919
import (
2020
"sigs.k8s.io/controller-runtime/pkg/conversion"
2121

22-
infrav1beta1 "sigs.k8s.io/cluster-api-provider-vsphere/apis/v1beta1"
22+
infrav1 "sigs.k8s.io/cluster-api-provider-vsphere/apis/v1beta1"
2323
)
2424

2525
// ConvertTo converts this VSphereDeploymentZone to the Hub version (v1beta1).
2626
func (src *VSphereDeploymentZone) ConvertTo(dstRaw conversion.Hub) error {
27-
dst := dstRaw.(*infrav1beta1.VSphereDeploymentZone)
27+
dst := dstRaw.(*infrav1.VSphereDeploymentZone)
2828
return Convert_v1alpha3_VSphereDeploymentZone_To_v1beta1_VSphereDeploymentZone(src, dst, nil)
2929
}
3030

3131
// ConvertFrom converts from the Hub version (v1beta1) to this VSphereDeploymentZone.
3232
func (dst *VSphereDeploymentZone) ConvertFrom(srcRaw conversion.Hub) error { // nolint
33-
src := srcRaw.(*infrav1beta1.VSphereDeploymentZone)
33+
src := srcRaw.(*infrav1.VSphereDeploymentZone)
3434
return Convert_v1beta1_VSphereDeploymentZone_To_v1alpha3_VSphereDeploymentZone(src, dst, nil)
3535
}
3636

3737
// ConvertTo converts this VSphereDeploymentZoneList to the Hub version (v1beta1).
3838
func (src *VSphereDeploymentZoneList) ConvertTo(dstRaw conversion.Hub) error {
39-
dst := dstRaw.(*infrav1beta1.VSphereDeploymentZoneList)
39+
dst := dstRaw.(*infrav1.VSphereDeploymentZoneList)
4040
return Convert_v1alpha3_VSphereDeploymentZoneList_To_v1beta1_VSphereDeploymentZoneList(src, dst, nil)
4141
}
4242

4343
// ConvertFrom converts this VSphereDeploymentZoneList to the Hub version (v1beta1).
4444
func (dst *VSphereDeploymentZoneList) ConvertFrom(srcRaw conversion.Hub) error { // nolint
45-
src := srcRaw.(*infrav1beta1.VSphereDeploymentZoneList)
45+
src := srcRaw.(*infrav1.VSphereDeploymentZoneList)
4646
return Convert_v1beta1_VSphereDeploymentZoneList_To_v1alpha3_VSphereDeploymentZoneList(src, dst, nil)
4747
}

‎apis/v1alpha3/vspherefailuredomain_conversion.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,29 @@ package v1alpha3
1919
import (
2020
"sigs.k8s.io/controller-runtime/pkg/conversion"
2121

22-
infrav1beta1 "sigs.k8s.io/cluster-api-provider-vsphere/apis/v1beta1"
22+
infrav1 "sigs.k8s.io/cluster-api-provider-vsphere/apis/v1beta1"
2323
)
2424

2525
// ConvertTo converts this VSphereFailureDomain to the Hub version (v1beta1).
2626
func (src *VSphereFailureDomain) ConvertTo(dstRaw conversion.Hub) error {
27-
dst := dstRaw.(*infrav1beta1.VSphereFailureDomain)
27+
dst := dstRaw.(*infrav1.VSphereFailureDomain)
2828
return Convert_v1alpha3_VSphereFailureDomain_To_v1beta1_VSphereFailureDomain(src, dst, nil)
2929
}
3030

3131
// ConvertFrom converts from the Hub version (v1beta1) to this VSphereFailureDomain.
3232
func (dst *VSphereFailureDomain) ConvertFrom(srcRaw conversion.Hub) error { // nolint
33-
src := srcRaw.(*infrav1beta1.VSphereFailureDomain)
33+
src := srcRaw.(*infrav1.VSphereFailureDomain)
3434
return Convert_v1beta1_VSphereFailureDomain_To_v1alpha3_VSphereFailureDomain(src, dst, nil)
3535
}
3636

3737
// ConvertTo converts this VSphereFailureDomainList to the Hub version (v1beta1).
3838
func (src *VSphereFailureDomainList) ConvertTo(dstRaw conversion.Hub) error {
39-
dst := dstRaw.(*infrav1beta1.VSphereFailureDomainList)
39+
dst := dstRaw.(*infrav1.VSphereFailureDomainList)
4040
return Convert_v1alpha3_VSphereFailureDomainList_To_v1beta1_VSphereFailureDomainList(src, dst, nil)
4141
}
4242

4343
// ConvertFrom converts this VSphereFailureDomainList to the Hub version (v1beta1).
4444
func (dst *VSphereFailureDomainList) ConvertFrom(srcRaw conversion.Hub) error { // nolint
45-
src := srcRaw.(*infrav1beta1.VSphereFailureDomainList)
45+
src := srcRaw.(*infrav1.VSphereFailureDomainList)
4646
return Convert_v1beta1_VSphereFailureDomainList_To_v1alpha3_VSphereFailureDomainList(src, dst, nil)
4747
}

‎apis/v1alpha3/vspheremachine_conversion.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ import (
2121
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
2222
"sigs.k8s.io/controller-runtime/pkg/conversion"
2323

24-
infrav1beta1 "sigs.k8s.io/cluster-api-provider-vsphere/apis/v1beta1"
24+
infrav1 "sigs.k8s.io/cluster-api-provider-vsphere/apis/v1beta1"
2525
)
2626

2727
// ConvertTo converts this VSphereMachine to the Hub version (v1beta1).
2828
func (src *VSphereMachine) ConvertTo(dstRaw conversion.Hub) error {
29-
dst := dstRaw.(*infrav1beta1.VSphereMachine)
29+
dst := dstRaw.(*infrav1.VSphereMachine)
3030
if err := Convert_v1alpha3_VSphereMachine_To_v1beta1_VSphereMachine(src, dst, nil); err != nil {
3131
return err
3232
}
3333

3434
// Manually restore data.
35-
restored := &infrav1beta1.VSphereMachine{}
35+
restored := &infrav1.VSphereMachine{}
3636
if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok {
3737
return err
3838
}
@@ -52,7 +52,7 @@ func (src *VSphereMachine) ConvertTo(dstRaw conversion.Hub) error {
5252

5353
// ConvertFrom converts from the Hub version (v1beta1) to this VSphereMachine.
5454
func (dst *VSphereMachine) ConvertFrom(srcRaw conversion.Hub) error {
55-
src := srcRaw.(*infrav1beta1.VSphereMachine)
55+
src := srcRaw.(*infrav1.VSphereMachine)
5656
if err := Convert_v1beta1_VSphereMachine_To_v1alpha3_VSphereMachine(src, dst, nil); err != nil {
5757
return err
5858
}
@@ -67,12 +67,12 @@ func (dst *VSphereMachine) ConvertFrom(srcRaw conversion.Hub) error {
6767

6868
// ConvertTo converts this VSphereMachineList to the Hub version (v1beta1).
6969
func (src *VSphereMachineList) ConvertTo(dstRaw conversion.Hub) error {
70-
dst := dstRaw.(*infrav1beta1.VSphereMachineList)
70+
dst := dstRaw.(*infrav1.VSphereMachineList)
7171
return Convert_v1alpha3_VSphereMachineList_To_v1beta1_VSphereMachineList(src, dst, nil)
7272
}
7373

7474
// ConvertFrom converts from the Hub version (v1beta1) to this VSphereMachineList.
7575
func (dst *VSphereMachineList) ConvertFrom(srcRaw conversion.Hub) error {
76-
src := srcRaw.(*infrav1beta1.VSphereMachineList)
76+
src := srcRaw.(*infrav1.VSphereMachineList)
7777
return Convert_v1beta1_VSphereMachineList_To_v1alpha3_VSphereMachineList(src, dst, nil)
7878
}

‎apis/v1alpha3/vspheremachinetemplate_conversion.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ import (
2424
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
2525
"sigs.k8s.io/controller-runtime/pkg/conversion"
2626

27-
infrav1beta1 "sigs.k8s.io/cluster-api-provider-vsphere/apis/v1beta1"
27+
infrav1 "sigs.k8s.io/cluster-api-provider-vsphere/apis/v1beta1"
2828
)
2929

3030
// ConvertTo.
3131
func (src *VSphereMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
32-
dst := dstRaw.(*infrav1beta1.VSphereMachineTemplate)
32+
dst := dstRaw.(*infrav1.VSphereMachineTemplate)
3333
if err := Convert_v1alpha3_VSphereMachineTemplate_To_v1beta1_VSphereMachineTemplate(src, dst, nil); err != nil {
3434
return err
3535
}
3636

3737
// Manually restore data.
38-
restored := &infrav1beta1.VSphereMachineTemplate{}
38+
restored := &infrav1.VSphereMachineTemplate{}
3939
if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok {
4040
return err
4141
}
@@ -53,7 +53,7 @@ func (src *VSphereMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
5353
}
5454

5555
func (dst *VSphereMachineTemplate) ConvertFrom(srcRaw conversion.Hub) error {
56-
src := srcRaw.(*infrav1beta1.VSphereMachineTemplate)
56+
src := srcRaw.(*infrav1.VSphereMachineTemplate)
5757
if err := Convert_v1beta1_VSphereMachineTemplate_To_v1alpha3_VSphereMachineTemplate(src, dst, nil); err != nil {
5858
return err
5959
}
@@ -67,12 +67,12 @@ func (dst *VSphereMachineTemplate) ConvertFrom(srcRaw conversion.Hub) error {
6767
}
6868

6969
func (src *VSphereMachineTemplateList) ConvertTo(dstRaw conversion.Hub) error {
70-
dst := dstRaw.(*infrav1beta1.VSphereMachineTemplateList)
70+
dst := dstRaw.(*infrav1.VSphereMachineTemplateList)
7171
return Convert_v1alpha3_VSphereMachineTemplateList_To_v1beta1_VSphereMachineTemplateList(src, dst, nil)
7272
}
7373

7474
func (dst *VSphereMachineTemplateList) ConvertFrom(srcRaw conversion.Hub) error {
75-
src := srcRaw.(*infrav1beta1.VSphereMachineTemplateList)
75+
src := srcRaw.(*infrav1.VSphereMachineTemplateList)
7676
return Convert_v1beta1_VSphereMachineTemplateList_To_v1alpha3_VSphereMachineTemplateList(src, dst, nil)
7777
}
7878

0 commit comments

Comments
 (0)