refactor extensions -> services

Signed-off-by: Christian Richter <crichter@owncloud.com>
This commit is contained in:
Christian Richter
2022-06-20 16:49:06 +02:00
parent 78064e6bab
commit f8f1320501
612 changed files with 1080 additions and 1080 deletions
+2 -2
View File
@@ -3,10 +3,10 @@ package assets
import (
"net/http"
graphexplorer "github.com/owncloud/ocis/v2/extensions/graph-explorer"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/assetsfs"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
graphexplorer "github.com/owncloud/ocis/v2/services/graph-explorer"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/config"
)
// New returns a new http filesystem to serve assets.
@@ -4,9 +4,9 @@ import (
"fmt"
"net/http"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/logging"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/config"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/config/parser"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/logging"
"github.com/urfave/cli/v2"
)
+1 -1
View File
@@ -4,9 +4,9 @@ import (
"context"
"os"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/config"
"github.com/thejerf/suture/v4"
"github.com/urfave/cli/v2"
)
@@ -6,14 +6,14 @@ import (
"os"
"github.com/oklog/run"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/metrics"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/server/debug"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/server/http"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/tracing"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/config"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/config/parser"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/logging"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/metrics"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/server/debug"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/server/http"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/tracing"
"github.com/urfave/cli/v2"
)
@@ -8,7 +8,7 @@ import (
"github.com/owncloud/ocis/v2/ocis-pkg/version"
tw "github.com/olekukonko/tablewriter"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/config"
"github.com/urfave/cli/v2"
)
@@ -3,7 +3,7 @@ package defaults
import (
"strings"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/config"
)
func FullDefaultConfig() *config.Config {
@@ -3,9 +3,9 @@ package parser
import (
"errors"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config/defaults"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/config"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/config/defaults"
"github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode"
)
@@ -1,8 +1,8 @@
package logging
import (
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/config"
)
// LoggerFromConfig initializes a service-specific logger instance.
@@ -3,8 +3,8 @@ package debug
import (
"context"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/config"
)
// Option defines a single option function.
@@ -4,9 +4,9 @@ import (
"io"
"net/http"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/service/debug"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/config"
)
// Server initializes the debug service and server.
@@ -3,9 +3,9 @@ package http
import (
"context"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/metrics"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/config"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/metrics"
"github.com/urfave/cli/v2"
)
@@ -2,10 +2,10 @@ package http
import (
chimiddleware "github.com/go-chi/chi/v5/middleware"
svc "github.com/owncloud/ocis/v2/extensions/graph-explorer/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"
svc "github.com/owncloud/ocis/v2/services/graph-explorer/pkg/service/v0"
"go-micro.dev/v4"
)
@@ -3,7 +3,7 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/metrics"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/metrics"
)
// NewInstrument returns a service that instruments metrics.
@@ -3,8 +3,8 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/config"
)
// Option defines a single option function.
@@ -7,9 +7,9 @@ import (
"strings"
"github.com/go-chi/chi/v5"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/assets"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/assets"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/config"
)
// Service defines the extension handlers.
@@ -1,8 +1,8 @@
package tracing
import (
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config"
pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/config"
"go.opentelemetry.io/otel/trace"
)