mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-03-03 14:57:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix ocis dependencies in graph-explorer

Browse Source
This commit is contained in:
David Christofas
2021-02-16 13:55:12 +01:00
parent 0d3d0bebf3
commit 8aa06cc3f9
12 changed files with 1252 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
graph-explorer/go.mod
View File

@@ -3,18 +3,29 @@ module github.com/owncloud/ocis/graph-explorer
go 1.13
require (
contrib.go.opencensus.io/exporter/jaeger v0.2.0
contrib.go.opencensus.io/exporter/jaeger v0.2.1
contrib.go.opencensus.io/exporter/ocagent v0.6.0
contrib.go.opencensus.io/exporter/zipkin v0.1.1
github.com/go-chi/chi v4.0.2+incompatible
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
github.com/go-chi/chi v4.1.2+incompatible
github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d // indirect
github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
github.com/micro/cli/v2 v2.1.1
github.com/oklog/run v1.0.0
github.com/huandu/xstrings v1.3.2 // indirect
github.com/micro/cli/v2 v2.1.2
github.com/mitchellh/copystructure v1.1.1 // indirect
github.com/oklog/run v1.1.0
github.com/openzipkin/zipkin-go v0.2.2
github.com/owncloud/ocis-pkg/v2 v2.0.1
github.com/spf13/afero v1.2.2 // indirect
github.com/spf13/viper v1.6.1
go.opencensus.io v0.22.2
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa
github.com/owncloud/ocis/ocis-pkg v0.0.0-20210216094451-dc73176dc62d
github.com/spf13/viper v1.7.0
go.opencensus.io v0.22.6
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
golang.org/x/mod v0.4.1 // indirect
golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect
google.golang.org/grpc/examples v0.0.0-20210212222430-425d405f3928 // indirect
honnef.co/go/tools v0.1.1 // indirect
)
replace (
github.com/owncloud/ocis/ocis-pkg => ../ocis-pkg
google.golang.org/grpc => google.golang.org/grpc v1.26.0
)

1221
graph-explorer/go.sum
View File

File diff suppressed because it is too large Load Diff

2
graph-explorer/pkg/assets/assets.go
View File

@@ -4,8 +4,8 @@ import (
"net/http"
"os"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/graph-explorer/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
)
//go:generate go run github.com/UnnoTed/fileb0x embed.yml

2
graph-explorer/pkg/assets/option.go
View File

@@ -1,8 +1,8 @@
package assets
import (
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/graph-explorer/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
)
// Option defines a single option function.

2
graph-explorer/pkg/command/root.go
View File

@@ -5,10 +5,10 @@ import (
"strings"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/graph-explorer/pkg/config"
"github.com/owncloud/ocis/graph-explorer/pkg/flagset"
"github.com/owncloud/ocis/graph-explorer/pkg/version"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/spf13/viper"
)

2
graph-explorer/pkg/server/debug/option.go
View File

@@ -3,8 +3,8 @@ package debug
import (
"context"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/graph-explorer/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
)
// Option defines a single option function.

2
graph-explorer/pkg/server/debug/server.go
View File

@@ -4,9 +4,9 @@ import (
"io"
"net/http"
"github.com/owncloud/ocis-pkg/v2/service/debug"
"github.com/owncloud/ocis/graph-explorer/pkg/config"
"github.com/owncloud/ocis/graph-explorer/pkg/version"
"github.com/owncloud/ocis/ocis-pkg/service/debug"
)
// Server initializes the debug service and server.

2
graph-explorer/pkg/server/http/option.go
View File

@@ -4,7 +4,7 @@ import (
"context"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/graph-explorer/pkg/config"
"github.com/owncloud/ocis/graph-explorer/pkg/metrics"
)

6
graph-explorer/pkg/server/http/server.go
View File

@@ -1,10 +1,10 @@
package http
import (
"github.com/owncloud/ocis-pkg/v2/middleware"
"github.com/owncloud/ocis-pkg/v2/service/http"
svc "github.com/owncloud/ocis/graph-explorer/pkg/service/v0"
"github.com/owncloud/ocis/graph-explorer/pkg/version"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/ocis-pkg/service/http"
)
// Server initializes the http service and server.
@@ -27,7 +27,7 @@ func Server(opts ...Option) (http.Service, error) {
svc.Middleware(
middleware.RealIP,
middleware.RequestID,
middleware.Cache,
middleware.NoCache,
middleware.Cors,
middleware.Secure,
middleware.Version(

2
graph-explorer/pkg/service/v0/logging.go
View File

@@ -3,7 +3,7 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
)
// NewLogging returns a service that logs messages.

2
graph-explorer/pkg/service/v0/option.go
View File

@@ -3,8 +3,8 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/graph-explorer/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
)
// Option defines a single option function.

2
graph-explorer/pkg/service/v0/service.go
View File

@@ -7,9 +7,9 @@ import (
"strings"
"github.com/go-chi/chi"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/graph-explorer/pkg/assets"
"github.com/owncloud/ocis/graph-explorer/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
)
// Service defines the extension handlers.