From 91ba6980e12e85fac658ae4c3ae869be7b508f0f Mon Sep 17 00:00:00 2001 From: David Christofas Date: Wed, 5 Feb 2020 15:38:54 +0100 Subject: [PATCH] change import paths to ocis-pkg/v2 --- changelog/unreleased/correct-imports.md | 4 ++++ middleware/logger.go | 2 +- middleware/openidconnect.go | 2 +- oidc/option.go | 2 +- service/debug/option.go | 2 +- service/debug/service.go | 2 +- service/grpc/option.go | 2 +- service/http/option.go | 2 +- 8 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 changelog/unreleased/correct-imports.md diff --git a/changelog/unreleased/correct-imports.md b/changelog/unreleased/correct-imports.md new file mode 100644 index 000000000..c46796929 --- /dev/null +++ b/changelog/unreleased/correct-imports.md @@ -0,0 +1,4 @@ +Bugfix: change import paths to ocis-pkg/v2 + +Changed the import paths to the current version + diff --git a/middleware/logger.go b/middleware/logger.go index 9978dc272..0a7198b63 100644 --- a/middleware/logger.go +++ b/middleware/logger.go @@ -5,7 +5,7 @@ import ( "time" "github.com/go-chi/chi/middleware" - "github.com/owncloud/ocis-pkg/log" + "github.com/owncloud/ocis-pkg/v2/log" ) // Logger is a middleware to log http requests. diff --git a/middleware/openidconnect.go b/middleware/openidconnect.go index 7e5b92f93..fa60a091c 100644 --- a/middleware/openidconnect.go +++ b/middleware/openidconnect.go @@ -9,7 +9,7 @@ import ( "time" oidc "github.com/coreos/go-oidc" - ocisoidc "github.com/owncloud/ocis-pkg/oidc" + ocisoidc "github.com/owncloud/ocis-pkg/v2/oidc" "golang.org/x/oauth2" ) diff --git a/oidc/option.go b/oidc/option.go index b725ca8c0..c0a3d1175 100644 --- a/oidc/option.go +++ b/oidc/option.go @@ -1,7 +1,7 @@ package oidc import ( - "github.com/owncloud/ocis-pkg/log" + "github.com/owncloud/ocis-pkg/v2/log" ) // Option defines a single option function. diff --git a/service/debug/option.go b/service/debug/option.go index 958d61bf4..bdbef00f6 100644 --- a/service/debug/option.go +++ b/service/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "net/http" - "github.com/owncloud/ocis-pkg/log" + "github.com/owncloud/ocis-pkg/v2/log" ) // Option defines a single option function. diff --git a/service/debug/service.go b/service/debug/service.go index f85f9baf1..52b2d545d 100644 --- a/service/debug/service.go +++ b/service/debug/service.go @@ -5,7 +5,7 @@ import ( "net/http/pprof" "github.com/justinas/alice" - "github.com/owncloud/ocis-pkg/middleware" + "github.com/owncloud/ocis-pkg/v2/middleware" "github.com/prometheus/client_golang/prometheus/promhttp" "go.opencensus.io/zpages" ) diff --git a/service/grpc/option.go b/service/grpc/option.go index c97ab7256..6bc3005cb 100644 --- a/service/grpc/option.go +++ b/service/grpc/option.go @@ -4,7 +4,7 @@ import ( "context" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-pkg/log" + "github.com/owncloud/ocis-pkg/v2/log" ) // Option defines a single option function. diff --git a/service/http/option.go b/service/http/option.go index b2d200605..146cd1285 100644 --- a/service/http/option.go +++ b/service/http/option.go @@ -5,7 +5,7 @@ import ( "crypto/tls" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-pkg/log" + "github.com/owncloud/ocis-pkg/v2/log" ) // Option defines a single option function.