update proxy import paths and module name

proxy/pkg/command/health.go

@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis-proxy/pkg/config"
-	"github.com/owncloud/ocis-proxy/pkg/flagset"
+	"github.com/owncloud/ocis/proxy/pkg/config"
+	"github.com/owncloud/ocis/proxy/pkg/flagset"
 )
 
 // Health is the entrypoint for the health command.

proxy/pkg/command/root.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-pkg/v2/log"
-	"github.com/owncloud/ocis-proxy/pkg/config"
-	"github.com/owncloud/ocis-proxy/pkg/flagset"
-	"github.com/owncloud/ocis-proxy/pkg/version"
+	"github.com/owncloud/ocis/proxy/pkg/config"
+	"github.com/owncloud/ocis/proxy/pkg/flagset"
+	"github.com/owncloud/ocis/proxy/pkg/version"
 	"github.com/spf13/viper"
 )
 

proxy/pkg/command/server.go

@@ -23,14 +23,14 @@ import (
 	zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http"
 	acc "github.com/owncloud/ocis-accounts/pkg/proto/v0"
 	"github.com/owncloud/ocis-pkg/v2/log"
-	"github.com/owncloud/ocis-proxy/pkg/config"
-	"github.com/owncloud/ocis-proxy/pkg/cs3"
-	"github.com/owncloud/ocis-proxy/pkg/flagset"
-	"github.com/owncloud/ocis-proxy/pkg/metrics"
-	"github.com/owncloud/ocis-proxy/pkg/middleware"
-	"github.com/owncloud/ocis-proxy/pkg/proxy"
-	"github.com/owncloud/ocis-proxy/pkg/server/debug"
-	proxyHTTP "github.com/owncloud/ocis-proxy/pkg/server/http"
+	"github.com/owncloud/ocis/proxy/pkg/config"
+	"github.com/owncloud/ocis/proxy/pkg/cs3"
+	"github.com/owncloud/ocis/proxy/pkg/flagset"
+	"github.com/owncloud/ocis/proxy/pkg/metrics"
+	"github.com/owncloud/ocis/proxy/pkg/middleware"
+	"github.com/owncloud/ocis/proxy/pkg/proxy"
+	"github.com/owncloud/ocis/proxy/pkg/server/debug"
+	proxyHTTP "github.com/owncloud/ocis/proxy/pkg/server/http"
 	settings "github.com/owncloud/ocis-settings/pkg/proto/v0"
 	storepb "github.com/owncloud/ocis-store/pkg/proto/v0"
 	"go.opencensus.io/stats/view"
@@ -256,7 +256,7 @@ func loadMiddlewares(ctx context.Context, l log.Logger, cfg *config.Config) alic
 	)
 
 	// TODO this won't work with a registry other than mdns. Look into Micro's client initialization.
-	// https://github.com/owncloud/ocis-proxy/issues/38
+	// https://github.com/owncloud/ocis/proxy/issues/38
 	accounts := acc.NewAccountsService("com.owncloud.api.accounts", mclient.DefaultClient)
 	roles := settings.NewRoleService("com.owncloud.api.settings", mclient.DefaultClient)
 

proxy/pkg/flagset/flagset.go

@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis-proxy/pkg/config"
+	"github.com/owncloud/ocis/proxy/pkg/config"
 )
 
 // RootWithConfig applies cfg to the root flagset

proxy/pkg/middleware/account_uuid_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/owncloud/ocis-accounts/pkg/proto/v0"
 	"github.com/owncloud/ocis-pkg/v2/log"
 	"github.com/owncloud/ocis-pkg/v2/oidc"
-	"github.com/owncloud/ocis-proxy/pkg/config"
+	"github.com/owncloud/ocis/proxy/pkg/config"
 	settings "github.com/owncloud/ocis-settings/pkg/proto/v0"
 )
 

proxy/pkg/middleware/openidconnect.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/coreos/go-oidc"
 	ocisoidc "github.com/owncloud/ocis-pkg/v2/oidc"
-	"github.com/owncloud/ocis-proxy/pkg/cache"
+	"github.com/owncloud/ocis/proxy/pkg/cache"
 	"golang.org/x/oauth2"
 )
 

proxy/pkg/middleware/options.go

@@ -7,7 +7,7 @@ import (
 	gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
 	acc "github.com/owncloud/ocis-accounts/pkg/proto/v0"
 	"github.com/owncloud/ocis-pkg/v2/log"
-	"github.com/owncloud/ocis-proxy/pkg/config"
+	"github.com/owncloud/ocis/proxy/pkg/config"
 	storepb "github.com/owncloud/ocis-store/pkg/proto/v0"
 )
 

