From 62ccb1b67ee3777dc12d0f4ee4405eb4e24d0bd5 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Thu, 20 Dec 2018 09:41:08 +0200 Subject: [PATCH] run go 1.11 fmt --- cmd/podcli/main.go | 5 ++--- cmd/podcli/version.go | 1 - cmd/podinfo/main.go | 11 +++++------ pkg/api/mock.go | 2 +- pkg/api/server.go | 12 +++++------- 5 files changed, 13 insertions(+), 18 deletions(-) diff --git a/cmd/podcli/main.go b/cmd/podcli/main.go index f59c22b..dfb86a5 100644 --- a/cmd/podcli/main.go +++ b/cmd/podcli/main.go @@ -2,12 +2,11 @@ package main import ( "fmt" + "github.com/spf13/cobra" + "go.uber.org/zap" "log" "os" "strings" - - "github.com/spf13/cobra" - "go.uber.org/zap" ) var rootCmd = &cobra.Command{ diff --git a/cmd/podcli/version.go b/cmd/podcli/version.go index 2cf71a6..647a1ea 100644 --- a/cmd/podcli/version.go +++ b/cmd/podcli/version.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "github.com/spf13/cobra" "github.com/stefanprodan/k8s-podinfo/pkg/version" ) diff --git a/cmd/podinfo/main.go b/cmd/podinfo/main.go index d80dbf2..6c0d171 100644 --- a/cmd/podinfo/main.go +++ b/cmd/podinfo/main.go @@ -2,12 +2,6 @@ package main import ( "fmt" - "io/ioutil" - "os" - "path/filepath" - "strings" - "time" - "github.com/spf13/pflag" "github.com/spf13/viper" "github.com/stefanprodan/k8s-podinfo/pkg/api" @@ -15,6 +9,11 @@ import ( "github.com/stefanprodan/k8s-podinfo/pkg/version" "go.uber.org/zap" "go.uber.org/zap/zapcore" + "io/ioutil" + "os" + "path/filepath" + "strings" + "time" ) func main() { diff --git a/pkg/api/mock.go b/pkg/api/mock.go index b452bc9..327c11f 100644 --- a/pkg/api/mock.go +++ b/pkg/api/mock.go @@ -9,7 +9,7 @@ import ( func NewMockServer() *Server { config := &Config{ - Port: "9898", + Port: "9898", HttpServerShutdownTimeout: 5 * time.Second, HttpServerTimeout: 30 * time.Second, BackendURL: "", diff --git a/pkg/api/server.go b/pkg/api/server.go index d7eedda..1d33041 100644 --- a/pkg/api/server.go +++ b/pkg/api/server.go @@ -3,19 +3,17 @@ package api import ( "context" "fmt" + "github.com/gorilla/mux" + "github.com/prometheus/client_golang/prometheus/promhttp" + "github.com/spf13/viper" + "github.com/stefanprodan/k8s-podinfo/pkg/fscache" + "go.uber.org/zap" "net/http" _ "net/http/pprof" "os" "strings" "sync/atomic" "time" - - "github.com/spf13/viper" - - "github.com/gorilla/mux" - "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/stefanprodan/k8s-podinfo/pkg/fscache" - "go.uber.org/zap" ) var (