fix hello deployment

proxy/pkg/proxy/proxy.go

@@ -62,13 +62,6 @@ func NewMultiHostReverseProxy(opts ...Option) *MultiHostReverseProxy {
 		},
 	}
 
-	if options.Config.Policies == nil {
-		rp.logger.Info().Str("source", "runtime").Msg("Policies")
-		options.Config.Policies = defaultPolicies()
-	} else {
-		rp.logger.Info().Str("source", "file").Str("src", options.Config.File).Msg("policies")
-	}
-
 	if options.Config.PolicySelector == nil {
 		firstPolicy := options.Config.Policies[0].Name
 		rp.logger.Warn().Str("policy", firstPolicy).Msg("policy-selector not configured. Will always use first policy")
@@ -263,161 +256,3 @@ func (p *MultiHostReverseProxy) regexRouteMatcher(pattern string, target url.URL
 func (p *MultiHostReverseProxy) prefixRouteMatcher(prefix string, target url.URL) bool {
 	return strings.HasPrefix(target.Path, prefix) && prefix != "/"
 }
-
-func defaultPolicies() []config.Policy {
-	return []config.Policy{
-		{
-			Name: "ocis",
-			Routes: []config.Route{
-				{
-					Endpoint: "/",
-					Backend:  "http://localhost:9100",
-				},
-				{
-					Endpoint: "/.well-known/",
-					Backend:  "http://localhost:9130",
-				},
-				{
-					Endpoint: "/konnect/",
-					Backend:  "http://localhost:9130",
-				},
-				{
-					Endpoint: "/signin/",
-					Backend:  "http://localhost:9130",
-				},
-				{
-					Endpoint: "/archiver",
-					Backend:  "http://localhost:9140",
-				},
-				{
-					Type:     config.RegexRoute,
-					Endpoint: "/ocs/v[12].php/cloud/(users?|groups)", // we have `user`, `users` and `groups` in ocis-ocs
-					Backend:  "http://localhost:9110",
-				},
-				{
-					Endpoint: "/ocs/",
-					Backend:  "http://localhost:9140",
-				},
-				{
-					Type:     config.QueryRoute,
-					Endpoint: "/remote.php/?preview=1",
-					Backend:  "http://localhost:9115",
-				},
-				{
-					Endpoint: "/remote.php/",
-					Backend:  "http://localhost:9140",
-				},
-				{
-					Endpoint: "/dav/",
-					Backend:  "http://localhost:9140",
-				},
-				{
-					Endpoint: "/webdav/",
-					Backend:  "http://localhost:9140",
-				},
-				{
-					Endpoint: "/status.php",
-					Backend:  "http://localhost:9140",
-				},
-				{
-					Endpoint: "/index.php/",
-					Backend:  "http://localhost:9140",
-				},
-				{
-					Endpoint: "/data",
-					Backend:  "http://localhost:9140",
-				},
-				{
-					Endpoint: "/app/",
-					Backend:  "http://localhost:9140",
-				},
-				{
-					Endpoint: "/graph/",
-					Backend:  "http://localhost:9120",
-				},
-				{
-					Endpoint: "/graph-explorer",
-					Backend:  "http://localhost:9135",
-				},
-				// if we were using the go micro api gateway we could look up the endpoint in the registry dynamically
-				{
-					Endpoint: "/api/v0/accounts",
-					Backend:  "http://localhost:9181",
-				},
-				// TODO the lookup needs a better mechanism
-				{
-					Endpoint: "/accounts.js",
-					Backend:  "http://localhost:9181",
-				},
-				{
-					Endpoint: "/api/v0/settings",
-					Backend:  "http://localhost:9190",
-				},
-				{
-					Endpoint: "/settings.js",
-					Backend:  "http://localhost:9190",
-				},
-			},
-		},
-		{
-			Name: "oc10",
-			Routes: []config.Route{
-				{
-					Endpoint: "/",
-					Backend:  "http://localhost:9100",
-				},
-				{
-					Endpoint: "/.well-known/",
-					Backend:  "http://localhost:9130",
-				},
-				{
-					Endpoint: "/konnect/",
-					Backend:  "http://localhost:9130",
-				},
-				{
-					Endpoint: "/signin/",
-					Backend:  "http://localhost:9130",
-				},
-				{
-					Endpoint: "/archiver",
-					Backend:  "http://localhost:9140",
-				},
-				{
-					Endpoint:    "/ocs/",
-					Backend:     "https://demo.owncloud.com",
-					ApacheVHost: true,
-				},
-				{
-					Endpoint:    "/remote.php/",
-					Backend:     "https://demo.owncloud.com",
-					ApacheVHost: true,
-				},
-				{
-					Endpoint:    "/dav/",
-					Backend:     "https://demo.owncloud.com",
-					ApacheVHost: true,
-				},
-				{
-					Endpoint:    "/webdav/",
-					Backend:     "https://demo.owncloud.com",
-					ApacheVHost: true,
-				},
-				{
-					Endpoint:    "/status.php",
-					Backend:     "https://demo.owncloud.com",
-					ApacheVHost: true,
-				},
-				{
-					Endpoint:    "/index.php/",
-					Backend:     "https://demo.owncloud.com",
-					ApacheVHost: true,
-				},
-				{
-					Endpoint:    "/data",
-					Backend:     "https://demo.owncloud.com",
-					ApacheVHost: true,
-				},
-			},
-		},
-	}
-}

proxy/pkg/proxy/proxy_integration_test.go

@@ -215,7 +215,6 @@ func (tc *testCase) expectProxyTo(strURL string) testCase {
 
 func testConfig(policy []config.Policy) *config.Config {
 	return &config.Config{
-		File:           "",
 		Log:            shared.Log{},
 		Debug:          config.Debug{},
 		HTTP:           config.HTTP{},

proxy/pkg/proxy/proxy_test.go

@@ -13,7 +13,7 @@ type matchertest struct {
 }
 
 func TestPrefixRouteMatcher(t *testing.T) {
-	cfg := config.New()
+	cfg := config.DefaultConfig()
 	p := NewMultiHostReverseProxy(Config(cfg))
 
 	table := []matchertest{