sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump major version to v2

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
extensions/thumbnails/pkg/command/health.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"fmt"
"net/http"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config/parser"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/logging"
"github.com/urfave/cli/v2"
)
extensions/thumbnails/pkg/command/root.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"context"
"os"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/v2/extensions/thumbnails/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"
)
extensions/thumbnails/pkg/command/server.go
+9 -9
View File
@@ -5,15 +5,15 @@ import (
"fmt"
"github.com/oklog/run"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config/parser"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/logging"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/metrics"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/server/debug"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/server/grpc"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/server/http"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/tracing"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/metrics"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/server/debug"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/server/grpc"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/server/http"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/tracing"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
"github.com/urfave/cli/v2"
)
extensions/thumbnails/pkg/command/version.go
+3 -3
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/thumbnails/pkg/config"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config"
"github.com/urfave/cli/v2"
)
extensions/thumbnails/pkg/config/config.go
+1 -1
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.
extensions/thumbnails/pkg/config/defaults/defaultconfig.go
+2 -2
View File
@@ -3,8 +3,8 @@ package defaults
import (
"path"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/config/defaults"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults"
)
func FullDefaultConfig() *config.Config {
extensions/thumbnails/pkg/config/parser/parse.go
+5 -5
View File
@@ -3,12 +3,12 @@ package parser
import (
"errors"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config/defaults"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/shared"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config/defaults"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
"github.com/owncloud/ocis/ocis-pkg/config/envdecode"
"github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode"
)
// ParseConfig loads configuration from known paths.
extensions/thumbnails/pkg/logging/logging.go
+2 -2
View File
@@ -1,8 +1,8 @@
package logging
import (
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// LoggerFromConfig initializes a service-specific logger instance.
extensions/thumbnails/pkg/preprocessor/fontloader.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"path/filepath"
"time"
"github.com/owncloud/ocis/ocis-pkg/sync"
"github.com/owncloud/ocis/v2/ocis-pkg/sync"
"golang.org/x/image/font"
"golang.org/x/image/font/gofont/goregular"
"golang.org/x/image/font/opentype"
extensions/thumbnails/pkg/server/debug/option.go
+2 -2
View File
@@ -1,8 +1,8 @@
package debug
import (
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// Option defines a single option function.
extensions/thumbnails/pkg/server/debug/server.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"io"
"net/http"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/service/debug"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/v2/extensions/thumbnails/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.
extensions/thumbnails/pkg/server/grpc/option.go
+3 -3
View File
@@ -3,9 +3,9 @@ package grpc
import (
"context"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/metrics"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/metrics"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/urfave/cli/v2"
)
extensions/thumbnails/pkg/server/grpc/server.go
+7 -7
View File
@@ -2,13 +2,13 @@ package grpc
import (
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
svc "github.com/owncloud/ocis/extensions/thumbnails/pkg/service/grpc/v0"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/service/grpc/v0/decorators"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/imgsource"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/storage"
"github.com/owncloud/ocis/ocis-pkg/service/grpc"
"github.com/owncloud/ocis/ocis-pkg/version"
thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v0"
svc "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/service/grpc/v0"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/service/grpc/v0/decorators"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/thumbnail/imgsource"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/thumbnail/storage"
"github.com/owncloud/ocis/v2/ocis-pkg/service/grpc"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
thumbnailssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/thumbnails/v0"
)
// NewService initializes the grpc service and server.
extensions/thumbnails/pkg/server/http/option.go
+3 -3
View File
@@ -3,9 +3,9 @@ package http
import (
"context"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/metrics"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/metrics"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/urfave/cli/v2"
)
extensions/thumbnails/pkg/server/http/server.go
+5 -5
View File
@@ -2,11 +2,11 @@ package http
import (
"github.com/go-chi/chi/v5/middleware"
svc "github.com/owncloud/ocis/extensions/thumbnails/pkg/service/http/v0"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/storage"
ocismiddleware "github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/ocis-pkg/service/http"
"github.com/owncloud/ocis/ocis-pkg/version"
svc "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/service/http/v0"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/thumbnail/storage"
ocismiddleware "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"
)
extensions/thumbnails/pkg/service/grpc/v0/decorators/base.go
+1 -1
View File
@@ -3,7 +3,7 @@ package decorators
import (
"context"
thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v0"
thumbnailssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/thumbnails/v0"
)
// Interface acting as facade, holding all the interfaces that this
extensions/thumbnails/pkg/service/grpc/v0/decorators/instrument.go
+2 -2
View File
@@ -3,8 +3,8 @@ package decorators
import (
"context"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/metrics"
thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v0"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/metrics"
thumbnailssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/thumbnails/v0"
"github.com/prometheus/client_golang/prometheus"
)
extensions/thumbnails/pkg/service/grpc/v0/decorators/logging.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"context"
"time"
"github.com/owncloud/ocis/ocis-pkg/log"
thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v0"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
thumbnailssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/thumbnails/v0"
)
// NewLogging returns a service that logs messages.
extensions/thumbnails/pkg/service/grpc/v0/decorators/tracing.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"go.opentelemetry.io/otel/trace"
thumbnailsTracing "github.com/owncloud/ocis/extensions/thumbnails/pkg/tracing"
thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v0"
thumbnailsTracing "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/tracing"
thumbnailssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/thumbnails/v0"
"go.opentelemetry.io/otel/attribute"
)
extensions/thumbnails/pkg/service/grpc/v0/option.go
+4 -4
View File
@@ -5,10 +5,10 @@ import (
gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/imgsource"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/storage"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/thumbnail/imgsource"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/thumbnail/storage"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// Option defines a single option function.
extensions/thumbnails/pkg/service/grpc/v0/service.go
+8 -8
View File
@@ -14,14 +14,14 @@ import (
revactx "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/cs3org/reva/v2/pkg/storagespace"
"github.com/golang-jwt/jwt/v4"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/preprocessor"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/service/grpc/v0/decorators"
tjwt "github.com/owncloud/ocis/extensions/thumbnails/pkg/service/jwt"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/imgsource"
"github.com/owncloud/ocis/ocis-pkg/log"
thumbnailsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/thumbnails/v0"
thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v0"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/preprocessor"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/service/grpc/v0/decorators"
tjwt "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/service/jwt"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/thumbnail"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/thumbnail/imgsource"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
thumbnailsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/thumbnails/v0"
thumbnailssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/thumbnails/v0"
"github.com/pkg/errors"
merrors "go-micro.dev/v4/errors"
"google.golang.org/grpc/metadata"
extensions/thumbnails/pkg/service/http/v0/instrument.go
+1 -1
View File
@@ -3,7 +3,7 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/metrics"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/metrics"
)
// NewInstrument returns a service that instruments metrics.
extensions/thumbnails/pkg/service/http/v0/logging.go
+1 -1
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.
extensions/thumbnails/pkg/service/http/v0/option.go
+3 -3
View File
@@ -3,9 +3,9 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/storage"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/thumbnail/storage"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// Option defines a single option function.
extensions/thumbnails/pkg/service/http/v0/service.go
+4 -4
View File
@@ -9,10 +9,10 @@ import (
"github.com/go-chi/chi/v5"
"github.com/golang-jwt/jwt/v4"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
tjwt "github.com/owncloud/ocis/extensions/thumbnails/pkg/service/jwt"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config"
tjwt "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/service/jwt"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/thumbnail"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
type contextKey string
extensions/thumbnails/pkg/service/http/v0/tracing.go
+1 -1
View File
@@ -3,7 +3,7 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/v2/ocis-pkg/middleware"
)
// NewTracing returns a service that instruments traces.
extensions/thumbnails/pkg/thumbnail/imgsource/cs3.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
revactx "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/cs3org/reva/v2/pkg/rhttp"
"github.com/cs3org/reva/v2/pkg/storagespace"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config"
"github.com/pkg/errors"
"google.golang.org/grpc/metadata"
)
extensions/thumbnails/pkg/thumbnail/imgsource/filesystem.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"os"
"path/filepath"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config"
"github.com/pkg/errors"
)
extensions/thumbnails/pkg/thumbnail/imgsource/webdav.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"io"
"net/http"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config"
"github.com/pkg/errors"
)
extensions/thumbnails/pkg/thumbnail/storage/filesystem.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"path/filepath"
"strconv"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/pkg/errors"
)
extensions/thumbnails/pkg/thumbnail/thumbnail.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"image/gif"
"mime"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/storage"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/thumbnail/storage"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
var (
extensions/thumbnails/pkg/thumbnail/thumbnail_test.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"path/filepath"
"testing"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/storage"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/thumbnail/storage"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
type NoOpManager struct {
extensions/thumbnails/pkg/tracing/tracing.go
+2 -2
View File
@@ -1,8 +1,8 @@
package tracing
import (
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config"
pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing"
"go.opentelemetry.io/otel/trace"
)