From 8503e31f647145252a6a0874ad40be1dfc0b597c Mon Sep 17 00:00:00 2001 From: Umputun Date: Wed, 15 Aug 2018 22:14:30 -0500 Subject: [PATCH] reformat imports --- backend/app/main.go | 4 ++-- backend/app/migrator/migrator.go | 1 + backend/app/migrator/remark.go | 1 + backend/app/rest/api/middleware.go | 1 + backend/app/rest/api/migrator.go | 2 +- backend/app/rest/auth/jwt.go | 2 +- backend/app/rest/cache/mongo.go | 3 +-- backend/app/rest/proxy/image.go | 1 + backend/app/store/engine/bolt_accessor.go | 3 +-- backend/app/store/service/service.go | 2 +- 10 files changed, 11 insertions(+), 9 deletions(-) diff --git a/backend/app/main.go b/backend/app/main.go index c15ba681..699a770b 100644 --- a/backend/app/main.go +++ b/backend/app/main.go @@ -16,16 +16,16 @@ import ( "github.com/hashicorp/logutils" "github.com/jessevdk/go-flags" "github.com/pkg/errors" - "github.com/umputun/remark/backend/app/store" - "github.com/umputun/remark/backend/app/store/keys" "github.com/umputun/remark/backend/app/migrator" "github.com/umputun/remark/backend/app/rest/api" "github.com/umputun/remark/backend/app/rest/auth" "github.com/umputun/remark/backend/app/rest/cache" "github.com/umputun/remark/backend/app/rest/proxy" + "github.com/umputun/remark/backend/app/store" "github.com/umputun/remark/backend/app/store/avatar" "github.com/umputun/remark/backend/app/store/engine" + "github.com/umputun/remark/backend/app/store/keys" "github.com/umputun/remark/backend/app/store/service" ) diff --git a/backend/app/migrator/migrator.go b/backend/app/migrator/migrator.go index 422a25ab..ae80a52b 100644 --- a/backend/app/migrator/migrator.go +++ b/backend/app/migrator/migrator.go @@ -9,6 +9,7 @@ import ( "os" "github.com/pkg/errors" + "github.com/umputun/remark/backend/app/store" ) diff --git a/backend/app/migrator/remark.go b/backend/app/migrator/remark.go index c15811dc..93b1505d 100644 --- a/backend/app/migrator/remark.go +++ b/backend/app/migrator/remark.go @@ -8,6 +8,7 @@ import ( "log" "github.com/pkg/errors" + "github.com/umputun/remark/backend/app/store" ) diff --git a/backend/app/rest/api/middleware.go b/backend/app/rest/api/middleware.go index 2410dc6d..77185eb1 100644 --- a/backend/app/rest/api/middleware.go +++ b/backend/app/rest/api/middleware.go @@ -14,6 +14,7 @@ import ( "time" "github.com/go-chi/chi/middleware" + "github.com/umputun/remark/backend/app/rest" ) diff --git a/backend/app/rest/api/migrator.go b/backend/app/rest/api/migrator.go index 3fdc3d9d..3010892a 100644 --- a/backend/app/rest/api/migrator.go +++ b/backend/app/rest/api/migrator.go @@ -15,11 +15,11 @@ import ( "github.com/go-chi/chi" "github.com/go-chi/chi/middleware" "github.com/go-chi/render" - "github.com/umputun/remark/backend/app/store/keys" "github.com/umputun/remark/backend/app/migrator" "github.com/umputun/remark/backend/app/rest" "github.com/umputun/remark/backend/app/rest/cache" + "github.com/umputun/remark/backend/app/store/keys" ) // Migrator rest runs on unexposed port and available for local requests only diff --git a/backend/app/rest/auth/jwt.go b/backend/app/rest/auth/jwt.go index 0269ad0f..d6fd3c06 100644 --- a/backend/app/rest/auth/jwt.go +++ b/backend/app/rest/auth/jwt.go @@ -6,9 +6,9 @@ import ( "github.com/dgrijalva/jwt-go" "github.com/pkg/errors" - "github.com/umputun/remark/backend/app/store/keys" "github.com/umputun/remark/backend/app/store" + "github.com/umputun/remark/backend/app/store/keys" ) // JWT wraps jwt operations diff --git a/backend/app/rest/cache/mongo.go b/backend/app/rest/cache/mongo.go index 8f0c8e99..b0e23b5a 100644 --- a/backend/app/rest/cache/mongo.go +++ b/backend/app/rest/cache/mongo.go @@ -4,11 +4,10 @@ import ( "log" "time" - "github.com/go-pkgz/repeater" - "github.com/globalsign/mgo" "github.com/globalsign/mgo/bson" "github.com/go-pkgz/mongo" + "github.com/go-pkgz/repeater" multierror "github.com/hashicorp/go-multierror" "github.com/pkg/errors" ) diff --git a/backend/app/rest/proxy/image.go b/backend/app/rest/proxy/image.go index b24cbf04..284c8e13 100644 --- a/backend/app/rest/proxy/image.go +++ b/backend/app/rest/proxy/image.go @@ -11,6 +11,7 @@ import ( "github.com/PuerkitoBio/goquery" "github.com/go-chi/chi" "github.com/pkg/errors" + "github.com/umputun/remark/backend/app/rest" ) diff --git a/backend/app/store/engine/bolt_accessor.go b/backend/app/store/engine/bolt_accessor.go index 9ee88c8e..1e14c79c 100644 --- a/backend/app/store/engine/bolt_accessor.go +++ b/backend/app/store/engine/bolt_accessor.go @@ -7,9 +7,8 @@ import ( "strings" "time" - "github.com/hashicorp/go-multierror" - "github.com/coreos/bbolt" + "github.com/hashicorp/go-multierror" "github.com/pkg/errors" "github.com/umputun/remark/backend/app/store" diff --git a/backend/app/store/service/service.go b/backend/app/store/service/service.go index 98f05fcf..c9c35f03 100644 --- a/backend/app/store/service/service.go +++ b/backend/app/store/service/service.go @@ -6,10 +6,10 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - "github.com/umputun/remark/backend/app/store/keys" "github.com/umputun/remark/backend/app/store" "github.com/umputun/remark/backend/app/store/engine" + "github.com/umputun/remark/backend/app/store/keys" ) // DataStore wraps store.Interface with additional methods