From 39807bb0bd99bf0f12be24d03c456b2db04cb28b Mon Sep 17 00:00:00 2001 From: David Gageot Date: Sat, 8 Oct 2022 22:31:06 +0200 Subject: [PATCH] Remove dead or redundant code Signed-off-by: David Gageot --- pkg/host-timesync-daemon/main.go | 2 +- pkg/init/cmd/service/cmd.go | 2 +- pkg/init/cmd/service/prepare.go | 2 +- pkg/memlogd/cmd/memlogd/main.go | 2 +- pkg/metadata/main_test.go | 2 +- pkg/metadata/provider_aws.go | 2 +- pkg/metadata/provider_digitalocean.go | 2 +- pkg/metadata/provider_gcp.go | 2 +- pkg/metadata/provider_hetzner.go | 2 +- pkg/metadata/provider_metaldata.go | 2 +- pkg/metadata/provider_openstack.go | 2 +- pkg/metadata/provider_vultr.go | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/host-timesync-daemon/main.go b/pkg/host-timesync-daemon/main.go index 56c368e20..816772070 100644 --- a/pkg/host-timesync-daemon/main.go +++ b/pkg/host-timesync-daemon/main.go @@ -108,7 +108,7 @@ func main() { d := time.Date(int(t.tmYear+1900), time.Month(t.tmMon+1), int(t.tmMday), int(t.tmHour), int(t.tmMin), int(t.tmSec), 0, time.UTC) log.Printf("Setting system clock to %s", d) tv := syscall.Timeval{ - Sec: int64(d.Unix()), + Sec: d.Unix(), Usec: 0, // the RTC only has second granularity } if err = syscall.Settimeofday(&tv); err != nil { diff --git a/pkg/init/cmd/service/cmd.go b/pkg/init/cmd/service/cmd.go index cff32f2fe..0f95e9e4c 100644 --- a/pkg/init/cmd/service/cmd.go +++ b/pkg/init/cmd/service/cmd.go @@ -11,7 +11,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cio" "github.com/containerd/containerd/namespaces" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" log "github.com/sirupsen/logrus" ) diff --git a/pkg/init/cmd/service/prepare.go b/pkg/init/cmd/service/prepare.go index c3c671965..cb343f531 100644 --- a/pkg/init/cmd/service/prepare.go +++ b/pkg/init/cmd/service/prepare.go @@ -292,7 +292,7 @@ func prepareProcess(pid int, runtime Runtime) error { move = true } if move { - if err := netlink.LinkSetNsPid(link, int(pid)); err != nil { + if err := netlink.LinkSetNsPid(link, pid); err != nil { return fmt.Errorf("Cannot move interface %s into namespace: %v", iface.Name, err) } fmt.Fprintf(os.Stderr, "Moved interface %s to pid %d\n", iface.Name, pid) diff --git a/pkg/memlogd/cmd/memlogd/main.go b/pkg/memlogd/cmd/memlogd/main.go index 7f8dbeea7..8246f9b3d 100644 --- a/pkg/memlogd/cmd/memlogd/main.go +++ b/pkg/memlogd/cmd/memlogd/main.go @@ -114,7 +114,7 @@ func ringBufferHandler(ringSize, chanSize int, logCh chan logEntry, queryMsgChan conn: msg.conn, output: make(chan *logEntry, chanSize), err: nil, - exitOnEOF: (msg.mode == logDump), + exitOnEOF: msg.mode == logDump, } go logQueryHandler(&l) if msg.mode == logDumpFollow || msg.mode == logFollow { diff --git a/pkg/metadata/main_test.go b/pkg/metadata/main_test.go index 90fa8f6c5..9e32bcf56 100644 --- a/pkg/metadata/main_test.go +++ b/pkg/metadata/main_test.go @@ -211,6 +211,6 @@ func assertContent(t *testing.T, path, expected string) { t.Fatalf("can't read %v: %v", path, err) } if !bytes.Equal(file, []byte(expected)) { - t.Fatalf("%v: expected %v but has %v", path, string(expected), string(file)) + t.Fatalf("%v: expected %v but has %v", path, expected, string(file)) } } diff --git a/pkg/metadata/provider_aws.go b/pkg/metadata/provider_aws.go index c6a2017c7..079dde294 100644 --- a/pkg/metadata/provider_aws.go +++ b/pkg/metadata/provider_aws.go @@ -27,7 +27,7 @@ func (p *ProviderAWS) String() string { func (p *ProviderAWS) Probe() bool { // Getting the hostname should always work... _, err := awsGet(metaDataURL + "hostname") - return (err == nil) + return err == nil } // Extract gets both the AWS specific and generic userdata diff --git a/pkg/metadata/provider_digitalocean.go b/pkg/metadata/provider_digitalocean.go index 87fccac90..d08cc9c16 100644 --- a/pkg/metadata/provider_digitalocean.go +++ b/pkg/metadata/provider_digitalocean.go @@ -31,7 +31,7 @@ func (p *ProviderDigitalOcean) String() string { func (p *ProviderDigitalOcean) Probe() bool { // Getting the index should always work... _, err := digitalOceanGet(digitalOceanMetaDataURL) - return (err == nil) + return err == nil } // Extract gets both the DigitalOcean specific and generic userdata diff --git a/pkg/metadata/provider_gcp.go b/pkg/metadata/provider_gcp.go index 346b97ac8..332e275b7 100644 --- a/pkg/metadata/provider_gcp.go +++ b/pkg/metadata/provider_gcp.go @@ -33,7 +33,7 @@ func (p *ProviderGCP) String() string { func (p *ProviderGCP) Probe() bool { // Getting the hostname should always work... _, err := gcpGet(instance + "hostname") - return (err == nil) + return err == nil } // Extract gets both the GCP specific and generic userdata diff --git a/pkg/metadata/provider_hetzner.go b/pkg/metadata/provider_hetzner.go index e376a09af..c832607fd 100644 --- a/pkg/metadata/provider_hetzner.go +++ b/pkg/metadata/provider_hetzner.go @@ -28,7 +28,7 @@ func (p *ProviderHetzner) String() string { func (p *ProviderHetzner) Probe() bool { // Getting the hostname should always work... _, err := hetznerGet(metaDataURL + "hostname") - return (err == nil) + return err == nil } // Extract gets both the Hetzner specific and generic userdata diff --git a/pkg/metadata/provider_metaldata.go b/pkg/metadata/provider_metaldata.go index b36e339e2..82f7b6b1e 100644 --- a/pkg/metadata/provider_metaldata.go +++ b/pkg/metadata/provider_metaldata.go @@ -33,7 +33,7 @@ func (p *ProviderMetaldata) Probe() bool { log.Println("Metaldata: Probing...") // Getting the hostname should always work... _, err := metaldataGet(metaldataMetaDataURL + "hostname") - return (err == nil) + return err == nil } // Extract gets both the Metaldata specific and generic userdata diff --git a/pkg/metadata/provider_openstack.go b/pkg/metadata/provider_openstack.go index 90183fe26..b4a4a5f98 100644 --- a/pkg/metadata/provider_openstack.go +++ b/pkg/metadata/provider_openstack.go @@ -27,7 +27,7 @@ func (p *ProviderOpenstack) String() string { func (p *ProviderOpenstack) Probe() bool { // Getting the hostname should always work... _, err := openstackGet(metaDataURL + "hostname") - return (err == nil) + return err == nil } // Extract gets both the OpenStack specific and generic userdata diff --git a/pkg/metadata/provider_vultr.go b/pkg/metadata/provider_vultr.go index 811081624..b8d9b4507 100644 --- a/pkg/metadata/provider_vultr.go +++ b/pkg/metadata/provider_vultr.go @@ -31,7 +31,7 @@ func (p *ProviderVultr) String() string { func (p *ProviderVultr) Probe() bool { // Getting the index should always work... _, err := vultrGet(vultrMetaDataURL) - return (err == nil) + return err == nil } // Extract gets both the Vultr specific and generic userdata