gateway: reformat with gofumports

hg · May 27, 2021 · 693b5e8 · 693b5e8
1 parent 291b3ae
commit 693b5e8
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 29 deletions.
diff --git a/gateway/airkaz/airkaz.go b/gateway/airkaz/airkaz.go
@@ -2,6 +2,9 @@ package airkaz
 
 import (
 	"encoding/json"
+	"regexp"
+	"time"
+
 	"github.com/hg/airmon/influx"
 	"github.com/hg/airmon/logger"
 	"github.com/hg/airmon/net"
@@ -10,8 +13,6 @@ import (
 	influxdb2 "github.com/influxdata/influxdb-client-go/v2"
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
-	"regexp"
-	"time"
 )
 
 var dataRe = regexp.MustCompile(`(?si)<script.*>.*sensors_data\s*=\s*(\[.+])</script`)

diff --git a/gateway/ceb/ceb.go b/gateway/ceb/ceb.go
@@ -1,15 +1,16 @@
 package ceb
 
 import (
+	"strings"
+	"time"
+
 	"github.com/hg/airmon/influx"
 	"github.com/hg/airmon/logger"
 	"github.com/hg/airmon/net"
 	"github.com/hg/airmon/storage"
 	"github.com/hg/airmon/tm"
 	influxdb2 "github.com/influxdata/influxdb-client-go/v2"
 	"go.uber.org/zap"
-	"strings"
-	"time"
 )
 
 type measurement struct {

diff --git a/gateway/influx/influx.go b/gateway/influx/influx.go
@@ -4,13 +4,14 @@ import (
 	"context"
 	"errors"
 	"flag"
+	"os"
+	"time"
+
 	"github.com/hg/airmon/logger"
 	influxdb2 "github.com/influxdata/influxdb-client-go/v2"
 	influxdb2Api "github.com/influxdata/influxdb-client-go/v2/api"
 	influxdb2Write "github.com/influxdata/influxdb-client-go/v2/api/write"
 	"go.uber.org/zap"
-	"os"
-	"time"
 )
 
 var log = logger.Get(logger.Influx)

diff --git a/gateway/kazhydromet/kazhydromet.go b/gateway/kazhydromet/kazhydromet.go
@@ -1,15 +1,16 @@
 package kazhydromet
 
 import (
+	"strconv"
+	"time"
+
 	"github.com/hg/airmon/influx"
 	"github.com/hg/airmon/logger"
 	"github.com/hg/airmon/net"
 	"github.com/hg/airmon/storage"
 	influxdb2 "github.com/influxdata/influxdb-client-go/v2"
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
-	"strconv"
-	"time"
 )
 
 var log = logger.Get(logger.Kazhydromet)

diff --git a/gateway/logger/logger.go b/gateway/logger/logger.go
@@ -1,12 +1,15 @@
 package logger
 
 import (
-	"go.uber.org/zap"
 	"sync"
+
+	"go.uber.org/zap"
 )
 
-var mu = sync.Mutex{}
-var loggers = make(map[string]*zap.Logger)
+var (
+	mu      = sync.Mutex{}
+	loggers = make(map[string]*zap.Logger)
+)
 
 const (
 	Main        = "main"

diff --git a/gateway/main.go b/gateway/main.go
@@ -3,15 +3,16 @@ package main
 import (
 	"flag"
 	"fmt"
+	"os"
+	"runtime/pprof"
+
 	"github.com/hg/airmon/airkaz"
 	"github.com/hg/airmon/ceb"
 	"github.com/hg/airmon/influx"
 	"github.com/hg/airmon/kazhydromet"
 	"github.com/hg/airmon/logger"
 	"github.com/hg/airmon/mqtt"
 	"go.uber.org/zap"
-	"os"
-	"runtime/pprof"
 )
 
 func main() {

diff --git a/gateway/mon/co2.go b/gateway/mon/co2.go
@@ -2,9 +2,10 @@ package mon
 
 import (
 	"encoding/json"
+	"time"
+
 	influxdb2 "github.com/influxdata/influxdb-client-go/v2"
 	influxdb2Write "github.com/influxdata/influxdb-client-go/v2/api/write"
-	"time"
 )
 
 type co2 struct {

diff --git a/gateway/mon/pm.go b/gateway/mon/pm.go
@@ -2,9 +2,10 @@ package mon
 
 import (
 	"encoding/json"
+	"time"
+
 	influxdb2 "github.com/influxdata/influxdb-client-go/v2"
 	influxdb2Write "github.com/influxdata/influxdb-client-go/v2/api/write"
-	"time"
 )
 
 type pmConcentration struct {

diff --git a/gateway/mon/temperature.go b/gateway/mon/temperature.go
@@ -2,9 +2,10 @@ package mon
 
 import (
 	"encoding/json"
+	"time"
+
 	influxdb2 "github.com/influxdata/influxdb-client-go/v2"
 	influxdb2Write "github.com/influxdata/influxdb-client-go/v2/api/write"
-	"time"
 )
 
 type temperature struct {

diff --git a/gateway/mqtt/mqtt.go b/gateway/mqtt/mqtt.go
@@ -2,14 +2,15 @@ package mqtt
 
 import (
 	"flag"
+	"os"
+	"strings"
+
 	mqtt "github.com/eclipse/paho.mqtt.golang"
 	"github.com/hg/airmon/influx"
 	"github.com/hg/airmon/logger"
 	"github.com/hg/airmon/mon"
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
-	"os"
-	"strings"
 )
 
 var log = logger.Get(logger.Mqtt)

diff --git a/gateway/net/net.go b/gateway/net/net.go
@@ -3,16 +3,17 @@ package net
 import (
 	"context"
 	"encoding/json"
-	"github.com/hg/airmon/logger"
-	"github.com/pkg/errors"
-	"go.uber.org/zap"
-	"golang.org/x/net/proxy"
 	"io/ioutil"
 	"math/rand"
 	"net"
 	"net/http"
 	"net/url"
 	"time"
+
+	"github.com/hg/airmon/logger"
+	"github.com/pkg/errors"
+	"go.uber.org/zap"
+	"golang.org/x/net/proxy"
 )
 
 var userAgents = []string{

diff --git a/gateway/storage/storage.go b/gateway/storage/storage.go
@@ -2,11 +2,12 @@ package storage
 
 import (
 	"encoding/json"
-	"github.com/hg/airmon/logger"
-	"go.uber.org/zap"
 	"io/ioutil"
 	"os"
 	"path"
+
+	"github.com/hg/airmon/logger"
+	"go.uber.org/zap"
 )
 
 var log = logger.Get(logger.Storage)
@@ -18,8 +19,7 @@ func getPath(filename string) (string, error) {
 	}
 	dir = path.Join(dir, "airmon")
 
-	err := os.MkdirAll(dir, 0750)
-
+	err := os.MkdirAll(dir, 0o750)
 	if err != nil {
 		log.Error("could not create data directory",
 			zap.String("path", dir),
@@ -46,7 +46,7 @@ func Save(filename string, data interface{}) error {
 		return err
 	}
 
-	err = ioutil.WriteFile(fullPath, serialized, 0640)
+	err = ioutil.WriteFile(fullPath, serialized, 0o640)
 	if err != nil {
 		log.Error("could not write file",
 			zap.String("path", fullPath),

diff --git a/gateway/tm/tm.go b/gateway/tm/tm.go
@@ -1,10 +1,11 @@
 package tm
 
 import (
-	"github.com/hg/airmon/logger"
-	"go.uber.org/zap"
 	"strings"
 	"time"
+
+	"github.com/hg/airmon/logger"
+	"go.uber.org/zap"
 )
 
 const (