moved pkg/middleware to internal/middleware

beneath-hq · Feb 12, 2020 · 7a5574c · 7a5574c
1 parent 094149e
commit 7a5574c
Show file tree

Hide file tree

Showing 32 changed files with 30 additions and 30 deletions.
diff --git a/cmd/gateway/main.go b/cmd/gateway/main.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/beneath-core/pkg/envutil"
 	"github.com/beneath-core/pkg/log"
-	"github.com/beneath-core/pkg/segment"
+	"github.com/beneath-core/internal/segment"
 	"github.com/beneath-core/db"
 	gw "github.com/beneath-core/gateway"
 	gwgrpc "github.com/beneath-core/gateway/grpc"

diff --git a/control/auth/router.go b/control/auth/router.go
@@ -9,7 +9,7 @@ import (
 	"github.com/beneath-core/control/entity"
 	"github.com/beneath-core/pkg/httputil"
 	"github.com/beneath-core/pkg/log"
-	"github.com/beneath-core/pkg/middleware"
+	"github.com/beneath-core/internal/middleware"
 
 	"github.com/go-chi/chi"
 	"github.com/markbates/goth/gothic"

diff --git a/control/resolver/billed_resource.go b/control/resolver/billed_resource.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/beneath-core/control/entity"
 	"github.com/beneath-core/control/gql"
-	"github.com/beneath-core/pkg/middleware"
+	"github.com/beneath-core/internal/middleware"
 	uuid "github.com/satori/go.uuid"
 	"github.com/vektah/gqlparser/gqlerror"
 )

diff --git a/control/resolver/metrics.go b/control/resolver/metrics.go
@@ -11,7 +11,7 @@ import (
 	"github.com/beneath-core/control/entity"
 	"github.com/beneath-core/control/gql"
 	"github.com/beneath-core/pkg/mathutil"
-	"github.com/beneath-core/pkg/middleware"
+	"github.com/beneath-core/internal/middleware"
 	"github.com/beneath-core/pkg/timeutil"
 	"github.com/beneath-core/metrics"
 )

diff --git a/control/resolver/model.go b/control/resolver/model.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/beneath-core/control/entity"
 	"github.com/beneath-core/control/gql"
-	"github.com/beneath-core/pkg/middleware"
+	"github.com/beneath-core/internal/middleware"
 )
 
 // Model returns the gql.ModelResolver

diff --git a/control/resolver/organization.go b/control/resolver/organization.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/beneath-core/control/entity"
 	"github.com/beneath-core/control/gql"
-	"github.com/beneath-core/pkg/middleware"
+	"github.com/beneath-core/internal/middleware"
 	uuid "github.com/satori/go.uuid"
 	"github.com/vektah/gqlparser/gqlerror"
 )

diff --git a/control/resolver/project.go b/control/resolver/project.go
@@ -3,7 +3,7 @@ package resolver
 import (
 	"context"
 
-	"github.com/beneath-core/pkg/middleware"
+	"github.com/beneath-core/internal/middleware"
 
 	"github.com/beneath-core/control/entity"
 	"github.com/beneath-core/control/gql"

diff --git a/control/resolver/secret.go b/control/resolver/secret.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/beneath-core/control/entity"
 	"github.com/beneath-core/control/gql"
-	"github.com/beneath-core/pkg/middleware"
+	"github.com/beneath-core/internal/middleware"
 )
 
 // ServiceSecret returns the gql.ServiceSecretResolver

diff --git a/control/resolver/service.go b/control/resolver/service.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/beneath-core/control/entity"
 	"github.com/beneath-core/control/gql"
-	"github.com/beneath-core/pkg/middleware"
+	"github.com/beneath-core/internal/middleware"
 	uuid "github.com/satori/go.uuid"
 	"github.com/vektah/gqlparser/gqlerror"
 )

diff --git a/control/resolver/stream.go b/control/resolver/stream.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/beneath-core/control/entity"
 	"github.com/beneath-core/control/gql"
-	"github.com/beneath-core/pkg/middleware"
+	"github.com/beneath-core/internal/middleware"
 )
 
 // Stream returns the gql.StreamResolver

diff --git a/control/resolver/user.go b/control/resolver/user.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/beneath-core/control/entity"
 	"github.com/beneath-core/control/gql"
-	"github.com/beneath-core/pkg/middleware"
+	"github.com/beneath-core/internal/middleware"
 	"github.com/beneath-core/metrics"
 	uuid "github.com/satori/go.uuid"
 )

