From 8202f7b2ad06e3f8ed2976d251c1d14daeb3d012 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Fri, 5 Nov 2021 14:23:12 +0100 Subject: [PATCH] fix offenses --- web/pkg/config/config.go | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/web/pkg/config/config.go b/web/pkg/config/config.go index 974a204f1..f6ad152e7 100644 --- a/web/pkg/config/config.go +++ b/web/pkg/config/config.go @@ -48,22 +48,22 @@ type Asset struct { // WebConfig defines the available web configuration for a dynamically rendered config.json. type WebConfig struct { - Server string `json:"server,omitempty",mapstructure:"server"` - Theme string `json:"theme,omitempty",mapstructure:"theme"` - Version string `json:"version,omitempty",mapstructure:"version"` // TODO what is version used for? - OpenIDConnect OIDC `json:"openIdConnect,omitempty",mapstructure:"oids"` - Apps []string `json:"apps",mapstructure:"apps"` // TODO add nil as empty when https://go-review.googlesource.com/c/go/+/205897/ is released - ExternalApps []ExternalApp `json:"external_apps,omitempty",mapstructure:"external_apps"` - Options map[string]interface{} `json:"options,omitempty",mapstructure:"options"` + Server string `json:"server,omitempty" mapstructure:"server"` + Theme string `json:"theme,omitempty" mapstructure:"theme"` + Version string `json:"version,omitempty" mapstructure:"version"` // TODO what is version used for? + OpenIDConnect OIDC `json:"openIdConnect,omitempty" mapstructure:"oids"` + Apps []string `json:"apps" mapstructure:"apps"` // TODO add nil as empty when https://go-review.googlesource.com/c/go/+/205897/ is released + ExternalApps []ExternalApp `json:"external_apps,omitempty" mapstructure:"external_apps"` + Options map[string]interface{} `json:"options,omitempty" mapstructure:"options"` } // OIDC defines the available oidc configuration type OIDC struct { - MetadataURL string `json:"metadata_url,omitempty",mapstructure:"metadata_url"` - Authority string `json:"authority,omitempty",mapstructure:"authority"` - ClientID string `json:"client_id,omitempty",mapstructure:"client_id"` - ResponseType string `json:"response_type,omitempty",mapstructure:"response_type"` - Scope string `json:"scope,omitempty",mapstructure:"scope"` + MetadataURL string `json:"metadata_url,omitempty" mapstructure:"metadata_url"` + Authority string `json:"authority,omitempty" mapstructure:"authority"` + ClientID string `json:"client_id,omitempty" mapstructure:"client_id"` + ResponseType string `json:"response_type,omitempty" mapstructure:"response_type"` + Scope string `json:"scope,omitempty" mapstructure:"scope"` } // ExternalApp defines an external web app. @@ -75,15 +75,15 @@ type OIDC struct { // } // } type ExternalApp struct { - ID string `json:"id,omitempty",mapstructure:"id"` - Path string `json:"path,omitempty",mapstructure:"path"` + ID string `json:"id,omitempty" mapstructure:"id"` + Path string `json:"path,omitempty" mapstructure:"path"` // Config is completely dynamic, because it depends on the extension - Config map[string]interface{} `json:"config,omitempty",mapstructure:"config"` + Config map[string]interface{} `json:"config,omitempty" mapstructure:"config"` } // ExternalAppConfig defines an external web app configuration. type ExternalAppConfig struct { - URL string `json:"url,omitempty",mapstructure:"url"` + URL string `json:"url,omitempty" mapstructure:"url"` } // Web defines the available web configuration.