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

refactor extensions -> services

Browse Source 
Signed-off-by: Christian Richter <crichter@owncloud.com>
This commit is contained in:
Christian Richter
2022-06-27 14:05:36 +02:00
parent 78064e6bab
commit f8f1320501
612 changed files with 1080 additions and 1080 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/idp/pkg/assets/option.go
+2 -2
View File
@@ -3,10 +3,10 @@ package assets
import (
"net/http"
"github.com/owncloud/ocis/v2/extensions/idp"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/assetsfs"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/idp"
"github.com/owncloud/ocis/v2/services/idp/pkg/config"
)
// New returns a new http filesystem to serve assets.
services/idp/pkg/backends/cs3/bootstrap/cs3.go
+1 -1
View File
@@ -25,7 +25,7 @@ import (
"github.com/libregraph/lico/identifier"
"github.com/libregraph/lico/identity"
"github.com/libregraph/lico/identity/managers"
cs3 "github.com/owncloud/ocis/v2/extensions/idp/pkg/backends/cs3/identifier"
cs3 "github.com/owncloud/ocis/v2/services/idp/pkg/backends/cs3/identifier"
)
// Identity managers.
services/idp/pkg/command/health.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"fmt"
"net/http"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/config"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/logging"
"github.com/owncloud/ocis/v2/services/idp/pkg/config"
"github.com/owncloud/ocis/v2/services/idp/pkg/config/parser"
"github.com/owncloud/ocis/v2/services/idp/pkg/logging"
"github.com/urfave/cli/v2"
)
services/idp/pkg/command/root.go
+1 -1
View File
@@ -4,9 +4,9 @@ import (
"context"
"os"
"github.com/owncloud/ocis/v2/extensions/idp/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/idp/pkg/config"
"github.com/thejerf/suture/v4"
"github.com/urfave/cli/v2"
)
services/idp/pkg/command/server.go
+7 -7
View File
@@ -15,14 +15,14 @@ import (
"path/filepath"
"github.com/oklog/run"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/config"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/metrics"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/server/debug"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/server/http"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/tracing"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
"github.com/owncloud/ocis/v2/services/idp/pkg/config"
"github.com/owncloud/ocis/v2/services/idp/pkg/config/parser"
"github.com/owncloud/ocis/v2/services/idp/pkg/logging"
"github.com/owncloud/ocis/v2/services/idp/pkg/metrics"
"github.com/owncloud/ocis/v2/services/idp/pkg/server/debug"
"github.com/owncloud/ocis/v2/services/idp/pkg/server/http"
"github.com/owncloud/ocis/v2/services/idp/pkg/tracing"
"github.com/urfave/cli/v2"
)
services/idp/pkg/command/version.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"github.com/owncloud/ocis/v2/ocis-pkg/version"
tw "github.com/olekukonko/tablewriter"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/config"
"github.com/owncloud/ocis/v2/services/idp/pkg/config"
"github.com/urfave/cli/v2"
)
services/idp/pkg/config/defaults/defaultconfig.go
+1 -1
View File
@@ -4,8 +4,8 @@ import (
"path/filepath"
"strings"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults"
"github.com/owncloud/ocis/v2/services/idp/pkg/config"
)
func FullDefaultConfig() *config.Config {
services/idp/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,10 +3,10 @@ package parser
import (
"errors"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/config"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/config/defaults"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
"github.com/owncloud/ocis/v2/services/idp/pkg/config"
"github.com/owncloud/ocis/v2/services/idp/pkg/config/defaults"
"github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode"
)
services/idp/pkg/logging/logging.go
+1 -1
View File
@@ -1,8 +1,8 @@
package logging
import (
"github.com/owncloud/ocis/v2/extensions/idp/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/idp/pkg/config"
)
// LoggerFromConfig initializes a service-specific logger instance.
services/idp/pkg/middleware/static.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"net/http"
"strings"
idpTracing "github.com/owncloud/ocis/v2/extensions/idp/pkg/tracing"
idpTracing "github.com/owncloud/ocis/v2/services/idp/pkg/tracing"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes"
)
services/idp/pkg/server/debug/option.go
+1 -1
View File
@@ -3,8 +3,8 @@ package debug
import (
"context"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/idp/pkg/config"
)
// Option defines a single option function.
services/idp/pkg/server/debug/server.go
+1 -1
View File
@@ -5,11 +5,11 @@ import (
"net/http"
"net/url"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/service/debug"
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
"github.com/owncloud/ocis/v2/services/idp/pkg/config"
)
// Server initializes the debug service and server.
services/idp/pkg/server/http/option.go
+2 -2
View File
@@ -3,9 +3,9 @@ package http
import (
"context"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/config"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/metrics"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/idp/pkg/config"
"github.com/owncloud/ocis/v2/services/idp/pkg/metrics"
"github.com/urfave/cli/v2"
)
services/idp/pkg/server/http/server.go
+1 -1
View File
@@ -5,11 +5,11 @@ import (
"os"
chimiddleware "github.com/go-chi/chi/v5/middleware"
svc "github.com/owncloud/ocis/v2/extensions/idp/pkg/service/v0"
pkgcrypto "github.com/owncloud/ocis/v2/ocis-pkg/crypto"
"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/idp/pkg/service/v0"
"go-micro.dev/v4"
)
services/idp/pkg/service/v0/instrument.go
+1 -1
View File
@@ -3,7 +3,7 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/metrics"
"github.com/owncloud/ocis/v2/services/idp/pkg/metrics"
)
// NewInstrument returns a service that instruments metrics.
services/idp/pkg/service/v0/option.go
+1 -1
View File
@@ -3,8 +3,8 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/idp/pkg/config"
)
// Option defines a single option function.
services/idp/pkg/service/v0/service.go
+4 -4
View File
@@ -19,12 +19,12 @@ import (
libreGraphBackendSupport "github.com/libregraph/lico/bootstrap/backends/libregraph"
licoconfig "github.com/libregraph/lico/config"
"github.com/libregraph/lico/server"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/assets"
cs3BackendSupport "github.com/owncloud/ocis/v2/extensions/idp/pkg/backends/cs3/bootstrap"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/config"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/middleware"
"github.com/owncloud/ocis/v2/ocis-pkg/ldap"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/idp/pkg/assets"
cs3BackendSupport "github.com/owncloud/ocis/v2/services/idp/pkg/backends/cs3/bootstrap"
"github.com/owncloud/ocis/v2/services/idp/pkg/config"
"github.com/owncloud/ocis/v2/services/idp/pkg/middleware"
"gopkg.in/yaml.v2"
"stash.kopano.io/kgol/rndm"
)
services/idp/pkg/tracing/tracing.go
+1 -1
View File
@@ -1,8 +1,8 @@
package tracing
import (
"github.com/owncloud/ocis/v2/extensions/idp/pkg/config"
pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing"
"github.com/owncloud/ocis/v2/services/idp/pkg/config"
"go.opentelemetry.io/otel/trace"
)