diff --git a/control/server.go b/control/server.go
@@ -13,8 +13,8 @@ import (
 	"github.com/beneath-core/pkg/envutil"
 	"github.com/beneath-core/pkg/httputil"
 	"github.com/beneath-core/pkg/log"
-	"github.com/beneath-core/pkg/middleware"
-	"github.com/beneath-core/pkg/segment"
+	"github.com/beneath-core/internal/middleware"
+	"github.com/beneath-core/internal/segment"
 	"github.com/beneath-core/db"
 	"github.com/beneath-core/payments"
 

diff --git a/gateway/grpc/get_stream.go b/gateway/grpc/get_stream.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/beneath-core/control/entity"
-	"github.com/beneath-core/pkg/middleware"
+	"github.com/beneath-core/internal/middleware"
 	pb "github.com/beneath-core/gateway/grpc/proto"
 	uuid "github.com/satori/go.uuid"
 	"google.golang.org/grpc"

diff --git a/gateway/grpc/ping.go b/gateway/grpc/ping.go
@@ -7,7 +7,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 
-	"github.com/beneath-core/pkg/middleware"
+	"github.com/beneath-core/internal/middleware"
 	pb "github.com/beneath-core/gateway/grpc/proto"
 )
 

diff --git a/gateway/grpc/query.go b/gateway/grpc/query.go
@@ -9,7 +9,7 @@ import (
 	"google.golang.org/grpc/status"
 
 	"github.com/beneath-core/control/entity"
-	"github.com/beneath-core/pkg/middleware"
+	"github.com/beneath-core/internal/middleware"
 	"github.com/beneath-core/pkg/queryparse"
 	"github.com/beneath-core/pkg/timeutil"
 	"github.com/beneath-core/db"

diff --git a/gateway/grpc/server.go b/gateway/grpc/server.go
@@ -5,7 +5,7 @@ import (
 	grpc_auth "github.com/grpc-ecosystem/go-grpc-middleware/auth"
 	"google.golang.org/grpc"
 
-	"github.com/beneath-core/pkg/middleware"
+	"github.com/beneath-core/internal/middleware"
 	pb "github.com/beneath-core/gateway/grpc/proto"
 
 	// see https://github.com/grpc/grpc-go/blob/master/Documentation/encoding.md#using-a-compressor

diff --git a/gateway/grpc/subscription.go b/gateway/grpc/subscription.go
@@ -7,7 +7,7 @@ import (
 	"google.golang.org/grpc/status"
 
 	"github.com/beneath-core/control/entity"
-	"github.com/beneath-core/pkg/middleware"
+	"github.com/beneath-core/internal/middleware"
 	"github.com/beneath-core/gateway"
 	"github.com/beneath-core/gateway/subscriptions"
 	pb "github.com/beneath-core/gateway/grpc/proto"

diff --git a/gateway/grpc/write.go b/gateway/grpc/write.go
@@ -10,7 +10,7 @@ import (
 	"google.golang.org/grpc/status"
 
 	"github.com/beneath-core/control/entity"
-	"github.com/beneath-core/pkg/middleware"
+	"github.com/beneath-core/internal/middleware"
 	"github.com/beneath-core/pkg/timeutil"
 	"github.com/beneath-core/db"
 	"github.com/beneath-core/engine"

diff --git a/gateway/http/get_stream.go b/gateway/http/get_stream.go
@@ -9,7 +9,7 @@ import (
 	"github.com/beneath-core/control/entity"
 	"github.com/beneath-core/pkg/httputil"
 	"github.com/beneath-core/pkg/jsonutil"
-	"github.com/beneath-core/pkg/middleware"
+	"github.com/beneath-core/internal/middleware"
 )
 
 func getStreamDetails(w http.ResponseWriter, r *http.Request) error {

diff --git a/gateway/http/query.go b/gateway/http/query.go
@@ -15,7 +15,7 @@ import (
 	"github.com/beneath-core/control/entity"
 	"github.com/beneath-core/pkg/httputil"
 	"github.com/beneath-core/pkg/jsonutil"
-	"github.com/beneath-core/pkg/middleware"
+	"github.com/beneath-core/internal/middleware"
 	"github.com/beneath-core/pkg/timeutil"
 	"github.com/beneath-core/db"
 	"github.com/beneath-core/gateway"

diff --git a/gateway/http/server.go b/gateway/http/server.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/beneath-core/pkg/httputil"
 	"github.com/beneath-core/pkg/log"
-	"github.com/beneath-core/pkg/middleware"
+	"github.com/beneath-core/internal/middleware"
 	"github.com/beneath-core/pkg/ws"
 	"github.com/beneath-core/db"
 )

diff --git a/gateway/http/write.go b/gateway/http/write.go
@@ -11,7 +11,7 @@ import (
 	"github.com/beneath-core/control/entity"
 	"github.com/beneath-core/pkg/httputil"
 	"github.com/beneath-core/pkg/jsonutil"
-	"github.com/beneath-core/pkg/middleware"
+	"github.com/beneath-core/internal/middleware"
 	"github.com/beneath-core/pkg/timeutil"
 	"github.com/beneath-core/db"
 	"github.com/beneath-core/engine"

diff --git a/pkg/middleware/auth.go → internal/middleware/auth.go b/pkg/middleware/auth.go → internal/middleware/auth.go
diff --git a/pkg/middleware/ipratelimiting.go → internal/middleware/ipratelimiting.go b/pkg/middleware/ipratelimiting.go → internal/middleware/ipratelimiting.go
@@ -13,8 +13,8 @@ import (
 	"google.golang.org/grpc/peer"
 	"google.golang.org/grpc/status"
 
-	"github.com/beneath-core/pkg/httputil"
 	"github.com/beneath-core/db"
+	"github.com/beneath-core/pkg/httputil"
 )
 
 var (

diff --git a/pkg/middleware/logger.go → internal/middleware/logger.go b/pkg/middleware/logger.go → internal/middleware/logger.go
diff --git a/pkg/middleware/recoverer.go → internal/middleware/recoverer.go b/pkg/middleware/recoverer.go → internal/middleware/recoverer.go
diff --git a/pkg/middleware/tags.go → internal/middleware/tags.go b/pkg/middleware/tags.go → internal/middleware/tags.go
diff --git a/pkg/segment/segment.go → internal/segment/segment.go b/pkg/segment/segment.go → internal/segment/segment.go
@@ -8,8 +8,8 @@ import (
 	uuid "github.com/satori/go.uuid"
 	analytics "gopkg.in/segmentio/analytics-go.v3"
 
+	"github.com/beneath-core/internal/middleware"
 	"github.com/beneath-core/pkg/log"
-	"github.com/beneath-core/pkg/middleware"
 )
 
 // Client enables us to send data to Segment

diff --git a/payments/driver/anarchism/anarchism.go b/payments/driver/anarchism/anarchism.go
@@ -8,7 +8,7 @@ import (
 	"github.com/beneath-core/pkg/envutil"
 	"github.com/beneath-core/pkg/httputil"
 	"github.com/beneath-core/pkg/log"
-	"github.com/beneath-core/pkg/middleware"
+	"github.com/beneath-core/internal/middleware"
 	"github.com/beneath-core/payments/driver"
 	uuid "github.com/satori/go.uuid"
 )

diff --git a/payments/driver/stripecard/stripecard.go b/payments/driver/stripecard/stripecard.go
@@ -11,7 +11,7 @@ import (
 	"github.com/beneath-core/pkg/httputil"
 	"github.com/beneath-core/pkg/jsonutil"
 	"github.com/beneath-core/pkg/log"
-	"github.com/beneath-core/pkg/middleware"
+	"github.com/beneath-core/internal/middleware"
 	"github.com/beneath-core/payments/driver"
 	"github.com/beneath-core/payments/driver/stripeutil"
 	uuid "github.com/satori/go.uuid"

diff --git a/payments/driver/stripewire/stripewire.go b/payments/driver/stripewire/stripewire.go
@@ -9,7 +9,7 @@ import (
 	"github.com/beneath-core/pkg/envutil"
 	"github.com/beneath-core/pkg/httputil"
 	"github.com/beneath-core/pkg/log"
-	"github.com/beneath-core/pkg/middleware"
+	"github.com/beneath-core/internal/middleware"
 	"github.com/beneath-core/payments/driver"
 	"github.com/beneath-core/payments/driver/stripeutil"
 	uuid "github.com/satori/go.uuid"

diff --git a/pipeline/pipeline.go b/pipeline/pipeline.go
@@ -9,12 +9,12 @@ import (
 	"golang.org/x/sync/errgroup"
 
 	"github.com/beneath-core/control/entity"
-	"github.com/beneath-core/pkg/log"
-	"github.com/beneath-core/pkg/timeutil"
 	"github.com/beneath-core/db"
 	"github.com/beneath-core/engine/driver"
 	pb "github.com/beneath-core/engine/proto"
 	pbgw "github.com/beneath-core/gateway/grpc/proto"
+	"github.com/beneath-core/pkg/log"
+	"github.com/beneath-core/pkg/timeutil"
 )
 
 const (