Merge pull request #15 from datawire/lukeshu/reorg

Re-organize files
emissary-ingress · Jan 16, 2019 · ad500ad · ad500ad
2 parents 0df18e9 + 418c84b
commit ad500ad
Show file tree

Hide file tree

Showing 21 changed files with 30 additions and 228 deletions.
diff --git a/intercept/README.md → README.intercept.md b/intercept/README.md → README.intercept.md
diff --git a/cmd/ambassador-oauth/app/app.go b/cmd/ambassador-oauth/app/app.go
@@ -3,17 +3,17 @@ package app
 import (
 	"net/http"
 
-	"github.com/datawire/apro/cmd/ambassador-oauth/client"
 	"github.com/gorilla/mux"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/negroni"
 
+	"github.com/datawire/apro/cmd/ambassador-oauth/client"
 	"github.com/datawire/apro/cmd/ambassador-oauth/config"
 	"github.com/datawire/apro/cmd/ambassador-oauth/controller"
 	"github.com/datawire/apro/cmd/ambassador-oauth/discovery"
 	"github.com/datawire/apro/cmd/ambassador-oauth/secret"
-	"github.com/datawire/apro/handler"
-	"github.com/datawire/apro/middleware"
-	"github.com/sirupsen/logrus"
-	"github.com/urfave/negroni"
+	"github.com/datawire/apro/lib/handler"
+	"github.com/datawire/apro/lib/middleware"
 )
 
 // App is used to wire up all the cmd application components.

diff --git a/cmd/ambassador-oauth/controller/controller.go b/cmd/ambassador-oauth/controller/controller.go
@@ -8,13 +8,14 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"github.com/datawire/apro/cmd/ambassador-oauth/config"
-	"github.com/datawire/apro/util"
-	"github.com/datawire/teleproxy/pkg/k8s"
 	"github.com/gobwas/glob"
+	ms "github.com/mitchellh/mapstructure"
 	"github.com/sirupsen/logrus"
 
-	ms "github.com/mitchellh/mapstructure"
+	"github.com/datawire/teleproxy/pkg/k8s"
+
+	"github.com/datawire/apro/cmd/ambassador-oauth/config"
+	"github.com/datawire/apro/lib/util"
 )
 
 // Controller is monitors changes in app configuration and policy custom resources.

diff --git a/cmd/ambassador-oauth/main_test.go b/cmd/ambassador-oauth/main_test.go
@@ -18,7 +18,7 @@ import (
 	"testing"
 
 	"github.com/datawire/apro/cmd/ambassador-oauth/app"
-	"github.com/datawire/apro/testutil"
+	"github.com/datawire/apro/lib/testutil"
 )
 
 var appUT *app.App

diff --git a/intercept/cmd/proxy/proxy.go → cmd/proxy/proxy.go b/intercept/cmd/proxy/proxy.go → cmd/proxy/proxy.go
diff --git a/intercept/cmd/sidecar/sidecar.go → cmd/sidecar/sidecar.go b/intercept/cmd/sidecar/sidecar.go → cmd/sidecar/sidecar.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/datawire/apro/pkg/longpoll"
+	"github.com/datawire/apro/lib/longpoll"
 )
 
 // PatternInfo represents one Envoy header regex_match

diff --git a/intercept/LICENSE b/intercept/LICENSE
diff --git a/intercept/example/proxy.yaml → k8s-intercept/proxy.yaml b/intercept/example/proxy.yaml → k8s-intercept/proxy.yaml
diff --git a/intercept/example/the-app.yaml → k8s-intercept/the-app.yaml b/intercept/example/the-app.yaml → k8s-intercept/the-app.yaml
diff --git a/handler/authorize.go → lib/handler/authorize.go b/handler/authorize.go → lib/handler/authorize.go
@@ -5,13 +5,14 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/datawire/apro/cmd/ambassador-oauth/config"
-	"github.com/datawire/apro/cmd/ambassador-oauth/controller"
-	"github.com/datawire/apro/cmd/ambassador-oauth/secret"
-	"github.com/datawire/apro/util"
 	"github.com/dgrijalva/jwt-go"
 	"github.com/satori/go.uuid"
 	"github.com/sirupsen/logrus"
