From 1140807f24c33417aa74687852eb3421767e4951 Mon Sep 17 00:00:00 2001 From: Jerad Cramp Date: Tue, 30 Jun 2020 17:11:24 -0500 Subject: [PATCH] fix gofmt issues --- pkg/config/config.go | 8 ++++---- pkg/interruptionevent/scheduled-event_internal_test.go | 2 +- pkg/interruptionevent/spot-itn-event_internal_test.go | 2 +- pkg/node/node.go | 4 ++-- pkg/node/node_internal_test.go | 2 +- pkg/node/node_test.go | 2 +- pkg/uptime/common.go | 5 +++-- pkg/uptime/common_test.go | 1 - pkg/uptime/uptime_linux.go | 3 ++- pkg/uptime/uptime_windows.go | 4 ++-- 10 files changed, 17 insertions(+), 16 deletions(-) diff --git a/pkg/config/config.go b/pkg/config/config.go index 4c045ff8..88a3c2c2 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -58,11 +58,11 @@ const ( uptimeFromFileConfigKey = "UPTIME_FROM_FILE" uptimeFromFileDefault = "" // prometheus - enablePrometheusDefault = false - enablePrometheusConfigKey = "ENABLE_PROMETHEUS_SERVER" + enablePrometheusDefault = false + enablePrometheusConfigKey = "ENABLE_PROMETHEUS_SERVER" // https://github.com/prometheus/prometheus/wiki/Default-port-allocations - prometheusPortDefault = 9092 - prometheusPortConfigKey = "PROMETHEUS_SERVER_PORT" + prometheusPortDefault = 9092 + prometheusPortConfigKey = "PROMETHEUS_SERVER_PORT" ) //Config arguments set via CLI, environment variables, or defaults diff --git a/pkg/interruptionevent/scheduled-event_internal_test.go b/pkg/interruptionevent/scheduled-event_internal_test.go index 6e0f1e3d..48872f4a 100644 --- a/pkg/interruptionevent/scheduled-event_internal_test.go +++ b/pkg/interruptionevent/scheduled-event_internal_test.go @@ -21,8 +21,8 @@ import ( "github.com/aws/aws-node-termination-handler/pkg/config" "github.com/aws/aws-node-termination-handler/pkg/node" - "github.com/aws/aws-node-termination-handler/pkg/uptime" h "github.com/aws/aws-node-termination-handler/pkg/test" + "github.com/aws/aws-node-termination-handler/pkg/uptime" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" diff --git a/pkg/interruptionevent/spot-itn-event_internal_test.go b/pkg/interruptionevent/spot-itn-event_internal_test.go index f01636bb..5a4aa516 100644 --- a/pkg/interruptionevent/spot-itn-event_internal_test.go +++ b/pkg/interruptionevent/spot-itn-event_internal_test.go @@ -20,8 +20,8 @@ import ( "github.com/aws/aws-node-termination-handler/pkg/config" "github.com/aws/aws-node-termination-handler/pkg/node" - "github.com/aws/aws-node-termination-handler/pkg/uptime" h "github.com/aws/aws-node-termination-handler/pkg/test" + "github.com/aws/aws-node-termination-handler/pkg/uptime" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" diff --git a/pkg/node/node.go b/pkg/node/node.go index 756e4817..c743cd4f 100644 --- a/pkg/node/node.go +++ b/pkg/node/node.go @@ -83,6 +83,7 @@ func NewWithValues(nthConfig config.Config, drainHelper *drain.Helper, uptime up }, nil } +// GetName returns node name from the configuration. func (n Node) GetName() string { return n.nthConfig.NodeName } @@ -546,10 +547,9 @@ func removeTaint(node *corev1.Node, client kubernetes.Interface, taintKey string func getUptimeFunc(uptimeFile string) uptime.UptimeFuncType { if uptimeFile != "" { - return func () (int64, error) { + return func() (int64, error) { return uptime.UptimeFromFile(uptimeFile) } } return uptime.Uptime } - diff --git a/pkg/node/node_internal_test.go b/pkg/node/node_internal_test.go index 5456bd74..13a28548 100644 --- a/pkg/node/node_internal_test.go +++ b/pkg/node/node_internal_test.go @@ -22,8 +22,8 @@ import ( "time" "github.com/aws/aws-node-termination-handler/pkg/config" - "github.com/aws/aws-node-termination-handler/pkg/uptime" h "github.com/aws/aws-node-termination-handler/pkg/test" + "github.com/aws/aws-node-termination-handler/pkg/uptime" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" diff --git a/pkg/node/node_test.go b/pkg/node/node_test.go index 57028d64..9c44dd1e 100644 --- a/pkg/node/node_test.go +++ b/pkg/node/node_test.go @@ -22,8 +22,8 @@ import ( "github.com/aws/aws-node-termination-handler/pkg/config" "github.com/aws/aws-node-termination-handler/pkg/node" - "github.com/aws/aws-node-termination-handler/pkg/uptime" h "github.com/aws/aws-node-termination-handler/pkg/test" + "github.com/aws/aws-node-termination-handler/pkg/uptime" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" diff --git a/pkg/uptime/common.go b/pkg/uptime/common.go index db8481a8..e67f13c2 100644 --- a/pkg/uptime/common.go +++ b/pkg/uptime/common.go @@ -20,9 +20,11 @@ import ( "strings" ) +// UptimeFuncType cleans up function arguments or return type. type UptimeFuncType func() (int64, error) -// Returns number of seconds since last reboot as read from filepath. +// UptimeFromFile reads system uptime information from filepath and returns +// the number of seconds since last system boot. func UptimeFromFile(filepath string) (int64, error) { data, err := ioutil.ReadFile(filepath) if err != nil { @@ -35,4 +37,3 @@ func UptimeFromFile(filepath string) (int64, error) { } return int64(uptime), nil } - diff --git a/pkg/uptime/common_test.go b/pkg/uptime/common_test.go index 27f7acbf..b4472104 100644 --- a/pkg/uptime/common_test.go +++ b/pkg/uptime/common_test.go @@ -28,4 +28,3 @@ func TestUptimeFromFileFailure(t *testing.T) { os.Remove(testFile) h.Assert(t, err != nil, "Failed to throw error for int64 parse") } - diff --git a/pkg/uptime/uptime_linux.go b/pkg/uptime/uptime_linux.go index 94a25962..f625b777 100644 --- a/pkg/uptime/uptime_linux.go +++ b/pkg/uptime/uptime_linux.go @@ -13,7 +13,8 @@ package uptime +// Uptime reads system uptime from /proc/uptime and returns the number +// of seconds since last system boot. func Uptime() (int64, error) { return UptimeFromFile("/proc/uptime") } - diff --git a/pkg/uptime/uptime_windows.go b/pkg/uptime/uptime_windows.go index 36a0a8a2..eccb3dfa 100644 --- a/pkg/uptime/uptime_windows.go +++ b/pkg/uptime/uptime_windows.go @@ -21,10 +21,11 @@ import ( ) var ( - kernel32 = windows.NewLazySystemDLL("kernel32.dll") + kernel32 = windows.NewLazySystemDLL("kernel32.dll") getTickCount = kernel32.NewProc("GetTickCount") ) +// Uptime returns the number of seconds since last system boot. func Uptime() (int64, error) { millis, _, err := syscall.Syscall(getTickCount.Addr(), 0, 0, 0, 0) if err != 0 { @@ -33,4 +34,3 @@ func Uptime() (int64, error) { uptime := (time.Duration(millis) * time.Millisecond).Seconds() return int64(uptime), nil } -