From 53c5c8d278d2d14ab5900f72c59d5c67bf4b8bb1 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Thu, 12 Aug 2021 16:46:07 +0200 Subject: [PATCH] add frontend service --- storage/pkg/command/frontend.go | 6 ++++++ storage/pkg/config/config.go | 1 + storage/pkg/flagset/frontend.go | 9 ++++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/storage/pkg/command/frontend.go b/storage/pkg/command/frontend.go index 32a2904d20..ef686698b8 100644 --- a/storage/pkg/command/frontend.go +++ b/storage/pkg/command/frontend.go @@ -141,6 +141,12 @@ func frontendConfigFromStruct(c *cli.Context, cfg *config.Config, filesCfg map[s }, // TODO build services dynamically "services": map[string]interface{}{ + "appprovider": map[string]interface{}{ + "prefix": cfg.Reva.Frontend.AppProviderPrefix, + "transfer_shared_secret": cfg.Reva.TransferSecret, + "timeout": 86400, + "insecure": true, + }, "datagateway": map[string]interface{}{ "prefix": cfg.Reva.Frontend.DatagatewayPrefix, "transfer_shared_secret": cfg.Reva.TransferSecret, diff --git a/storage/pkg/config/config.go b/storage/pkg/config/config.go index c61b8e4dab..23a3ff23af 100644 --- a/storage/pkg/config/config.go +++ b/storage/pkg/config/config.go @@ -130,6 +130,7 @@ type Groups struct { type FrontendPort struct { Port + AppProviderPrefix string DatagatewayPrefix string OCDavPrefix string OCSPrefix string diff --git a/storage/pkg/flagset/frontend.go b/storage/pkg/flagset/frontend.go index 335ecfed6c..2f7ec6fb15 100644 --- a/storage/pkg/flagset/frontend.go +++ b/storage/pkg/flagset/frontend.go @@ -87,10 +87,17 @@ func FrontendWithConfig(cfg *config.Config) []cli.Flag { }, &cli.StringSliceFlag{ Name: "service", - Value: cli.NewStringSlice("datagateway", "ocdav", "ocs"), + Value: cli.NewStringSlice("datagateway", "ocdav", "ocs", "appprovider"), Usage: "--service ocdav [--service ocs]", EnvVars: []string{"STORAGE_FRONTEND_SERVICES"}, }, + &cli.StringFlag{ + Name: "approvider-prefix", + Value: flags.OverrideDefaultString(cfg.Reva.Frontend.AppProviderPrefix, ""), + Usage: "approvider prefix", + EnvVars: []string{"STORAGE_FRONTEND_APPPROVIDER_PREFIX"}, + Destination: &cfg.Reva.Frontend.AppProviderPrefix, + }, &cli.StringFlag{ Name: "datagateway-prefix", Value: flags.OverrideDefaultString(cfg.Reva.Frontend.DatagatewayPrefix, "data"),