glauth working

glauth/CHANGELOG.md

@@ -33,7 +33,7 @@ The following sections list the changes in ocis-glauth unreleased.
 
    https://github.com/owncloud/ocis/glauth/issues/28
    https://github.com/owncloud/ocis/glauth/pull/29
-   https://github.com/owncloud/ocis-accounts/pull/68
+   https://github.com/owncloud/ocis/accounts/pull/68
 
 
 * Bugfix - Use searchBaseDN if already a user/group name: [#214](https://github.com/owncloud/product/issues/214)

glauth/changelog/unreleased/fix-int-queries.md

@@ -4,4 +4,4 @@ Some LDAP properties like `uidnumber` and `gidnumber` are numeric. When an OS tr
 
 https://github.com/owncloud/ocis/glauth/issues/28
 https://github.com/owncloud/ocis/glauth/pull/29
-https://github.com/owncloud/ocis-accounts/pull/68
+https://github.com/owncloud/ocis/accounts/pull/68

glauth/go.mod

@@ -3,7 +3,7 @@ module github.com/owncloud/ocis/glauth
 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.7.0
 	contrib.go.opencensus.io/exporter/zipkin v0.1.1
 	github.com/GeertJohan/yubigo v0.0.0-20190917122436-175bc097e60e
@@ -11,18 +11,21 @@ require (
 	github.com/glauth/glauth v1.1.3-0.20200228160118-2d4f5d547682
 	github.com/go-logr/logr v0.1.0
 	github.com/micro/cli/v2 v2.1.2
-	github.com/micro/go-micro/v2 v2.6.0
+	github.com/micro/go-micro/v2 v2.9.1
 	github.com/nmcclain/asn1-ber v0.0.0-20170104154839-2661553a0484
 	github.com/nmcclain/ldap v0.0.0-20191021200707-3b3b69a7e9e3
 	github.com/oklog/run v1.1.0
 	github.com/openzipkin/zipkin-go v0.2.2
-	github.com/owncloud/ocis-accounts v0.1.2-0.20200710152724-fa35a81beb2f
-	github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170
+	github.com/owncloud/ocis/accounts v0.0.0-20200918125107-fcca9faa81c8
+	github.com/owncloud/ocis/ocis-pkg v0.0.0-20200918114005-1a0ddd2190ee
 	github.com/restic/calens v0.2.0
 	github.com/rs/zerolog v1.19.0
 	github.com/spf13/viper v1.7.0
 	go.opencensus.io v0.22.4
-	golang.org/x/tools v0.0.0-20200427214658-4697a2867c88 // indirect
 )
 
-replace google.golang.org/grpc => google.golang.org/grpc v1.26.0
+replace (
+	github.com/owncloud/ocis/accounts => ../accounts
+	github.com/owncloud/ocis/ocis-pkg => ../ocis-pkg
+	google.golang.org/grpc => google.golang.org/grpc v1.26.0
+)

glauth/pkg/command/root.go

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

glauth/pkg/command/server.go

@@ -20,7 +20,7 @@ import (
 	"github.com/oklog/run"
 	openzipkin "github.com/openzipkin/zipkin-go"
 	zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http"
-	accounts "github.com/owncloud/ocis-accounts/pkg/proto/v0"
+	accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
 	"github.com/owncloud/ocis/glauth/pkg/config"
 	"github.com/owncloud/ocis/glauth/pkg/flagset"
 	"github.com/owncloud/ocis/glauth/pkg/server/debug"

glauth/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{} {

glauth/pkg/mlogr/mlogr.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"github.com/go-logr/logr"
-	plog "github.com/owncloud/ocis-pkg/v2/log"
+	plog "github.com/owncloud/ocis/ocis-pkg/log"
 
 	"github.com/rs/zerolog"
 )

glauth/pkg/server/debug/option.go

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

glauth/pkg/server/debug/server.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/owncloud/ocis/glauth/pkg/config"
 	"github.com/owncloud/ocis/glauth/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.

glauth/pkg/server/glauth/handler.go

@@ -13,8 +13,8 @@ import (
 	"github.com/glauth/glauth/pkg/stats"
 	ber "github.com/nmcclain/asn1-ber"
 	"github.com/nmcclain/ldap"
-	accounts "github.com/owncloud/ocis-accounts/pkg/proto/v0"
-	"github.com/owncloud/ocis-pkg/v2/log"
+	accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 )
 
 type queryType string

glauth/pkg/server/glauth/option.go

@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/glauth/glauth/pkg/config"
-	accounts "github.com/owncloud/ocis-accounts/pkg/proto/v0"
-	"github.com/owncloud/ocis-pkg/v2/log"
+	accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 )
 
 // Option defines a single option function.