From 119e36be29963591c2b152a07b52149c82a89dd7 Mon Sep 17 00:00:00 2001 From: tanjunchen <2799194073@qq.com> Date: Fri, 4 Oct 2019 22:19:08 +0800 Subject: [PATCH] simplfy code --- .../providers/openstack/designate/rrchangeset.go | 4 ++-- pkg/resources/aws/aws.go | 4 +--- upup/pkg/fi/cloudup/awstasks/launchtemplate_target_api.go | 8 ++------ upup/pkg/fi/cloudup/awsup/status.go | 4 +--- upup/pkg/fi/executor.go | 4 +--- upup/pkg/fi/nodeup/nodetasks/archive.go | 4 +--- upup/pkg/fi/nodeup/nodetasks/bindmount.go | 4 +--- upup/pkg/fi/nodeup/nodetasks/file.go | 4 +--- upup/pkg/fi/nodeup/nodetasks/mount_disk.go | 5 +---- util/pkg/reflectutils/print.go | 2 +- 10 files changed, 12 insertions(+), 31 deletions(-) diff --git a/dnsprovider/pkg/dnsprovider/providers/openstack/designate/rrchangeset.go b/dnsprovider/pkg/dnsprovider/providers/openstack/designate/rrchangeset.go index 83d40cffa6..96249793c1 100644 --- a/dnsprovider/pkg/dnsprovider/providers/openstack/designate/rrchangeset.go +++ b/dnsprovider/pkg/dnsprovider/providers/openstack/designate/rrchangeset.go @@ -119,11 +119,11 @@ func (c *ResourceRecordChangeset) nameToID(name string) (string, error) { } allPages, err := recordsets.ListByZone(c.zone.zones.iface.sc, c.zone.impl.ID, opts).AllPages() if err != nil { - + return "", err } rrs, err := recordsets.ExtractRecordSets(allPages) if err != nil { - + return "", err } switch len(rrs) { case 0: diff --git a/pkg/resources/aws/aws.go b/pkg/resources/aws/aws.go index 2b81bac65b..7168fd32e6 100644 --- a/pkg/resources/aws/aws.go +++ b/pkg/resources/aws/aws.go @@ -665,9 +665,7 @@ func DescribeVolumes(cloud fi.Cloud) ([]*ec2.Volume, error) { } err := c.EC2().DescribeVolumesPages(request, func(p *ec2.DescribeVolumesOutput, lastPage bool) bool { - for _, volume := range p.Volumes { - volumes = append(volumes, volume) - } + volumes = append(volumes, p.Volumes...) return true }) if err != nil { diff --git a/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_api.go b/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_api.go index 5e586bf0d5..bad32eeb7b 100644 --- a/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_api.go +++ b/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_api.go @@ -276,9 +276,7 @@ func (t *LaunchTemplate) findAllLaunchTemplates(c *fi.Context) ([]*ec2.LaunchTem if err != nil { return nil, err } - for _, x := range resp.LaunchTemplates { - list = append(list, x) - } + list = append(list, resp.LaunchTemplates...) if resp.NextToken == nil { return list, nil @@ -312,9 +310,7 @@ func (t *LaunchTemplate) findAllLaunchTemplatesVersions(c *fi.Context) ([]*ec2.L if err != nil { return err } - for _, x := range resp.LaunchTemplateVersions { - list = append(list, x) - } + list = append(list, resp.LaunchTemplateVersions...) if resp.NextToken == nil { return nil } diff --git a/upup/pkg/fi/cloudup/awsup/status.go b/upup/pkg/fi/cloudup/awsup/status.go index a78de978fd..02be054435 100644 --- a/upup/pkg/fi/cloudup/awsup/status.go +++ b/upup/pkg/fi/cloudup/awsup/status.go @@ -67,9 +67,7 @@ func findEtcdStatus(c AWSCloud, cluster *kops.Cluster) ([]kops.EtcdClusterStatus var volumes []*ec2.Volume klog.V(2).Infof("Listing EC2 Volumes") err := c.EC2().DescribeVolumesPages(request, func(p *ec2.DescribeVolumesOutput, lastPage bool) bool { - for _, volume := range p.Volumes { - volumes = append(volumes, volume) - } + volumes = append(volumes, p.Volumes...) return true }) if err != nil { diff --git a/upup/pkg/fi/executor.go b/upup/pkg/fi/executor.go index 8a7b73cb63..9d381cf925 100644 --- a/upup/pkg/fi/executor.go +++ b/upup/pkg/fi/executor.go @@ -108,9 +108,7 @@ func (e *executor) RunTasks(taskMap map[string]Task) error { progress := false var tasks []*taskState - for _, ts := range canRun { - tasks = append(tasks, ts) - } + tasks = append(tasks, canRun...) taskErrors := e.forkJoin(tasks) var errors []error diff --git a/upup/pkg/fi/nodeup/nodetasks/archive.go b/upup/pkg/fi/nodeup/nodetasks/archive.go index 15afbd77c9..8151a9cb06 100644 --- a/upup/pkg/fi/nodeup/nodetasks/archive.go +++ b/upup/pkg/fi/nodeup/nodetasks/archive.go @@ -61,9 +61,7 @@ func (e *Archive) GetDependencies(tasks map[string]fi.Task) []fi.Task { var deps []fi.Task // Requires parent directories to be created - for _, v := range findCreatesDirParents(e.TargetDir, tasks) { - deps = append(deps, v) - } + deps = append(deps, findCreatesDirParents(e.TargetDir, tasks)...) return deps } diff --git a/upup/pkg/fi/nodeup/nodetasks/bindmount.go b/upup/pkg/fi/nodeup/nodetasks/bindmount.go index 6c94c04f66..bbbe702b99 100644 --- a/upup/pkg/fi/nodeup/nodetasks/bindmount.go +++ b/upup/pkg/fi/nodeup/nodetasks/bindmount.go @@ -66,9 +66,7 @@ func (e *BindMount) GetDependencies(tasks map[string]fi.Task) []fi.Task { var deps []fi.Task // Requires parent directories to be created - for _, v := range findCreatesDirParents(e.Mountpoint, tasks) { - deps = append(deps, v) - } + deps = append(deps, findCreatesDirParents(e.Mountpoint, tasks)...) for _, v := range findCreatesDirMatching(e.Mountpoint, tasks) { if v != e && findTaskInSlice(deps, v) == -1 { deps = append(deps, v) diff --git a/upup/pkg/fi/nodeup/nodetasks/file.go b/upup/pkg/fi/nodeup/nodetasks/file.go index e9509b2a91..359fd93353 100644 --- a/upup/pkg/fi/nodeup/nodetasks/file.go +++ b/upup/pkg/fi/nodeup/nodetasks/file.go @@ -105,9 +105,7 @@ func (e *File) GetDependencies(tasks map[string]fi.Task) []fi.Task { } // Requires parent directories to be created - for _, v := range findCreatesDirParents(e.Path, tasks) { - deps = append(deps, v) - } + deps = append(deps, findCreatesDirParents(e.Path, tasks)...) // Requires other files to be created first for _, f := range e.AfterFiles { diff --git a/upup/pkg/fi/nodeup/nodetasks/mount_disk.go b/upup/pkg/fi/nodeup/nodetasks/mount_disk.go index 0c74bef6df..a0f738e460 100644 --- a/upup/pkg/fi/nodeup/nodetasks/mount_disk.go +++ b/upup/pkg/fi/nodeup/nodetasks/mount_disk.go @@ -60,10 +60,7 @@ func (e *MountDiskTask) GetDependencies(tasks map[string]fi.Task) []fi.Task { var deps []fi.Task // Requires parent directories to be created - for _, v := range findCreatesDirParents(e.Mountpoint, tasks) { - deps = append(deps, v) - } - + deps = append(deps, findCreatesDirParents(e.Mountpoint, tasks)...) return deps } diff --git a/util/pkg/reflectutils/print.go b/util/pkg/reflectutils/print.go index 716418cb52..49e808d5e0 100644 --- a/util/pkg/reflectutils/print.go +++ b/util/pkg/reflectutils/print.go @@ -94,7 +94,7 @@ func ValueAsString(value reflect.Value) string { for _, p := range printers { s, ok := p(intf) if ok { - fmt.Fprintf(b, s) + fmt.Fprintf(b, "%s", s) done = true break }