Merge pull request #2813 from owncloud/config-cleanup-1

Cleanup ocis config
owncloud · Nov 24, 2021 · 0d8ef24 · 0d8ef24
2 parents d9df490 + 36be70c
commit 0d8ef24
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 124 deletions.
diff --git a/changelog/unreleased/ocis-pkg-config-cleanup.md b/changelog/unreleased/ocis-pkg-config-cleanup.md
@@ -0,0 +1,5 @@
+Enhancement: Cleanup ocis-pkg config
+
+Certain values were of no use when configuring the ocis runtime.
+
+https://github.com/owncloud/ocis/pull/2813
diff --git a/ocis-pkg/config/config.go b/ocis-pkg/config/config.go
@@ -18,25 +18,6 @@ import (
 	webdav "github.com/owncloud/ocis/webdav/pkg/config"
 )
 
-// Debug defines the available debug configuration.
-type Debug struct {
-	Addr   string `ocisConfig:"addr"`
-	Token  string `ocisConfig:"token"`
-	Pprof  bool   `ocisConfig:"pprof"`
-	Zpages bool   `ocisConfig:"zpages"`
-}
-
-// HTTP defines the available http configuration.
-type HTTP struct {
-	Addr string `ocisConfig:"addr"`
-	Root string `ocisConfig:"root"`
-}
-
-// GRPC defines the available grpc configuration.
-type GRPC struct {
-	Addr string `ocisConfig:"addr"`
-}
-
 // Tracing defines the available tracing configuration.
 type Tracing struct {
 	Enabled   bool   `ocisConfig:"enabled"`
@@ -78,9 +59,6 @@ type Config struct {
 
 	Registry     string       `ocisConfig:"registry"`
 	Log          shared.Log   `ocisConfig:"log"`
-	Debug        Debug        `ocisConfig:"debug"`
-	HTTP         HTTP         `ocisConfig:"http"`
-	GRPC         GRPC         `ocisConfig:"grpc"`
 	Tracing      Tracing      `ocisConfig:"tracing"`
 	TokenManager TokenManager `ocisConfig:"token_manager"`
 	Runtime      Runtime      `ocisConfig:"runtime"`
@@ -121,19 +99,6 @@ func New() *Config {
 
 func DefaultConfig() *Config {
 	return &Config{
-		Debug: Debug{
-			Addr:   "127.0.0.1:9010",
-			Token:  "",
-			Pprof:  false,
-			Zpages: false,
-		},
-		HTTP: HTTP{
-			Addr: "127.0.0.1:9000",
-			Root: "/",
-		},
-		GRPC: GRPC{
-			Addr: "127.0.0.1:9001",
-		},
 		Tracing: Tracing{
 			Enabled:   false,
 			Type:      "jaeger",
@@ -232,34 +197,6 @@ func structMappings(cfg *Config) []shared.EnvBinding {
 			EnvVars:     []string{"OCIS_RUNTIME_HOST"},
 			Destination: &cfg.Runtime.Host,
 		},
-		{
-			EnvVars:     []string{"OCIS_DEBUG_ADDR"},
-			Destination: &cfg.Debug.Addr,
-		},
-		{
-			EnvVars:     []string{"OCIS_DEBUG_TOKEN"},
-			Destination: &cfg.Debug.Token,
-		},
-		{
-			EnvVars:     []string{"OCIS_DEBUG_PPROF"},
-			Destination: &cfg.Debug.Pprof,
-		},
-		{
-			EnvVars:     []string{"OCIS_DEBUG_ZPAGES"},
-			Destination: &cfg.Debug.Zpages,
-		},
-		{
-			EnvVars:     []string{"OCIS_HTTP_ADDR"},
-			Destination: &cfg.HTTP.Addr,
-		},
-		{
-			EnvVars:     []string{"OCIS_HTTP_ROOT"},
-			Destination: &cfg.HTTP.Root,
-		},
-		{
-			EnvVars:     []string{"OCIS_GRPC_ADDR"},
-			Destination: &cfg.GRPC.Addr,
-		},
 		{
 			EnvVars:     []string{"OCIS_RUN_EXTENSIONS"},
 			Destination: &cfg.Runtime.Extensions,

diff --git a/ocis/pkg/command/health.go b/ocis/pkg/command/health.go
diff --git a/ocis/pkg/command/server.go b/ocis/pkg/command/server.go
@@ -4,8 +4,6 @@
 package command
 
 import (
-	"strings"
-
 	"github.com/owncloud/ocis/ocis-pkg/shared"
 
 	"github.com/owncloud/ocis/ocis-pkg/config"
@@ -21,10 +19,6 @@ func Server(cfg *config.Config) *cli.Command {
 		Usage:    "Start fullstack server",
 		Category: "Fullstack",
 		Before: func(c *cli.Context) error {
-			if cfg.HTTP.Root != "/" {
-				cfg.HTTP.Root = strings.TrimSuffix(cfg.HTTP.Root, "/")
-			}
-
 			return ParseConfig(c, cfg)
 		},
 		Action: func(c *cli.Context) error {