proxy/pkg/middleware/presigned_url.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/owncloud/ocis-pkg/v2/log"
 	ocisoidc "github.com/owncloud/ocis-pkg/v2/oidc"
-	"github.com/owncloud/ocis-proxy/pkg/config"
+	"github.com/owncloud/ocis/proxy/pkg/config"
 	storepb "github.com/owncloud/ocis-store/pkg/proto/v0"
 	"golang.org/x/crypto/pbkdf2"
 )

proxy/pkg/proxy/option.go

@@ -2,7 +2,7 @@ package proxy
 
 import (
 	"github.com/owncloud/ocis-pkg/v2/log"
-	"github.com/owncloud/ocis-proxy/pkg/config"
+	"github.com/owncloud/ocis/proxy/pkg/config"
 )
 
 // Option defines a single option function.

proxy/pkg/proxy/policy/selector.go

@@ -8,7 +8,7 @@ import (
 	"github.com/micro/go-micro/v2/client/grpc"
 	accounts "github.com/owncloud/ocis-accounts/pkg/proto/v0"
 	"github.com/owncloud/ocis-pkg/v2/oidc"
-	"github.com/owncloud/ocis-proxy/pkg/config"
+	"github.com/owncloud/ocis/proxy/pkg/config"
 )
 
 var (

proxy/pkg/proxy/policy/selector_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/micro/go-micro/v2/client"
 	"github.com/owncloud/ocis-accounts/pkg/proto/v0"
 	"github.com/owncloud/ocis-pkg/v2/oidc"
-	"github.com/owncloud/ocis-proxy/pkg/config"
+	"github.com/owncloud/ocis/proxy/pkg/config"
 )
 
 func TestStaticSelector(t *testing.T) {

proxy/pkg/proxy/proxy.go

@@ -8,12 +8,12 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/owncloud/ocis-proxy/pkg/proxy/policy"
+	"github.com/owncloud/ocis/proxy/pkg/proxy/policy"
 	"go.opencensus.io/plugin/ochttp/propagation/tracecontext"
 	"go.opencensus.io/trace"
 
 	"github.com/owncloud/ocis-pkg/v2/log"
-	"github.com/owncloud/ocis-proxy/pkg/config"
+	"github.com/owncloud/ocis/proxy/pkg/config"
 )
 
 // MultiHostReverseProxy extends httputil to support multiple hosts with diffent policies

proxy/pkg/proxy/proxy_integration_test.go

@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/owncloud/ocis-proxy/pkg/config"
+	"github.com/owncloud/ocis/proxy/pkg/config"
 )
 
 func TestProxyIntegration(t *testing.T) {

proxy/pkg/proxy/proxy_test.go

@@ -4,7 +4,7 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/owncloud/ocis-proxy/pkg/config"
+	"github.com/owncloud/ocis/proxy/pkg/config"
 )
 
 func TestPrefixRouteMatcher(t *testing.T) {

proxy/pkg/server/debug/option.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/owncloud/ocis-pkg/v2/log"
-	"github.com/owncloud/ocis-proxy/pkg/config"
+	"github.com/owncloud/ocis/proxy/pkg/config"
 )
 
 // Option defines a single option function.

proxy/pkg/server/debug/server.go

@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	"github.com/owncloud/ocis-pkg/v2/service/debug"
-	"github.com/owncloud/ocis-proxy/pkg/config"
-	"github.com/owncloud/ocis-proxy/pkg/version"
+	"github.com/owncloud/ocis/proxy/pkg/config"
+	"github.com/owncloud/ocis/proxy/pkg/version"
 )
 
 // Server initializes the debug service and server.

proxy/pkg/server/http/option.go

@@ -7,8 +7,8 @@ import (
 	"github.com/justinas/alice"
 	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-pkg/v2/log"
-	"github.com/owncloud/ocis-proxy/pkg/config"
-	"github.com/owncloud/ocis-proxy/pkg/metrics"
+	"github.com/owncloud/ocis/proxy/pkg/config"
+	"github.com/owncloud/ocis/proxy/pkg/metrics"
 )
 
 // Option defines a single option function.

proxy/pkg/server/http/server.go

@@ -5,8 +5,8 @@ import (
 	"os"
 
 	svc "github.com/owncloud/ocis-pkg/v2/service/http"
-	"github.com/owncloud/ocis-proxy/pkg/crypto"
-	"github.com/owncloud/ocis-proxy/pkg/version"
+	"github.com/owncloud/ocis/proxy/pkg/crypto"
+	"github.com/owncloud/ocis/proxy/pkg/version"
 )
 
 // Server initializes the http service and server.