From d2edd6e98e749ead2a7c6163842b97cd78dc6008 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 3 May 2022 14:34:15 +0200 Subject: [PATCH] storage-publiclink config docs --- extensions/storage-publiclink/pkg/config/config.go | 8 +------- extensions/storage-publiclink/pkg/revaconfig/config.go | 4 ++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/extensions/storage-publiclink/pkg/config/config.go b/extensions/storage-publiclink/pkg/config/config.go index 9dc63e4bfd..08db7ac06c 100644 --- a/extensions/storage-publiclink/pkg/config/config.go +++ b/extensions/storage-publiclink/pkg/config/config.go @@ -20,7 +20,6 @@ type Config struct { SkipUserGroupsInToken bool `yaml:"-"` - AuthProvider AuthProvider `yaml:"auth_provider"` StorageProvider StorageProvider `yaml:"storage_provider"` Supervised bool `yaml:"-"` @@ -57,11 +56,6 @@ type GRPCConfig struct { Protocol string `yaml:"protocol" env:"STORAGE_PUBLICLINK_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."` } -type AuthProvider struct { - GatewayEndpoint string -} - type StorageProvider struct { - MountID string - GatewayEndpoint string + MountID string `yaml:"mount_id" env:"STORAGE_PUBLICLINK_STORAGE_PROVIDER_MOUNT_ID"` } diff --git a/extensions/storage-publiclink/pkg/revaconfig/config.go b/extensions/storage-publiclink/pkg/revaconfig/config.go index fcab22c09d..9d1ac314f8 100644 --- a/extensions/storage-publiclink/pkg/revaconfig/config.go +++ b/extensions/storage-publiclink/pkg/revaconfig/config.go @@ -27,13 +27,13 @@ func StoragePublicLinkConfigFromStruct(cfg *config.Config) map[string]interface{ "services": map[string]interface{}{ "publicstorageprovider": map[string]interface{}{ "mount_id": cfg.StorageProvider.MountID, - "gateway_addr": cfg.StorageProvider.GatewayEndpoint, + "gateway_addr": cfg.Reva.Address, }, "authprovider": map[string]interface{}{ "auth_manager": "publicshares", "auth_managers": map[string]interface{}{ "publicshares": map[string]interface{}{ - "gateway_addr": cfg.AuthProvider.GatewayEndpoint, + "gateway_addr": cfg.Reva.Address, }, }, },