From edd3adcf1db8ac2995581f2b5b160a689d01ef06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Wed, 4 May 2022 08:35:02 +0000 Subject: [PATCH] make yaml tags always use underscore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- extensions/proxy/pkg/config/config.go | 2 +- ocis-pkg/config/config.go | 20 ++++++++++---------- ocis/pkg/init/init.go | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/extensions/proxy/pkg/config/config.go b/extensions/proxy/pkg/config/config.go index f6264f413d..032e81efa9 100644 --- a/extensions/proxy/pkg/config/config.go +++ b/extensions/proxy/pkg/config/config.go @@ -53,7 +53,7 @@ type Route struct { Backend string `yaml:"backend"` // Service name to look up in the registry Service string `yaml:"service"` - ApacheVHost bool `yaml:"apache-vhost"` + ApacheVHost bool `yaml:"apache_vhost"` } // RouteType defines the type of a route diff --git a/ocis-pkg/config/config.go b/ocis-pkg/config/config.go index b649c29c5c..b014b4133b 100644 --- a/ocis-pkg/config/config.go +++ b/ocis-pkg/config/config.go @@ -73,17 +73,17 @@ type Config struct { Runtime Runtime `yaml:"runtime"` Accounts *accounts.Config `yaml:"accounts"` - AppProvider *appProvider.Config `yaml:"app-provider"` - AppRegistry *appRegistry.Config `yaml:"app-registry"` + AppProvider *appProvider.Config `yaml:"app_provider"` + AppRegistry *appRegistry.Config `yaml:"app_registry"` Audit *audit.Config `yaml:"audit"` - AuthBasic *authbasic.Config `yaml:"auth-basic"` - AuthBearer *authbearer.Config `yaml:"auth-bearer"` - AuthMachine *authmachine.Config `yaml:"auth-machine"` + AuthBasic *authbasic.Config `yaml:"auth_basic"` + AuthBearer *authbearer.Config `yaml:"auth_bearer"` + AuthMachine *authmachine.Config `yaml:"auth_machine"` Frontend *frontend.Config `yaml:"frontend"` Gateway *gateway.Config `yaml:"gateway"` GLAuth *glauth.Config `yaml:"glauth"` Graph *graph.Config `yaml:"graph"` - GraphExplorer *graphExplorer.Config `yaml:"graph-explorer"` + GraphExplorer *graphExplorer.Config `yaml:"graph_explorer"` Group *group.Config `yaml:"group"` IDM *idm.Config `yaml:"idm"` IDP *idp.Config `yaml:"idp"` @@ -94,10 +94,10 @@ type Config struct { Proxy *proxy.Config `yaml:"proxy"` Settings *settings.Config `yaml:"settings"` Sharing *sharing.Config `yaml:"sharing"` - StorageSystem *storagesystem.Config `yaml:"storage-system"` - StoragePublicLink *storagepublic.Config `yaml:"storage-public"` - StorageShares *storageshares.Config `yaml:"storage-shares"` - StorageUsers *storageusers.Config `yaml:"storage-users"` + StorageSystem *storagesystem.Config `yaml:"storage_system"` + StoragePublicLink *storagepublic.Config `yaml:"storage_public"` + StorageShares *storageshares.Config `yaml:"storage_shares"` + StorageUsers *storageusers.Config `yaml:"storage_users"` Store *store.Config `yaml:"store"` Thumbnails *thumbnails.Config `yaml:"thumbnails"` User *user.Config `yaml:"user"` diff --git a/ocis/pkg/init/init.go b/ocis/pkg/init/init.go index 4d9bad5dd0..010c9cb429 100644 --- a/ocis/pkg/init/init.go +++ b/ocis/pkg/init/init.go @@ -105,12 +105,12 @@ type OcisConfig struct { Idm IdmExtension Proxy InsecureProxyExtension Frontend FrontendExtension - AuthBasic AuthbasicExtension `yaml:"auth-basic"` - AuthBearer AuthbearerExtension `yaml:"auth-bearer"` + AuthBasic AuthbasicExtension `yaml:"auth_basic"` + AuthBearer AuthbearerExtension `yaml:"auth_bearer"` User UserAndGroupExtension Group UserAndGroupExtension - StorageMetadata DataProviderInsecureSettings `yaml:"storage-system"` - StorageUsers DataProviderInsecureSettings `yaml:"storage-users"` + StorageMetadata DataProviderInsecureSettings `yaml:"storage_system"` + StorageUsers DataProviderInsecureSettings `yaml:"storage_users"` Ocdav InsecureExtension Thumbnails ThumbNailExtension }