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

Merge pull request #3667 from owncloud/rename-storage-system

Browse Source 
storage-metadata -> storage-system
This commit is contained in:
Jörn Friedrich Dreyer
2022-05-04 08:54:20 +00:00
committed by GitHub
parent b847dd6b63 565548ebce
commit a22cfe6cee
42 changed files with 203 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/accounts/pkg/service/v0/service.go
+1 -1
View File
@@ -66,7 +66,7 @@ func New(opts ...Option) (s *Service, err error) {
r := oreg.GetRegistry()
if cfg.Repo.Backend == "cs3" {
if _, err := r.GetService("com.owncloud.storage.metadata"); err != nil {
logger.Error().Err(err).Msg("index: storage-metadata service not present")
logger.Error().Err(err).Msg("index: storage-system service not present")
return nil, err
}
}
extensions/storage-metadata/cmd/storage-metadata/main.go
-14
View File
@@ -1,14 +0,0 @@
package main
import (
"os"
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/command"
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/config/defaults"
)
func main() {
if err := command.Execute(defaults.DefaultConfig()); err != nil {
os.Exit(1)
}
}
extensions/storage-metadata/pkg/config/config.go
-79
View File
@@ -1,79 +0,0 @@
package config
import (
"context"
"github.com/owncloud/ocis/ocis-pkg/shared"
)
type Config struct {
*shared.Commons `yaml:"-"`
Service Service `yaml:"-"`
Tracing *Tracing `yaml:"tracing"`
Log *Log `yaml:"log"`
Debug Debug `yaml:"debug"`
GRPC GRPCConfig `yaml:"grpc"`
HTTP HTTPConfig `yaml:"http"`
TokenManager *TokenManager `yaml:"token_manager"`
Reva *Reva `yaml:"reva"`
MachineAuthAPIKey string `yaml:"machine_auth_api_key" env:"STORAGE_METADATA_MACHINE_AUTH_API_KEY"`
MetadataUserID string `yaml:"metadata_user_id"`
SkipUserGroupsInToken bool `yaml:"skip_user_groups_in_token" env:"STORAGE_METADATA_SKIP_USER_GROUPS_IN_TOKEN"`
Driver string `yaml:"driver" env:"STORAGE_METADATA_DRIVER" desc:"The driver which should be used by the service"`
Drivers Drivers `yaml:"drivers"`
DataServerURL string `yaml:"data_server_url" env:"STORAGE_METADATA_DATA_SERVER_URL"`
TempFolder string `yaml:"temp_folder" env:"STORAGE_METADATA_TEMP_FOLDER"`
DataProviderInsecure bool `yaml:"data_provider_insecure" env:"OCIS_INSECURE;STORAGE_METADATA_DATAPROVIDER_INSECURE"`
Supervised bool `yaml:"-"`
Context context.Context `yaml:"-"`
}
type Tracing struct {
Enabled bool `yaml:"enabled" env:"OCIS_TRACING_ENABLED;STORAGE_METADATA_TRACING_ENABLED" desc:"Activates tracing."`
Type string `yaml:"type" env:"OCIS_TRACING_TYPE;STORAGE_METADATA_TRACING_TYPE"`
Endpoint string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;STORAGE_METADATA_TRACING_ENDPOINT" desc:"The endpoint to the tracing collector."`
Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;STORAGE_METADATA_TRACING_COLLECTOR"`
}
type Log struct {
Level string `yaml:"level" env:"OCIS_LOG_LEVEL;STORAGE_METADATA_LOG_LEVEL" desc:"The log level."`
Pretty bool `yaml:"pretty" env:"OCIS_LOG_PRETTY;STORAGE_METADATA_LOG_PRETTY" desc:"Activates pretty log output."`
Color bool `yaml:"color" env:"OCIS_LOG_COLOR;STORAGE_METADATA_LOG_COLOR" desc:"Activates colorized log output."`
File string `yaml:"file" env:"OCIS_LOG_FILE;STORAGE_METADATA_LOG_FILE" desc:"The target log file."`
}
type Service struct {
Name string `yaml:"-"`
}
type Debug struct {
Addr string `yaml:"addr" env:"STORAGE_METADATA_DEBUG_ADDR"`
Token string `yaml:"token" env:"STORAGE_METADATA_DEBUG_TOKEN"`
Pprof bool `yaml:"pprof" env:"STORAGE_METADATA_DEBUG_PPROF"`
Zpages bool `yaml:"zpages" env:"STORAGE_METADATA_DEBUG_ZPAGES"`
}
type GRPCConfig struct {
Addr string `yaml:"addr" env:"STORAGE_METADATA_GRPC_ADDR" desc:"The address of the grpc service."`
Namespace string `yaml:"-"`
Protocol string `yaml:"protocol" env:"STORAGE_METADATA_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."`
}
type HTTPConfig struct {
Addr string `yaml:"addr" env:"STORAGE_METADATA_HTTP_ADDR" desc:"The address of the http service."`
Namespace string `yaml:"-"`
Protocol string `yaml:"protocol" env:"STORAGE_METADATA_HTTP_PROTOCOL" desc:"The transport protocol of the http service."`
}
type Drivers struct {
OCIS OCISDriver `yaml:"ocis"`
}
type OCISDriver struct {
// Root is the absolute path to the location of the data
Root string `yaml:"root" env:"STORAGE_METADATA_OCIS_ROOT"`
}
extensions/storage-metadata/Makefile → extensions/storage-system/Makefile
+1 -1
View File
@@ -1,5 +1,5 @@
SHELL := bash
NAME := storage-metadata
NAME := storage-system
include ../../.make/recursion.mk
extensions/storage-system/cmd/storage-system/main.go
+14
View File
@@ -0,0 +1,14 @@
package main
import (
"os"
"github.com/owncloud/ocis/extensions/storage-system/pkg/command"
"github.com/owncloud/ocis/extensions/storage-system/pkg/config/defaults"
)
func main() {
if err := command.Execute(defaults.DefaultConfig()); err != nil {
os.Exit(1)
}
}
extensions/storage-metadata/pkg/command/health.go → extensions/storage-system/pkg/command/health.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"fmt"
"net/http"
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/config"
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/config/parser"
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/logging"
"github.com/owncloud/ocis/extensions/storage-system/pkg/config"
"github.com/owncloud/ocis/extensions/storage-system/pkg/config/parser"
"github.com/owncloud/ocis/extensions/storage-system/pkg/logging"
"github.com/urfave/cli/v2"
)
extensions/storage-metadata/pkg/command/root.go → extensions/storage-system/pkg/command/root.go
+8 -8
View File
@@ -4,7 +4,7 @@ import (
"context"
"os"
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/config"
"github.com/owncloud/ocis/extensions/storage-system/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/thejerf/suture/v4"
@@ -25,11 +25,11 @@ func GetCommands(cfg *config.Config) cli.Commands {
}
}
// Execute is the entry point for the storage-metadata command.
// Execute is the entry point for the storage-system command.
func Execute(cfg *config.Config) error {
app := clihelper.DefaultApp(&cli.App{
Name: "storage-metadata",
Usage: "Provide metadata storage for oCIS",
Name: "storage-system",
Usage: "Provide system storage for oCIS",
Commands: GetCommands(cfg),
})
@@ -41,16 +41,16 @@ func Execute(cfg *config.Config) error {
return app.Run(os.Args)
}
// SutureService allows for the storage-metadata command to be embedded and supervised by a suture supervisor tree.
// SutureService allows for the storage-system command to be embedded and supervised by a suture supervisor tree.
type SutureService struct {
cfg *config.Config
}
// NewSutureService creates a new storage-metadata.SutureService
// NewSutureService creates a new storage-system.SutureService
func NewSutureService(cfg *ociscfg.Config) suture.Service {
cfg.StorageMetadata.Commons = cfg.Commons
cfg.StorageSystem.Commons = cfg.Commons
return SutureService{
cfg: cfg.StorageMetadata,
cfg: cfg.StorageSystem,
}
}
extensions/storage-metadata/pkg/command/server.go → extensions/storage-system/pkg/command/server.go
+6 -6
View File
@@ -9,12 +9,12 @@ import (
"github.com/cs3org/reva/v2/cmd/revad/runtime"
"github.com/gofrs/uuid"
"github.com/oklog/run"
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/config"
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/config/parser"
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/logging"
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/revaconfig"
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/server/debug"
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/tracing"
"github.com/owncloud/ocis/extensions/storage-system/pkg/config"
"github.com/owncloud/ocis/extensions/storage-system/pkg/config/parser"
"github.com/owncloud/ocis/extensions/storage-system/pkg/logging"
"github.com/owncloud/ocis/extensions/storage-system/pkg/revaconfig"
"github.com/owncloud/ocis/extensions/storage-system/pkg/server/debug"
"github.com/owncloud/ocis/extensions/storage-system/pkg/tracing"
"github.com/owncloud/ocis/ocis-pkg/service/external"
"github.com/owncloud/ocis/ocis-pkg/sync"
"github.com/owncloud/ocis/ocis-pkg/version"
extensions/storage-metadata/pkg/command/version.go → extensions/storage-system/pkg/command/version.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"github.com/owncloud/ocis/ocis-pkg/version"
tw "github.com/olekukonko/tablewriter"
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/config"
"github.com/owncloud/ocis/extensions/storage-system/pkg/config"
"github.com/urfave/cli/v2"
)
extensions/storage-system/pkg/config/config.go
+79
View File
@@ -0,0 +1,79 @@
package config
import (
"context"
"github.com/owncloud/ocis/ocis-pkg/shared"
)
type Config struct {
*shared.Commons `yaml:"-"`
Service Service `yaml:"-"`
Tracing *Tracing `yaml:"tracing"`
Log *Log `yaml:"log"`
Debug Debug `yaml:"debug"`
GRPC GRPCConfig `yaml:"grpc"`
HTTP HTTPConfig `yaml:"http"`
TokenManager *TokenManager `yaml:"token_manager"`
Reva *Reva `yaml:"reva"`
MachineAuthAPIKey string `yaml:"machine_auth_api_key" env:"STORAGE_SYSTEM_MACHINE_AUTH_API_KEY"`
MetadataUserID string `yaml:"metadata_user_id"`
SkipUserGroupsInToken bool `yaml:"skip_user_groups_in_token" env:"STORAGE_SYSTEM_SKIP_USER_GROUPS_IN_TOKEN"`
Driver string `yaml:"driver" env:"STORAGE_SYSTEM_DRIVER" desc:"The driver which should be used by the service"`
Drivers Drivers `yaml:"drivers"`
DataServerURL string `yaml:"data_server_url" env:"STORAGE_SYSTEM_DATA_SERVER_URL"`
TempFolder string `yaml:"temp_folder" env:"STORAGE_SYSTEM_TEMP_FOLDER"`
DataProviderInsecure bool `yaml:"data_provider_insecure" env:"OCIS_INSECURE;STORAGE_SYSTEM_DATAPROVIDER_INSECURE"`
Supervised bool `yaml:"-"`
Context context.Context `yaml:"-"`
}
type Tracing struct {
Enabled bool `yaml:"enabled" env:"OCIS_TRACING_ENABLED;STORAGE_SYSTEM_TRACING_ENABLED" desc:"Activates tracing."`
Type string `yaml:"type" env:"OCIS_TRACING_TYPE;STORAGE_SYSTEM_TRACING_TYPE"`
Endpoint string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;STORAGE_SYSTEM_TRACING_ENDPOINT" desc:"The endpoint to the tracing collector."`
Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;STORAGE_SYSTEM_TRACING_COLLECTOR"`
}
type Log struct {
Level string `yaml:"level" env:"OCIS_LOG_LEVEL;STORAGE_SYSTEM_LOG_LEVEL" desc:"The log level."`
Pretty bool `yaml:"pretty" env:"OCIS_LOG_PRETTY;STORAGE_SYSTEM_LOG_PRETTY" desc:"Activates pretty log output."`
Color bool `yaml:"color" env:"OCIS_LOG_COLOR;STORAGE_SYSTEM_LOG_COLOR" desc:"Activates colorized log output."`
File string `yaml:"file" env:"OCIS_LOG_FILE;STORAGE_SYSTEM_LOG_FILE" desc:"The target log file."`
}
type Service struct {
Name string `yaml:"-"`
}
type Debug struct {
Addr string `yaml:"addr" env:"STORAGE_SYSTEM_DEBUG_ADDR"`
Token string `yaml:"token" env:"STORAGE_SYSTEM_DEBUG_TOKEN"`
Pprof bool `yaml:"pprof" env:"STORAGE_SYSTEM_DEBUG_PPROF"`
Zpages bool `yaml:"zpages" env:"STORAGE_SYSTEM_DEBUG_ZPAGES"`
}
type GRPCConfig struct {
Addr string `yaml:"addr" env:"STORAGE_SYSTEM_GRPC_ADDR" desc:"The address of the grpc service."`
Namespace string `yaml:"-"`
Protocol string `yaml:"protocol" env:"STORAGE_SYSTEM_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."`
}
type HTTPConfig struct {
Addr string `yaml:"addr" env:"STORAGE_SYSTEM_HTTP_ADDR" desc:"The address of the http service."`
Namespace string `yaml:"-"`
Protocol string `yaml:"protocol" env:"STORAGE_SYSTEM_HTTP_PROTOCOL" desc:"The transport protocol of the http service."`
}
type Drivers struct {
OCIS OCISDriver `yaml:"ocis"`
}
type OCISDriver struct {
// Root is the absolute path to the location of the data
Root string `yaml:"root" env:"STORAGE_SYSTEM_OCIS_ROOT"`
}
extensions/storage-metadata/pkg/config/defaults/defaultconfig.go → extensions/storage-system/pkg/config/defaults/defaultconfig.go
+2 -2
View File
@@ -3,7 +3,7 @@ package defaults
import (
"path/filepath"
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/config"
"github.com/owncloud/ocis/extensions/storage-system/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/config/defaults"
)
@@ -33,7 +33,7 @@ func DefaultConfig() *config.Config {
Protocol: "tcp",
},
Service: config.Service{
Name: "storage-metadata",
Name: "storage-system",
},
Reva: &config.Reva{
Address: "127.0.0.1:9142",
extensions/storage-metadata/pkg/config/parser/parse.go → extensions/storage-system/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,8 +3,8 @@ package parser
import (
"errors"
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/config"
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/config/defaults"
"github.com/owncloud/ocis/extensions/storage-system/pkg/config"
"github.com/owncloud/ocis/extensions/storage-system/pkg/config/defaults"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/shared"
extensions/storage-metadata/pkg/config/reva.go → extensions/storage-system/pkg/config/reva.go
+1 -1
View File
@@ -7,5 +7,5 @@ type Reva struct {
// TokenManager is the config for using the reva token manager
type TokenManager struct {
JWTSecret string `yaml:"jwt_secret" env:"OCIS_JWT_SECRET;STORAGE_METADATA_JWT_SECRET"`
JWTSecret string `yaml:"jwt_secret" env:"OCIS_JWT_SECRET;STORAGE_SYSTEM_JWT_SECRET"`
}
extensions/storage-metadata/pkg/logging/logging.go → extensions/storage-system/pkg/logging/logging.go
+1 -1
View File
@@ -1,7 +1,7 @@
package logging
import (
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/config"
"github.com/owncloud/ocis/extensions/storage-system/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
)
extensions/storage-metadata/pkg/revaconfig/config.go → extensions/storage-system/pkg/revaconfig/config.go
+1 -1
View File
@@ -2,7 +2,7 @@ package revaconfig
import (
userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/config"
"github.com/owncloud/ocis/extensions/storage-system/pkg/config"
)
// StorageMetadataFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service.
extensions/storage-metadata/pkg/server/debug/option.go → extensions/storage-system/pkg/server/debug/option.go
+1 -1
View File
@@ -3,7 +3,7 @@ package debug
import (
"context"
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/config"
"github.com/owncloud/ocis/extensions/storage-system/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
)
extensions/storage-metadata/pkg/server/debug/server.go → extensions/storage-system/pkg/server/debug/server.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"io"
"net/http"
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/config"
"github.com/owncloud/ocis/extensions/storage-system/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/service/debug"
"github.com/owncloud/ocis/ocis-pkg/version"
)
extensions/storage-metadata/pkg/tracing/tracing.go → extensions/storage-system/pkg/tracing/tracing.go
+1 -1
View File
@@ -1,7 +1,7 @@
package tracing
import (
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/config"
"github.com/owncloud/ocis/extensions/storage-system/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/tracing"
"go.opentelemetry.io/otel/trace"