Merge pull request #2576 from owncloud/remove_proxy_assets

remove proxy asset path configuration

changelog/unreleased/remove_proxy_assets.md

@@ -0,0 +1,6 @@
+Bugfix: Remove asset path configuration option from proxy
+
+We've remove the asset path configuration option (`--asset-path` or `PROXY_ASSET_PATH`)
+since it didn't do anything at all.
+
+https://github.com/owncloud/ocis/pull/2576

proxy/pkg/config/config.go

@@ -45,11 +45,6 @@ type Tracing struct {
 	Service   string
 }
 
-// Asset defines the available asset configuration.
-type Asset struct {
-	Path string
-}
-
 // Policy enables us to use multiple directors.
 type Policy struct {
 	Name   string
@@ -113,7 +108,6 @@ type Config struct {
 	HTTP                  HTTP
 	Service               Service
 	Tracing               Tracing
-	Asset                 Asset
 	Policies              []Policy
 	OIDC                  OIDC
 	TokenManager          TokenManager

proxy/pkg/flagset/flagset.go

@@ -140,13 +140,6 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"PROXY_HTTP_ROOT"},
 			Destination: &cfg.HTTP.Root,
 		},
-		&cli.StringFlag{
-			Name:        "asset-path",
-			Value:       flags.OverrideDefaultString(cfg.Asset.Path, ""),
-			Usage:       "Path to custom assets",
-			EnvVars:     []string{"PROXY_ASSET_PATH"},
-			Destination: &cfg.Asset.Path,
-		},
 		&cli.StringFlag{
 			Name:        "service-namespace",
 			Value:       flags.OverrideDefaultString(cfg.Service.Namespace, "com.owncloud.web"),

proxy/pkg/proxy/proxy_integration_test.go

@@ -218,7 +218,6 @@ func testConfig(policy []config.Policy) *config.Config {
 		Debug:          config.Debug{},
 		HTTP:           config.HTTP{},
 		Tracing:        config.Tracing{},
-		Asset:          config.Asset{},
 		Policies:       policy,
 		OIDC:           config.OIDC{},
 		PolicySelector: nil,