fix ocis dependencies in graph

This commit is contained in:
David Christofas
2021-02-16 13:55:34 +01:00
parent 8aa06cc3f9
commit 9e5858ccab
11 changed files with 540 additions and 117 deletions
+1 -1
View File
@@ -3,8 +3,8 @@ package debug
import (
"context"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/graph/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
)
// Option defines a single option function.
+1 -1
View File
@@ -4,9 +4,9 @@ import (
"io"
"net/http"
"github.com/owncloud/ocis-pkg/v2/service/debug"
"github.com/owncloud/ocis/graph/pkg/config"
"github.com/owncloud/ocis/graph/pkg/version"
"github.com/owncloud/ocis/ocis-pkg/service/debug"
)
// Server initializes the debug service and server.
+1 -1
View File
@@ -4,9 +4,9 @@ import (
"context"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/graph/pkg/config"
"github.com/owncloud/ocis/graph/pkg/metrics"
"github.com/owncloud/ocis/ocis-pkg/log"
)
// Option defines a single option function.
+4 -4
View File
@@ -1,11 +1,11 @@
package http
import (
"github.com/owncloud/ocis-pkg/v2/middleware"
"github.com/owncloud/ocis-pkg/v2/oidc"
"github.com/owncloud/ocis-pkg/v2/service/http"
svc "github.com/owncloud/ocis/graph/pkg/service/v0"
"github.com/owncloud/ocis/graph/pkg/version"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/ocis-pkg/oidc"
"github.com/owncloud/ocis/ocis-pkg/service/http"
)
// Server initializes the http service and server.
@@ -28,7 +28,7 @@ func Server(opts ...Option) (http.Service, error) {
svc.Middleware(
middleware.RealIP,
middleware.RequestID,
middleware.Cache,
middleware.NoCache,
middleware.Cors,
middleware.Secure,
middleware.Version(