Skip to content

Commit

Permalink
update formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@philipithomas
philipithomas committed Feb 27, 2017
1 parent 0630f41 commit 6d7032e
Show file tree
Hide file tree
Showing 30 changed files with 54 additions and 54 deletions.
6 changes: 3 additions & 3 deletions account/server/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import (

"golang.org/x/net/context"

"v2.staffjoy.com/auditlog"
"v2.staffjoy.com/auth"
"v2.staffjoy.com/sms"
"github.com/ttacon/libphonenumber"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
"v2.staffjoy.com/auditlog"
"v2.staffjoy.com/auth"
"v2.staffjoy.com/sms"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion account/server/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"

"github.com/golang/protobuf/ptypes/empty"
pb "v2.staffjoy.com/account"
"v2.staffjoy.com/auth"
"v2.staffjoy.com/company"
Expand All @@ -26,7 +27,6 @@ import (
"v2.staffjoy.com/environments"
"v2.staffjoy.com/helpers"
"v2.staffjoy.com/sms"
"github.com/golang/protobuf/ptypes/empty"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions bot/server/alerts.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/codes"

"github.com/golang/protobuf/ptypes/empty"
"golang.org/x/net/context"
"v2.staffjoy.com/account"
"v2.staffjoy.com/bot"
"v2.staffjoy.com/company"
"v2.staffjoy.com/sms"
"github.com/golang/protobuf/ptypes/empty"
"golang.org/x/net/context"

"time"
)
Expand Down
4 changes: 2 additions & 2 deletions bot/server/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (

"golang.org/x/net/context"

"v2.staffjoy.com/auth"
"v2.staffjoy.com/company"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
"v2.staffjoy.com/auth"
"v2.staffjoy.com/company"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion bot/server/onboarding.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (

"golang.org/x/net/context"

"github.com/golang/protobuf/ptypes/empty"
"v2.staffjoy.com/account"
"v2.staffjoy.com/bot"
"v2.staffjoy.com/company"
"v2.staffjoy.com/sms"
"github.com/golang/protobuf/ptypes/empty"
)

func (s *botServer) OnboardWorker(ctx context.Context, req *bot.OnboardWorkerRequest) (*empty.Empty, error) {
Expand Down
6 changes: 3 additions & 3 deletions company/server/admin.go
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package main

import (
"v2.staffjoy.com/auth"
pb "v2.staffjoy.com/company"
"v2.staffjoy.com/helpers"
"github.com/golang/protobuf/ptypes/empty"
"golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"v2.staffjoy.com/auth"
pb "v2.staffjoy.com/company"
"v2.staffjoy.com/helpers"
)

func (s *companyServer) ListAdmins(ctx context.Context, req *pb.AdminListRequest) (*pb.Admins, error) {
Expand Down
6 changes: 3 additions & 3 deletions company/server/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import (

"golang.org/x/net/context"

"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
"v2.staffjoy.com/account"
"v2.staffjoy.com/auditlog"
"v2.staffjoy.com/auth"
pb "v2.staffjoy.com/company"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion company/server/permissions.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package main

import (
"v2.staffjoy.com/auth"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
"v2.staffjoy.com/auth"
)

// Each permission has a public convenience checker, and a private relationship checker.
Expand Down
2 changes: 1 addition & 1 deletion company/server/worker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/codes"

"github.com/golang/protobuf/ptypes/empty"
"v2.staffjoy.com/auth"
pb "v2.staffjoy.com/company"
"v2.staffjoy.com/helpers"
"github.com/golang/protobuf/ptypes/empty"
)

func (s *companyServer) ListWorkers(ctx context.Context, req *pb.WorkerListRequest) (*pb.Workers, error) {
Expand Down
2 changes: 1 addition & 1 deletion email/server/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/codes"

"github.com/keighl/mandrill"
pb "v2.staffjoy.com/email"
"v2.staffjoy.com/environments"
"v2.staffjoy.com/healthcheck"
"github.com/keighl/mandrill"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion faraday/robotstxt.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"v2.staffjoy.com/faraday/services"

"v2.staffjoy.com/environments"
"github.com/gorilla/context"
"v2.staffjoy.com/environments"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions faraday/robotstxt_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package main

import (
"v2.staffjoy.com/faraday/services"
"io/ioutil"
"net/http"
"net/http/httptest"
"testing"
"v2.staffjoy.com/faraday/services"

"v2.staffjoy.com/environments"
"github.com/gorilla/context"
"github.com/stretchr/testify/assert"
"v2.staffjoy.com/environments"
)

func TestNotRobotsGoesNext(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion faraday/security_mw_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"net/http/httptest"
"testing"

"v2.staffjoy.com/environments"
"github.com/stretchr/testify/assert"
"v2.staffjoy.com/environments"
)

func TestDebugMakesNoChanges(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion faraday/service_mw.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

"v2.staffjoy.com/faraday/services"

"v2.staffjoy.com/environments"
"github.com/gorilla/context"
"v2.staffjoy.com/environments"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion faraday/service_mw_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"net/http/httptest"
"testing"

"v2.staffjoy.com/environments"
"github.com/stretchr/testify/assert"
"v2.staffjoy.com/environments"
)

func TestApexRedirectsToWWW(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion faraday/trace_mw.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"golang.org/x/net/context"

"cloud.google.com/go/trace"
"v2.staffjoy.com/environments"
"github.com/Sirupsen/logrus"
"v2.staffjoy.com/environments"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion helpers/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package helpers
import (
"context"

"google.golang.org/grpc/metadata"
"v2.staffjoy.com/account"
"v2.staffjoy.com/auth"
"google.golang.org/grpc/metadata"
)

// TrackEventFromMetadata determines the current user from gRPC context metadata
Expand Down
2 changes: 1 addition & 1 deletion ical/cal.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package main

import (
"v2.staffjoy.com/company"
"strings"
"time"
"v2.staffjoy.com/company"
)

// should eventually incorp. linting
Expand Down
10 changes: 5 additions & 5 deletions ical/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ import (
"os"
"time"

"golang.org/x/net/context"
"v2.staffjoy.com/auth"
"v2.staffjoy.com/company"
pb "v2.staffjoy.com/company"
"golang.org/x/net/context"

"v2.staffjoy.com/environments"
"v2.staffjoy.com/errorpages"
"v2.staffjoy.com/healthcheck"
"v2.staffjoy.com/middlewares"
"github.com/Sirupsen/logrus"
"github.com/gorilla/mux"
"github.com/urfave/negroni"
"google.golang.org/grpc/metadata"
"v2.staffjoy.com/environments"
"v2.staffjoy.com/errorpages"
"v2.staffjoy.com/healthcheck"
"v2.staffjoy.com/middlewares"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions middlewares/recovery.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"net/http"
"runtime"

"v2.staffjoy.com/environments"
"v2.staffjoy.com/errorpages"
"github.com/Sirupsen/logrus"
sentry "github.com/getsentry/raven-go"
"v2.staffjoy.com/environments"
"v2.staffjoy.com/errorpages"
)

// Recovery is a Negroni middleware that recovers from any panics and writes a 500 if there was one.
Expand Down
2 changes: 1 addition & 1 deletion middlewares/recovery_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"net/http/httptest"
"testing"

"v2.staffjoy.com/environments"
"github.com/stretchr/testify/assert"
"github.com/urfave/negroni"
"v2.staffjoy.com/environments"
)

func TestRecovery(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion sms/server/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"context"
"fmt"

"v2.staffjoy.com/auth"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
"v2.staffjoy.com/auth"
)

func getAuth(ctx context.Context) (md metadata.MD, authz string, err error) {
Expand Down
4 changes: 2 additions & 2 deletions sms/server/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"github.com/Sirupsen/logrus"
"github.com/golang/protobuf/ptypes/empty"

"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"v2.staffjoy.com/auth"
"v2.staffjoy.com/environments"
pb "v2.staffjoy.com/sms"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
)

type smsServer struct {
Expand Down
2 changes: 1 addition & 1 deletion suite/suite.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"net/url"
"os"

"v2.staffjoy.com/environments"
"github.com/Sirupsen/logrus"
"v2.staffjoy.com/environments"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions superpowers/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/metadata"

"github.com/Sirupsen/logrus"
"github.com/gorilla/mux"
"github.com/urfave/negroni"
"v2.staffjoy.com/account"
"v2.staffjoy.com/auth"
"v2.staffjoy.com/environments"
"v2.staffjoy.com/errorpages"
"v2.staffjoy.com/healthcheck"
"v2.staffjoy.com/middlewares"
"github.com/Sirupsen/logrus"
"github.com/gorilla/mux"
"github.com/urfave/negroni"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions whoami/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import (

"google.golang.org/grpc/metadata"

"github.com/Sirupsen/logrus"
"github.com/gorilla/mux"
"v2.staffjoy.com/account"
"v2.staffjoy.com/auth"
"v2.staffjoy.com/company"
Expand All @@ -18,8 +20,6 @@ import (
"v2.staffjoy.com/errorpages"
"v2.staffjoy.com/healthcheck"
"v2.staffjoy.com/middlewares"
"github.com/Sirupsen/logrus"
"github.com/gorilla/mux"

"github.com/urfave/negroni"
)
Expand Down
8 changes: 4 additions & 4 deletions www/activate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ import (

"google.golang.org/grpc/metadata"

"github.com/Sirupsen/logrus"
"github.com/gorilla/csrf"
"github.com/gorilla/mux"
"golang.org/x/net/context"
"v2.staffjoy.com/account"
"v2.staffjoy.com/auth"
"v2.staffjoy.com/company"
"v2.staffjoy.com/crypto"
"v2.staffjoy.com/errorpages"
"github.com/Sirupsen/logrus"
"github.com/gorilla/csrf"
"github.com/gorilla/mux"
"golang.org/x/net/context"
)

type activatePage struct {
Expand Down
2 changes: 1 addition & 1 deletion www/breaktime_episodes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"html/template"
"net/http"

"v2.staffjoy.com/errorpages"
"github.com/gorilla/mux"
"v2.staffjoy.com/errorpages"
)

type breaktimeEpisode struct {
Expand Down
Loading

0 comments on commit 6d7032e

Please sign in to comment.