From 43bf6bdab66b692148c4eea09b16348bcbfca78d Mon Sep 17 00:00:00 2001 From: tanjunchen <2799194073@qq.com> Date: Mon, 7 Oct 2019 11:59:57 +0800 Subject: [PATCH] fix-up gosimple check error --- cloudmock/aws/mockec2/securitygroups.go | 8 ++------ .../providers/aws/route53/stubs/route53api.go | 4 +--- hack/machine_types/machine_types.go | 4 +--- nodeup/pkg/model/kubelet.go | 4 +--- pkg/model/awsmodel/autoscalinggroup.go | 4 +--- pkg/resources/ali/ali.go | 8 ++------ pkg/resources/aws/aws.go | 12 +++--------- pkg/resources/ops/delete.go | 4 +--- protokube/pkg/protokube/gossipdns.go | 4 +--- upup/pkg/fi/cloudup/gcetasks/instance.go | 4 +--- upup/pkg/fi/cloudup/gcetasks/instancetemplate.go | 4 +--- 11 files changed, 15 insertions(+), 45 deletions(-) diff --git a/cloudmock/aws/mockec2/securitygroups.go b/cloudmock/aws/mockec2/securitygroups.go index af934fd6d5..4fde24acd1 100644 --- a/cloudmock/aws/mockec2/securitygroups.go +++ b/cloudmock/aws/mockec2/securitygroups.go @@ -260,9 +260,7 @@ func (m *MockEC2) AuthorizeSecurityGroupEgress(request *ec2.AuthorizeSecurityGro sg.IpPermissionsEgress = append(sg.IpPermissionsEgress, p) } - for _, p := range request.IpPermissions { - sg.IpPermissionsEgress = append(sg.IpPermissionsEgress, p) - } + sg.IpPermissionsEgress = append(sg.IpPermissionsEgress, request.IpPermissions...) // TODO: We need to fold permissions @@ -318,9 +316,7 @@ func (m *MockEC2) AuthorizeSecurityGroupIngress(request *ec2.AuthorizeSecurityGr sg.IpPermissions = append(sg.IpPermissions, p) } - for _, p := range request.IpPermissions { - sg.IpPermissions = append(sg.IpPermissions, p) - } + sg.IpPermissions = append(sg.IpPermissions, request.IpPermissions...) // TODO: We need to fold permissions diff --git a/dnsprovider/pkg/dnsprovider/providers/aws/route53/stubs/route53api.go b/dnsprovider/pkg/dnsprovider/providers/aws/route53/stubs/route53api.go index d23e1a2c59..de410a9e05 100644 --- a/dnsprovider/pkg/dnsprovider/providers/aws/route53/stubs/route53api.go +++ b/dnsprovider/pkg/dnsprovider/providers/aws/route53/stubs/route53api.go @@ -60,9 +60,7 @@ func (r *Route53APIStub) ListResourceRecordSetsPages(input *route53.ListResource output.ResourceRecordSets = []*route53.ResourceRecordSet{} } else { for _, rrsets := range r.recordSets[*input.HostedZoneId] { - for _, rrset := range rrsets { - output.ResourceRecordSets = append(output.ResourceRecordSets, rrset) - } + output.ResourceRecordSets = append(output.ResourceRecordSets, rrsets...) } } lastPage := true diff --git a/hack/machine_types/machine_types.go b/hack/machine_types/machine_types.go index 776dfbb853..fde4d00cb9 100644 --- a/hack/machine_types/machine_types.go +++ b/hack/machine_types/machine_types.go @@ -144,9 +144,7 @@ func run() error { } } - for _, p := range result.PriceList { - prices = append(prices, p) - } + prices = append(prices, result.PriceList...) if result.NextToken != nil { input.NextToken = result.NextToken diff --git a/nodeup/pkg/model/kubelet.go b/nodeup/pkg/model/kubelet.go index f1fecea263..23a86b5ffe 100644 --- a/nodeup/pkg/model/kubelet.go +++ b/nodeup/pkg/model/kubelet.go @@ -545,9 +545,7 @@ func (b *KubeletBuilder) buildKubeletConfigSpec() (*kops.KubeletConfigSpec, erro // Use --register-with-taints for k8s 1.6 and on if b.Cluster.IsKubernetesGTE("1.6") { - for _, t := range b.InstanceGroup.Spec.Taints { - c.Taints = append(c.Taints, t) - } + c.Taints = append(c.Taints, b.InstanceGroup.Spec.Taints...) if len(c.Taints) == 0 && isMaster { // (Even though the value is empty, we still expect =:) diff --git a/pkg/model/awsmodel/autoscalinggroup.go b/pkg/model/awsmodel/autoscalinggroup.go index e0b433b27c..7ec395b22b 100644 --- a/pkg/model/awsmodel/autoscalinggroup.go +++ b/pkg/model/awsmodel/autoscalinggroup.go @@ -310,9 +310,7 @@ func (b *AutoscalingGroupModelBuilder) buildAutoScalingGroupTask(c *fi.ModelBuil t.Tags = tags processes := []string{} - for _, p := range ig.Spec.SuspendProcesses { - processes = append(processes, p) - } + processes = append(processes, ig.Spec.SuspendProcesses...) t.SuspendProcesses = &processes t.InstanceProtection = ig.Spec.InstanceProtection diff --git a/pkg/resources/ali/ali.go b/pkg/resources/ali/ali.go index 03947eb611..06eecbda81 100644 --- a/pkg/resources/ali/ali.go +++ b/pkg/resources/ali/ali.go @@ -327,9 +327,7 @@ func (d *clusterDiscoveryALI) ListSecurityGroup() ([]*resources.Resource, error) } } - for _, block := range blocked { - groupTracker.Blocked = append(groupTracker.Blocked, block) - } + groupTracker.Blocked = append(groupTracker.Blocked, blocked...) resourceTrackers = append(resourceTrackers, groupTracker) } } @@ -558,9 +556,7 @@ func (d *clusterDiscoveryALI) ListVPC() ([]*resources.Resource, error) { for _, vpc := range vpcs { if name == vpc.VpcName { vpcsToDelete = append(vpcsToDelete, vpc.VpcId) - for _, vswitch := range vpc.VSwitchIds.VSwitchId { - vswitchsToDelete = append(vswitchsToDelete, vswitch) - } + vswitchsToDelete = append(vswitchsToDelete, vpc.VSwitchIds.VSwitchId...) } } } diff --git a/pkg/resources/aws/aws.go b/pkg/resources/aws/aws.go index 7168fd32e6..33673172d6 100644 --- a/pkg/resources/aws/aws.go +++ b/pkg/resources/aws/aws.go @@ -258,9 +258,7 @@ func FindAutoscalingLaunchConfiguration(cloud awsup.AWSCloud, name string) (*aut LaunchConfigurationNames: []*string{&name}, } err := cloud.Autoscaling().DescribeLaunchConfigurationsPages(request, func(p *autoscaling.DescribeLaunchConfigurationsOutput, lastPage bool) bool { - for _, t := range p.LaunchConfigurations { - results = append(results, t) - } + results = append(results, p.LaunchConfigurations...) return true }) if err != nil { @@ -1094,9 +1092,7 @@ func DescribeInternetGateways(cloud fi.Cloud) ([]*ec2.InternetGateway, error) { } var gateways []*ec2.InternetGateway - for _, o := range response.InternetGateways { - gateways = append(gateways, o) - } + gateways = append(gateways, response.InternetGateways...) return gateways, nil } @@ -1116,9 +1112,7 @@ func DescribeInternetGatewaysIgnoreTags(cloud fi.Cloud) ([]*ec2.InternetGateway, var gateways []*ec2.InternetGateway - for _, igw := range response.InternetGateways { - gateways = append(gateways, igw) - } + gateways = append(gateways, response.InternetGateways...) return gateways, nil } diff --git a/pkg/resources/ops/delete.go b/pkg/resources/ops/delete.go index 31b6d03867..e1705dfdc0 100644 --- a/pkg/resources/ops/delete.go +++ b/pkg/resources/ops/delete.go @@ -40,9 +40,7 @@ func DeleteResources(cloud fi.Cloud, resourceMap map[string]*resources.Resource) depMap[block] = append(depMap[block], k) } - for _, blocked := range t.Blocked { - depMap[k] = append(depMap[k], blocked) - } + depMap[k] = append(depMap[k], t.Blocked...) if t.Done { done[k] = t diff --git a/protokube/pkg/protokube/gossipdns.go b/protokube/pkg/protokube/gossipdns.go index 5694d98bfd..fd7798a5fd 100644 --- a/protokube/pkg/protokube/gossipdns.go +++ b/protokube/pkg/protokube/gossipdns.go @@ -33,9 +33,7 @@ func (p *GossipDnsProvider) Replace(fqdn string, values []string) error { Name: fqdn, RrsType: "A", } - for _, value := range values { - record.Rrdatas = append(record.Rrdatas, value) - } + record.Rrdatas = append(record.Rrdatas, values...) return p.DNSView.ApplyChangeset(p.Zone, nil, []*dns.DNSRecord{record}) } diff --git a/upup/pkg/fi/cloudup/gcetasks/instance.go b/upup/pkg/fi/cloudup/gcetasks/instance.go index b5609f6a7e..623db94078 100644 --- a/upup/pkg/fi/cloudup/gcetasks/instance.go +++ b/upup/pkg/fi/cloudup/gcetasks/instance.go @@ -73,9 +73,7 @@ func (e *Instance) Find(c *fi.Context) (*Instance, error) { actual := &Instance{} actual.Name = &r.Name - for _, tag := range r.Tags.Items { - actual.Tags = append(actual.Tags, tag) - } + actual.Tags = append(actual.Tags, r.Tags.Items...) actual.Zone = fi.String(lastComponent(r.Zone)) actual.MachineType = fi.String(lastComponent(r.MachineType)) actual.CanIPForward = &r.CanIpForward diff --git a/upup/pkg/fi/cloudup/gcetasks/instancetemplate.go b/upup/pkg/fi/cloudup/gcetasks/instancetemplate.go index 6e536d47d3..257d347ea4 100644 --- a/upup/pkg/fi/cloudup/gcetasks/instancetemplate.go +++ b/upup/pkg/fi/cloudup/gcetasks/instancetemplate.go @@ -103,9 +103,7 @@ func (e *InstanceTemplate) Find(c *fi.Context) (*InstanceTemplate, error) { p := r.Properties - for _, tag := range p.Tags.Items { - actual.Tags = append(actual.Tags, tag) - } + actual.Tags = append(actual.Tags, p.Tags.Items...) actual.MachineType = fi.String(lastComponent(p.MachineType)) actual.CanIPForward = &p.CanIpForward