Bump major version to v2

This commit is contained in:
Michael Barz
2022-05-04 14:49:59 +02:00
parent a3c4a9d57d
commit 189987bcbd
708 changed files with 2198 additions and 2183 deletions

View File

@@ -3,8 +3,8 @@ package main
import (
"os"
"github.com/owncloud/ocis/extensions/web/pkg/command"
"github.com/owncloud/ocis/extensions/web/pkg/config/defaults"
"github.com/owncloud/ocis/v2/extensions/web/pkg/command"
"github.com/owncloud/ocis/v2/extensions/web/pkg/config/defaults"
)
func main() {

View File

@@ -3,10 +3,10 @@ package assets
import (
"net/http"
"github.com/owncloud/ocis/extensions/web"
"github.com/owncloud/ocis/extensions/web/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/assetsfs"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/web"
"github.com/owncloud/ocis/v2/extensions/web/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/assetsfs"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// New returns a new http filesystem to serve assets.

View File

@@ -4,9 +4,9 @@ import (
"fmt"
"net/http"
"github.com/owncloud/ocis/extensions/web/pkg/config"
"github.com/owncloud/ocis/extensions/web/pkg/config/parser"
"github.com/owncloud/ocis/extensions/web/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/web/pkg/config"
"github.com/owncloud/ocis/v2/extensions/web/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/web/pkg/logging"
"github.com/urfave/cli/v2"
)

View File

@@ -4,9 +4,9 @@ import (
"context"
"os"
"github.com/owncloud/ocis/extensions/web/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/v2/extensions/web/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/thejerf/suture/v4"
"github.com/urfave/cli/v2"
)

View File

@@ -7,13 +7,13 @@ import (
"io/ioutil"
"github.com/oklog/run"
"github.com/owncloud/ocis/extensions/web/pkg/config"
"github.com/owncloud/ocis/extensions/web/pkg/config/parser"
"github.com/owncloud/ocis/extensions/web/pkg/logging"
"github.com/owncloud/ocis/extensions/web/pkg/metrics"
"github.com/owncloud/ocis/extensions/web/pkg/server/debug"
"github.com/owncloud/ocis/extensions/web/pkg/server/http"
"github.com/owncloud/ocis/extensions/web/pkg/tracing"
"github.com/owncloud/ocis/v2/extensions/web/pkg/config"
"github.com/owncloud/ocis/v2/extensions/web/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/web/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/web/pkg/metrics"
"github.com/owncloud/ocis/v2/extensions/web/pkg/server/debug"
"github.com/owncloud/ocis/v2/extensions/web/pkg/server/http"
"github.com/owncloud/ocis/v2/extensions/web/pkg/tracing"
"github.com/urfave/cli/v2"
)

View File

@@ -4,11 +4,11 @@ import (
"fmt"
"os"
"github.com/owncloud/ocis/ocis-pkg/registry"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/v2/ocis-pkg/registry"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
tw "github.com/olekukonko/tablewriter"
"github.com/owncloud/ocis/extensions/web/pkg/config"
"github.com/owncloud/ocis/v2/extensions/web/pkg/config"
"github.com/urfave/cli/v2"
)

View File

@@ -3,7 +3,7 @@ package config
import (
"context"
"github.com/owncloud/ocis/ocis-pkg/shared"
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
)
// Config combines all available configuration parts.

View File

@@ -3,7 +3,7 @@ package defaults
import (
"strings"
"github.com/owncloud/ocis/extensions/web/pkg/config"
"github.com/owncloud/ocis/v2/extensions/web/pkg/config"
)
func FullDefaultConfig() *config.Config {

View File

@@ -3,11 +3,11 @@ package parser
import (
"errors"
"github.com/owncloud/ocis/extensions/web/pkg/config"
"github.com/owncloud/ocis/extensions/web/pkg/config/defaults"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/v2/extensions/web/pkg/config"
"github.com/owncloud/ocis/v2/extensions/web/pkg/config/defaults"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/config/envdecode"
"github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode"
)
// ParseConfig loads configuration from known paths.

View File

@@ -1,8 +1,8 @@
package logging
import (
"github.com/owncloud/ocis/extensions/web/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/web/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// LoggerFromConfig initializes a service-specific logger instance.

View File

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

View File

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

View File

@@ -3,9 +3,9 @@ package http
import (
"context"
"github.com/owncloud/ocis/extensions/web/pkg/config"
"github.com/owncloud/ocis/extensions/web/pkg/metrics"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/web/pkg/config"
"github.com/owncloud/ocis/v2/extensions/web/pkg/metrics"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/urfave/cli/v2"
)

View File

@@ -2,11 +2,11 @@ package http
import (
chimiddleware "github.com/go-chi/chi/v5/middleware"
webmid "github.com/owncloud/ocis/extensions/web/pkg/middleware"
svc "github.com/owncloud/ocis/extensions/web/pkg/service/v0"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/ocis-pkg/service/http"
"github.com/owncloud/ocis/ocis-pkg/version"
webmid "github.com/owncloud/ocis/v2/extensions/web/pkg/middleware"
svc "github.com/owncloud/ocis/v2/extensions/web/pkg/service/v0"
"github.com/owncloud/ocis/v2/ocis-pkg/middleware"
"github.com/owncloud/ocis/v2/ocis-pkg/service/http"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
"go-micro.dev/v4"
)

View File

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

View File

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

View File

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

View File

@@ -12,9 +12,9 @@ import (
"time"
"github.com/go-chi/chi/v5"
"github.com/owncloud/ocis/extensions/web/pkg/assets"
"github.com/owncloud/ocis/extensions/web/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/web/pkg/assets"
"github.com/owncloud/ocis/v2/extensions/web/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
var (

View File

@@ -1,8 +1,8 @@
package tracing
import (
"github.com/owncloud/ocis/extensions/web/pkg/config"
pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing"
"github.com/owncloud/ocis/v2/extensions/web/pkg/config"
pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing"
"go.opentelemetry.io/otel/trace"
)