update konnectd import paths and module name

This commit is contained in:
A.Unger
2020-09-18 13:02:16 +02:00
parent 506ba1aa51
commit ccc651a11e
32 changed files with 209 additions and 115 deletions

View File

@@ -5,7 +5,7 @@ import (
"os"
"path"
"github.com/owncloud/ocis-konnectd/pkg/config"
"github.com/owncloud/ocis/konnectd/pkg/config"
"github.com/owncloud/ocis-pkg/v2/log"
)

View File

@@ -1,7 +1,7 @@
package assets
import (
"github.com/owncloud/ocis-konnectd/pkg/config"
"github.com/owncloud/ocis/konnectd/pkg/config"
"github.com/owncloud/ocis-pkg/v2/log"
)

View File

@@ -5,8 +5,8 @@ import (
"net/http"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-konnectd/pkg/config"
"github.com/owncloud/ocis-konnectd/pkg/flagset"
"github.com/owncloud/ocis/konnectd/pkg/config"
"github.com/owncloud/ocis/konnectd/pkg/flagset"
)
// Health is the entrypoint for the health command.

View File

@@ -5,9 +5,9 @@ import (
"strings"
"github.com/micro/cli/v2"
"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/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/spf13/viper"
)

View File

@@ -14,11 +14,11 @@ import (
"github.com/oklog/run"
openzipkin "github.com/openzipkin/zipkin-go"
zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http"
"github.com/owncloud/ocis-konnectd/pkg/config"
"github.com/owncloud/ocis-konnectd/pkg/flagset"
"github.com/owncloud/ocis-konnectd/pkg/metrics"
"github.com/owncloud/ocis-konnectd/pkg/server/debug"
"github.com/owncloud/ocis-konnectd/pkg/server/http"
"github.com/owncloud/ocis/konnectd/pkg/config"
"github.com/owncloud/ocis/konnectd/pkg/flagset"
"github.com/owncloud/ocis/konnectd/pkg/metrics"
"github.com/owncloud/ocis/konnectd/pkg/server/debug"
"github.com/owncloud/ocis/konnectd/pkg/server/http"
"go.opencensus.io/stats/view"
"go.opencensus.io/trace"
)

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-konnectd/pkg/config"
"github.com/owncloud/ocis/konnectd/pkg/config"
)
// RootWithConfig applies cfg to the root flagset

View File

@@ -3,7 +3,7 @@ package debug
import (
"context"
"github.com/owncloud/ocis-konnectd/pkg/config"
"github.com/owncloud/ocis/konnectd/pkg/config"
"github.com/owncloud/ocis-pkg/v2/log"
)

View File

@@ -4,8 +4,8 @@ import (
"io"
"net/http"
"github.com/owncloud/ocis-konnectd/pkg/config"
"github.com/owncloud/ocis-konnectd/pkg/version"
"github.com/owncloud/ocis/konnectd/pkg/config"
"github.com/owncloud/ocis/konnectd/pkg/version"
"github.com/owncloud/ocis-pkg/v2/service/debug"
)

View File

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

View File

@@ -4,9 +4,9 @@ import (
"crypto/tls"
"os"
"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/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"
)

View File

@@ -3,7 +3,7 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis-konnectd/pkg/metrics"
"github.com/owncloud/ocis/konnectd/pkg/metrics"
)
// NewInstrument returns a service that instruments metrics.

View File

@@ -3,7 +3,7 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis-konnectd/pkg/config"
"github.com/owncloud/ocis/konnectd/pkg/config"
"github.com/owncloud/ocis-pkg/v2/log"
)

View File

@@ -10,10 +10,10 @@ import (
"github.com/go-chi/chi"
"github.com/gorilla/mux"
"github.com/owncloud/ocis-konnectd/pkg/assets"
"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/konnectd/pkg/assets"
"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"
"stash.kopano.io/kc/konnect/bootstrap"
kcconfig "stash.kopano.io/kc/konnect/config"