Skip to content

Commit 95516f3

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #17602 from ameukam/golangci-lint-fix-gocritic-issues
Golangci-lint v2 fixes: gocritic
2 parents e5b8f24 + 0c743d1 commit 95516f3

File tree

35 files changed

+138
-154
lines changed

35 files changed

+138
-154
lines changed

‎cloudmock/aws/mockec2/dhcpoptions.go‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,11 @@ func (m *MockEC2) DescribeDhcpOptions(ctx context.Context, request *ec2.Describe
4545
for id, dhcpOptions := range m.DhcpOptions {
4646
allFiltersMatch := true
4747
for _, filter := range request.Filters {
48-
match := false
49-
switch *filter.Name {
50-
// case "vpc-id":
51-
// if *subnet.main.VpcId == *filter.Values[0] {
52-
// match = true
53-
// }
54-
default:
55-
if strings.HasPrefix(*filter.Name, "tag:") {
56-
match = m.hasTag(ec2types.ResourceTypeDhcpOptions, *dhcpOptions.DhcpOptionsId, filter)
57-
} else {
58-
return nil, fmt.Errorf("unknown filter name: %q", *filter.Name)
59-
}
48+
var match bool
49+
if strings.HasPrefix(*filter.Name, "tag:") {
50+
match = m.hasTag(ec2types.ResourceTypeDhcpOptions, *dhcpOptions.DhcpOptionsId, filter)
51+
} else {
52+
return nil, fmt.Errorf("unknown filter name: %q", *filter.Name)
6053
}
6154

6255
if !match {

‎cloudmock/aws/mockec2/tags.go‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,31 +43,32 @@ func (m *MockEC2) CreateTags(ctx context.Context, request *ec2.CreateTagsInput,
4343

4444
func (m *MockEC2) addTags(resourceId string, tags ...ec2types.Tag) {
4545
var resourceType ec2types.ResourceType
46-
if strings.HasPrefix(resourceId, "subnet-") {
46+
switch {
47+
case strings.HasPrefix(resourceId, "subnet-"):
4748
resourceType = ec2types.ResourceTypeSubnet
48-
} else if strings.HasPrefix(resourceId, "vpc-") {
49+
case strings.HasPrefix(resourceId, "vpc-"):
4950
resourceType = ec2types.ResourceTypeVpc
50-
} else if strings.HasPrefix(resourceId, "sg-") {
51+
case strings.HasPrefix(resourceId, "sg-"):
5152
resourceType = ec2types.ResourceTypeSecurityGroup
52-
} else if strings.HasPrefix(resourceId, "vol-") {
53+
case strings.HasPrefix(resourceId, "vol-"):
5354
resourceType = ec2types.ResourceTypeVolume
54-
} else if strings.HasPrefix(resourceId, "igw-") {
55+
case strings.HasPrefix(resourceId, "igw-"):
5556
resourceType = ec2types.ResourceTypeInternetGateway
56-
} else if strings.HasPrefix(resourceId, "eigw-") {
57+
case strings.HasPrefix(resourceId, "eigw-"):
5758
resourceType = ec2types.ResourceTypeEgressOnlyInternetGateway
58-
} else if strings.HasPrefix(resourceId, "nat-") {
59+
case strings.HasPrefix(resourceId, "nat-"):
5960
resourceType = ec2types.ResourceTypeNatgateway
60-
} else if strings.HasPrefix(resourceId, "dopt-") {
61+
case strings.HasPrefix(resourceId, "dopt-"):
6162
resourceType = ec2types.ResourceTypeDhcpOptions
62-
} else if strings.HasPrefix(resourceId, "rtb-") {
63+
case strings.HasPrefix(resourceId, "rtb-"):
6364
resourceType = ec2types.ResourceTypeRouteTable
64-
} else if strings.HasPrefix(resourceId, "eipalloc-") {
65+
case strings.HasPrefix(resourceId, "eipalloc-"):
6566
resourceType = ec2types.ResourceTypeElasticIp
66-
} else if strings.HasPrefix(resourceId, "lt-") {
67+
case strings.HasPrefix(resourceId, "lt-"):
6768
resourceType = ec2types.ResourceTypeLaunchTemplate
68-
} else if strings.HasPrefix(resourceId, "key-") {
69+
case strings.HasPrefix(resourceId, "key-"):
6970
resourceType = ec2types.ResourceTypeKeyPair
70-
} else {
71+
default:
7172
klog.Fatalf("Unknown resource-type in create tags: %v", resourceId)
7273
}
7374
for _, tag := range tags {
@@ -83,7 +84,8 @@ func (m *MockEC2) addTags(resourceId string, tags ...ec2types.Tag) {
8384

8485
func (m *MockEC2) hasTag(resourceType ec2types.ResourceType, resourceId string, filter ec2types.Filter) bool {
8586
name := *filter.Name
86-
if strings.HasPrefix(name, "tag:") {
87+
switch {
88+
case strings.HasPrefix(name, "tag:"):
8789
tagKey := name[4:]
8890

8991
for _, tag := range m.Tags {
@@ -103,7 +105,7 @@ func (m *MockEC2) hasTag(resourceType ec2types.ResourceType, resourceId string,
103105
}
104106
}
105107
}
106-
} else if name == "tag-key" {
108+
case name == "tag-key":
107109
for _, tag := range m.Tags {
108110
if *tag.ResourceId != resourceId {
109111
continue
@@ -117,7 +119,7 @@ func (m *MockEC2) hasTag(resourceType ec2types.ResourceType, resourceId string,
117119
}
118120
}
119121
}
120-
} else {
122+
default:
121123
klog.Fatalf("Unsupported filter: %v", filter)
122124
}
123125
return false

‎cloudmock/aws/mockec2/volumes.go‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,11 @@ func (m *MockEC2) DescribeVolumes(ctx context.Context, request *ec2.DescribeVolu
9191
for _, volume := range m.Volumes {
9292
allFiltersMatch := true
9393
for _, filter := range request.Filters {
94-
match := false
95-
switch *filter.Name {
96-
default:
97-
if strings.HasPrefix(*filter.Name, "tag:") {
98-
match = m.hasTag(ec2types.ResourceTypeVolume, *volume.VolumeId, filter)
99-
} else {
100-
return nil, fmt.Errorf("unknown filter name: %q", *filter.Name)
101-
}
94+
var match bool
95+
if strings.HasPrefix(*filter.Name, "tag:") {
96+
match = m.hasTag(ec2types.ResourceTypeVolume, *volume.VolumeId, filter)
97+
} else {
98+
return nil, fmt.Errorf("unknown filter name: %q", *filter.Name)
10299
}
103100

104101
if !match {

‎cloudmock/aws/mockelbv2/tags.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ func (m *MockELBV2) AddTags(ctx context.Context, request *elbv2.AddTagsInput, op
4646
}
4747
if !found {
4848
tags := m.Tags[arn]
49-
tags.Tags = append(m.Tags[arn].Tags, reqTag)
49+
tags.Tags = append(tags.Tags, reqTag)
50+
m.Tags[arn] = tags
5051
}
5152
}
5253
} else {

‎cloudmock/aws/mockelbv2/targetgroups.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,24 +42,24 @@ func (m *MockELBV2) DescribeTargetGroups(ctx context.Context, request *elbv2.Des
4242
var tgs []elbv2types.TargetGroup
4343
for _, tg := range m.TargetGroups {
4444
match := false
45-
46-
if len(request.TargetGroupArns) > 0 {
45+
switch {
46+
case len(request.TargetGroupArns) > 0:
4747
for _, name := range request.TargetGroupArns {
4848
if aws.ToString(tg.description.TargetGroupArn) == name {
4949
match = true
5050
}
5151
}
52-
} else if request.LoadBalancerArn != nil {
52+
case request.LoadBalancerArn != nil:
5353
if len(tg.description.LoadBalancerArns) > 0 && tg.description.LoadBalancerArns[0] == aws.ToString(request.LoadBalancerArn) {
5454
match = true
5555
}
56-
} else if len(request.Names) > 0 {
56+
case len(request.Names) > 0:
5757
for _, name := range request.Names {
5858
if aws.ToString(tg.description.TargetGroupName) == name {
5959
match = true
6060
}
6161
}
62-
} else {
62+
default:
6363
match = true
6464
}
6565

‎cloudmock/openstack/mockcompute/instanceactions.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ type instanceActionsResponse struct {
2626
}
2727

2828
func (m *MockClient) mockInstanceActions() {
29-
//re := regexp.MustCompile(`/servers/(.*?)/os-instance-actions/?`)
29+
// re := regexp.MustCompile(`/servers/(.*?)/os-instance-actions/?`)
3030

3131
handler := func(w http.ResponseWriter, r *http.Request) {
3232
m.mutex.Lock()

‎cloudmock/openstack/mockdns/zones.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,17 @@ func (m *MockClient) mockZones() {
5858
zoneName = r.Form.Get("name")
5959
switch r.Method {
6060
case http.MethodGet:
61-
if zoneID == "" && zoneName == "" {
61+
switch {
62+
case zoneID == "" && zoneName == "":
6263
// /zones
6364
m.listZones(w)
64-
} else if len(parts) == 3 && parts[2] == "recordsets" {
65+
case len(parts) == 3 && parts[2] == "recordsets":
6566
// /zones/<zoneid>/recordsets
6667
m.listRecordSets(w, zoneID)
67-
} else if len(parts) == 4 && parts[2] == "recordsets" {
68+
case len(parts) == 4 && parts[2] == "recordsets":
6869
// /zones/<zoneid>/recordsets/<recordsetid>
6970
m.getRecordSet(w, zoneID, parts[3])
70-
} else {
71+
default:
7172
// /zones?name=<zonename>
7273
m.getZone(w, zoneName)
7374
}

‎cloudmock/scaleway/mockdns/api.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@ func (f *FakeDomainAPI) ListDNSZoneRecords(req *domain.ListDNSZoneRecordsRequest
8080

8181
func (f *FakeDomainAPI) UpdateDNSZoneRecords(req *domain.UpdateDNSZoneRecordsRequest, opts ...scw.RequestOption) (*domain.UpdateDNSZoneRecordsResponse, error) {
8282
for _, change := range req.Changes {
83-
84-
if change.Add != nil {
83+
switch {
84+
case change.Add != nil:
8585
for _, toAdd := range change.Add.Records {
8686
toAdd.ID = uuid.New().String()
8787
f.Records[toAdd.Name] = toAdd
8888
}
8989

90-
} else if change.Set != nil {
90+
case change.Set != nil:
9191
if len(change.Set.Records) != 1 {
9292
fmt.Printf("only 1 record change will be applied from %d changes requested", len(change.Set.Records))
9393
}
@@ -98,7 +98,7 @@ func (f *FakeDomainAPI) UpdateDNSZoneRecords(req *domain.UpdateDNSZoneRecordsReq
9898
toUpsert.ID = *change.Set.ID
9999
f.Records[toUpsert.Name] = toUpsert
100100
}
101-
} else if change.Delete != nil {
101+
case change.Delete != nil:
102102
found := false
103103
for name, record := range f.Records {
104104
if record.ID == *change.Delete.ID {
@@ -111,7 +111,7 @@ func (f *FakeDomainAPI) UpdateDNSZoneRecords(req *domain.UpdateDNSZoneRecordsReq
111111
return nil, fmt.Errorf("could not find record %s to delete", *change.Delete.ID)
112112
}
113113

114-
} else {
114+
default:
115115
return nil, fmt.Errorf("mock DNS not implemented for this method")
116116
}
117117
}

‎cmd/kops-controller/controllers/hosts_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func (r *HostsReconciler) updateHosts(ctx context.Context, endpointsList *corev1
114114
}
115115
suffix := ".internal." + r.clusterName
116116
if !strings.HasSuffix(hostname, suffix) {
117-
hostname = hostname + suffix
117+
hostname += suffix
118118
} else {
119119
klog.Warningf("endpoints %s/%s found with full internal name for discovery label %q; use short name %q instead", endpoints.Name, endpoints.Namespace, kops.DiscoveryLabelKey, strings.TrimSuffix(hostname, suffix))
120120
}

‎dnsprovider/pkg/dnsprovider/providers/aws/route53/stubs/route53api.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func NewRoute53APIStub() *Route53APIStub {
5656

5757
func (r *Route53APIStub) ListResourceRecordSets(ctx context.Context, input *route53.ListResourceRecordSetsInput, optFns ...func(*route53.Options)) (*route53.ListResourceRecordSetsOutput, error) {
5858
output := &route53.ListResourceRecordSetsOutput{} // TODO: Support optional input args.
59-
if len(r.recordSets) <= 0 {
59+
if len(r.recordSets) == 0 {
6060
output.ResourceRecordSets = []route53types.ResourceRecordSet{}
6161
} else if _, ok := r.recordSets[*input.HostedZoneId]; !ok {
6262
output.ResourceRecordSets = []route53types.ResourceRecordSet{}

0 commit comments

Comments
 (0)