chore: clean up

Signed-off-by: chohee <cc5281@126.com>

Author: ChoHee15

cmd/manager/cmd/root.go

@@ -101,10 +101,6 @@ func init() {
 // initDfpath initializes dfpath.
 func initDfpath(cfg *config.ServerConfig) (dfpath.Dfpath, error) {
 	var options []dfpath.Option
-	if cfg.WorkHome != "" {
-		options = append(options, dfpath.WithWorkHome(cfg.WorkHome))
-	}
-
 	if cfg.LogDir != "" {
 		options = append(options, dfpath.WithLogDir(cfg.LogDir))
 	}
@@ -117,10 +113,6 @@ func initDfpath(cfg *config.ServerConfig) (dfpath.Dfpath, error) {
 		options = append(options, dfpath.WithPluginDir(cfg.PluginDir))
 	}
 
-	if cfg.DataDir != "" {
-		options = append(options, dfpath.WithDataDir(cfg.DataDir))
-	}
-
 	return dfpath.New(options...)
 }
 

cmd/scheduler/cmd/root.go

@@ -100,10 +100,6 @@ func init() {
 
 func initDfpath(cfg *config.ServerConfig) (dfpath.Dfpath, error) {
 	var options []dfpath.Option
-	if cfg.WorkHome != "" {
-		options = append(options, dfpath.WithWorkHome(cfg.WorkHome))
-	}
-
 	if cfg.LogDir != "" {
 		options = append(options, dfpath.WithLogDir(cfg.LogDir))
 	}

go.mod

@@ -280,6 +280,3 @@ require (
 	gorm.io/driver/sqlserver v1.4.1 // indirect
 	gorm.io/plugin/dbresolver v1.3.0 // indirect
 )
-
-// use local api repo
-replace d7y.io/api/v2 => ../api_fork

go.sum

@@ -63,6 +63,8 @@ cloud.google.com/go/storage v1.50.0 h1:3TbVkzTooBvnZsk7WaAQfOsNrdoM8QHusXA1cpk6Q
 cloud.google.com/go/storage v1.50.0/go.mod h1:l7XeiD//vx5lfqE3RavfmU9yvk5Pp0Zhcv482poyafY=
 cloud.google.com/go/trace v1.11.6 h1:2O2zjPzqPYAHrn3OKl029qlqG6W8ZdYaOWRyr8NgMT4=
 cloud.google.com/go/trace v1.11.6/go.mod h1:GA855OeDEBiBMzcckLPE2kDunIpC72N+Pq8WFieFjnI=
+d7y.io/api/v2 v2.1.60 h1:Imk1mw30wmTJNdqKFF5VO/eqI/t1H5PfIPPK4ryKX2U=
+d7y.io/api/v2 v2.1.60/go.mod h1:WzakPywEgs27gr/TwrlRarPRRK2o5nN0YrTzHDdFii8=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=

manager/config/config.go

@@ -67,9 +67,6 @@ type ServerConfig struct {
 	// Server name.
 	Name string `yaml:"name" mapstructure:"name"`
 
-	// Server work home directory.
-	WorkHome string `yaml:"workHome" mapstructure:"workHome"`
-
 	// Server dynamic config cache directory.
 	CacheDir string `yaml:"cacheDir" mapstructure:"cacheDir"`
 
@@ -91,9 +88,6 @@ type ServerConfig struct {
 	// Server plugin directory.
 	PluginDir string `yaml:"pluginDir" mapstructure:"pluginDir"`
 
-	// Server data directory.
-	DataDir string `yaml:"dataDir" mapstructure:"dataDir"`
-
 	// GRPC server configuration.
 	GRPC GRPCConfig `yaml:"grpc" mapstructure:"grpc"`
 
@@ -409,17 +403,18 @@ type NetworkConfig struct {
 	EnableIPv6 bool `mapstructure:"enableIPv6" yaml:"enableIPv6"`
 }
 
+// AES256 base64 key is 32 bytes.
 type EncryptionKey [32]byte
 type EncryptionConfig struct {
+	// Enable encryption.
 	Enable bool `mapstructure:"enable" yaml:"enable"`
 	// AES256 base64, optional
 	Key *EncryptionKey `mapstructure:"key" yaml:"key"`
 }
 
 // UnmarshalText Base64
 func (e *EncryptionKey) UnmarshalText(text []byte) error {
-	// TODO: avoid printing key
-	logger.Infof("base64 key str: %s", string(text))
+	logger.Debugf("base64 key str: %s", string(text))
 	keyBytes, err := base64.StdEncoding.DecodeString(string(text))
 	if err != nil {
 		return fmt.Errorf("invalid base64 key: %v", err)

manager/manager.go

@@ -265,7 +265,7 @@ func registerGCTasks(gc pkggc.GC, db *gorm.DB) error {
 	return nil
 }
 
-// initializeEncryptionKey
+// Initialize encryption key
 func initializeEncryptionKey(cfg *config.Config, db *gorm.DB) error {
 	// 1. try get key from db
 	var existingKey models.EncryptionKey

scheduler/config/config.go

@@ -85,9 +85,6 @@ type ServerConfig struct {
 	// TLS server configuration.
 	TLS *GRPCTLSServerConfig `yaml:"tls" mapstructure:"tls"`
 
-	// Server work home directory.
-	WorkHome string `yaml:"workHome" mapstructure:"workHome"`
-
 	// Server dynamic config cache directory.
 	CacheDir string `yaml:"cacheDir" mapstructure:"cacheDir"`