konnectd working

konnectd/go.mod

@@ -3,30 +3,32 @@ module github.com/owncloud/ocis/konnectd
 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/UnnoTed/fileb0x v1.1.4
-	github.com/go-chi/chi v4.0.2+incompatible
+	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/gorilla/mux v1.7.4
 	github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5
 	github.com/mattn/go-colorable v0.1.2 // indirect
-	github.com/micro/cli/v2 v2.1.1
+	github.com/micro/cli/v2 v2.1.2
 	github.com/oklog/run v1.0.0
 	github.com/openzipkin/zipkin-go v0.2.2
 	github.com/owncloud/flaex v0.2.0
-	github.com/owncloud/ocis-pkg/v2 v2.0.3-0.20200309150924-5c659fd4b0ad
+	github.com/owncloud/ocis/ocis-pkg v0.0.0-00010101000000-000000000000
 	github.com/restic/calens v0.2.0
-	github.com/rs/zerolog v1.17.2
+	github.com/rs/zerolog v1.19.0
 	github.com/sirupsen/logrus v1.4.2
-	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-20200202094626-16171245cfb2
+	github.com/spf13/viper v1.6.3
+	go.opencensus.io v0.22.4
+	golang.org/x/net v0.0.0-20200625001655-4c5254603344
 	stash.kopano.io/kc/konnect v0.30.0
 	stash.kopano.io/kgol/rndm v1.1.0
 )
 
-replace google.golang.org/grpc => google.golang.org/grpc v1.26.0
+replace (
+	github.com/owncloud/ocis/ocis-pkg => ../ocis-pkg
+	google.golang.org/grpc => google.golang.org/grpc v1.26.0
+)

konnectd/pkg/assets/assets.go

@@ -6,7 +6,7 @@ import (
 	"path"
 
 	"github.com/owncloud/ocis/konnectd/pkg/config"
-	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 )
 
 //go:generate go run github.com/UnnoTed/fileb0x embed.yml

konnectd/pkg/assets/option.go

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

konnectd/pkg/command/root.go

@@ -8,7 +8,7 @@ import (
 	"github.com/owncloud/ocis/konnectd/pkg/config"
 	"github.com/owncloud/ocis/konnectd/pkg/flagset"
 	"github.com/owncloud/ocis/konnectd/pkg/version"
-	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/spf13/viper"
 )
 

konnectd/pkg/crypto/gencert.go

@@ -12,7 +12,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 )
 
 func publicKey(priv interface{}) interface{} {

konnectd/pkg/server/debug/option.go

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

konnectd/pkg/server/debug/server.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/owncloud/ocis/konnectd/pkg/config"
 	"github.com/owncloud/ocis/konnectd/pkg/version"
-	"github.com/owncloud/ocis-pkg/v2/service/debug"
+	"github.com/owncloud/ocis/ocis-pkg/service/debug"
 )
 
 // Server initializes the debug service and server.

konnectd/pkg/server/http/option.go

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

konnectd/pkg/server/http/server.go

@@ -7,8 +7,8 @@ import (
 	"github.com/owncloud/ocis/konnectd/pkg/crypto"
 	svc "github.com/owncloud/ocis/konnectd/pkg/service/v0"
 	"github.com/owncloud/ocis/konnectd/pkg/version"
-	"github.com/owncloud/ocis-pkg/v2/middleware"
-	"github.com/owncloud/ocis-pkg/v2/service/http"
+	"github.com/owncloud/ocis/ocis-pkg/middleware"
+	"github.com/owncloud/ocis/ocis-pkg/service/http"
 )
 
 // Server initializes the http service and server.

konnectd/pkg/service/v0/logging.go

@@ -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.

konnectd/pkg/service/v0/option.go

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

konnectd/pkg/service/v0/service.go

@@ -14,7 +14,7 @@ import (
 	"github.com/owncloud/ocis/konnectd/pkg/config"
 	logw "github.com/owncloud/ocis/konnectd/pkg/log"
 	"github.com/owncloud/ocis/konnectd/pkg/middleware"
-	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"stash.kopano.io/kc/konnect/bootstrap"
 	kcconfig "stash.kopano.io/kc/konnect/config"
 	"stash.kopano.io/kc/konnect/server"

konnectd/pkg/service/v0/tracing.go

@@ -3,7 +3,7 @@ package svc
 import (
 	"net/http"
 
-	"github.com/owncloud/ocis-pkg/v2/middleware"
+	"github.com/owncloud/ocis/ocis-pkg/middleware"
 )
 
 // NewTracing returns a service that instruments traces.