+
+	"github.com/datawire/apro/cmd/ambassador-oauth/config"
+	"github.com/datawire/apro/cmd/ambassador-oauth/controller"
+	"github.com/datawire/apro/cmd/ambassador-oauth/secret"
+	"github.com/datawire/apro/lib/util"
 )
 
 const (

diff --git a/handler/callback.go → lib/handler/callback.go b/handler/callback.go → lib/handler/callback.go
@@ -6,14 +6,13 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/dgrijalva/jwt-go"
+	"github.com/sirupsen/logrus"
+
 	"github.com/datawire/apro/cmd/ambassador-oauth/client"
 	"github.com/datawire/apro/cmd/ambassador-oauth/controller"
 	"github.com/datawire/apro/cmd/ambassador-oauth/secret"
-	"github.com/datawire/apro/util"
-
-	"github.com/dgrijalva/jwt-go"
-
-	"github.com/sirupsen/logrus"
+	"github.com/datawire/apro/lib/util"
 )
 
 const (

diff --git a/pkg/longpoll/client.go → lib/longpoll/client.go b/pkg/longpoll/client.go → lib/longpoll/client.go
diff --git a/middleware/config_check.go → lib/middleware/config_check.go b/middleware/config_check.go → lib/middleware/config_check.go
diff --git a/middleware/domain_check.go → lib/middleware/domain_check.go b/middleware/domain_check.go → lib/middleware/domain_check.go
@@ -5,9 +5,10 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/datawire/apro/cmd/ambassador-oauth/controller"
-	"github.com/datawire/apro/util"
 	"github.com/sirupsen/logrus"
+
+	"github.com/datawire/apro/cmd/ambassador-oauth/controller"
+	"github.com/datawire/apro/lib/util"
 )
 
 // DomainCheck verifies that a given request has a correspondent application. Applications are

diff --git a/middleware/jwt_check.go → lib/middleware/jwt_check.go b/middleware/jwt_check.go → lib/middleware/jwt_check.go
@@ -6,13 +6,14 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/dgrijalva/jwt-go"
+	"github.com/sirupsen/logrus"
+
 	"github.com/datawire/apro/cmd/ambassador-oauth/config"
 	"github.com/datawire/apro/cmd/ambassador-oauth/controller"
 	"github.com/datawire/apro/cmd/ambassador-oauth/discovery"
-	"github.com/datawire/apro/handler"
-	"github.com/datawire/apro/util"
-	"github.com/dgrijalva/jwt-go"
-	"github.com/sirupsen/logrus"
+	"github.com/datawire/apro/lib/handler"
+	"github.com/datawire/apro/lib/util"
 )
 
 // JWTCheck middleware validates signed tokens when present in the request.

diff --git a/middleware/logger.go → lib/middleware/logger.go b/middleware/logger.go → lib/middleware/logger.go
diff --git a/middleware/policy_check.go → lib/middleware/policy_check.go b/middleware/policy_check.go → lib/middleware/policy_check.go
diff --git a/testutil/assert.go → lib/testutil/assert.go b/testutil/assert.go → lib/testutil/assert.go
diff --git a/testutil/servers.go → lib/testutil/servers.go b/testutil/servers.go → lib/testutil/servers.go
@@ -17,7 +17,7 @@ import (
 	"github.com/datawire/apro/cmd/ambassador-oauth/discovery"
 	"github.com/datawire/apro/cmd/ambassador-oauth/logger"
 	"github.com/datawire/apro/cmd/ambassador-oauth/secret"
-	"github.com/datawire/apro/util"
+	"github.com/datawire/apro/lib/util"
 )
 
 // NewIDP returns an instance of the identity provider server.

diff --git a/util/http_util.go → lib/util/http_util.go b/util/http_util.go → lib/util/http_util.go
diff --git a/intercept/loop-intercept.sh → loop-intercept.sh b/intercept/loop-intercept.sh → loop-intercept.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ import ( @@
     	"os"
     	"time"
-    	"github.com/datawire/apro/pkg/longpoll"
+    	"github.com/datawire/apro/lib/longpoll"
     )
     // PatternInfo represents one Envoy header regex_match
@@ Expand Down @@