Chore: Rename "marketplace" app to "catalog" (#34149)

This commit is contained in:
Ryan McKinley
2021-05-17 08:27:56 -07:00
committed by GitHub
parent 315ca109e1
commit edcefe1c8e
52 changed files with 86 additions and 94 deletions
+4 -4
View File
@@ -256,8 +256,8 @@ type Cfg struct {
PluginsAppsSkipVerifyTLS bool
PluginSettings PluginSettings
PluginsAllowUnsigned []string
MarketplaceURL string
MarketplaceAppEnabled bool
CatalogURL string
CatalogAppEnabled bool
DisableSanitizeHtml bool
EnterpriseLicensePath string
@@ -890,8 +890,8 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
plug = strings.TrimSpace(plug)
cfg.PluginsAllowUnsigned = append(cfg.PluginsAllowUnsigned, plug)
}
cfg.MarketplaceURL = pluginsSection.Key("marketplace_url").MustString("https://grafana.com/grafana/plugins/")
cfg.MarketplaceAppEnabled = pluginsSection.Key("marketplace_app_enabled").MustBool(false)
cfg.CatalogURL = pluginsSection.Key("catalog_url").MustString("https://grafana.com/grafana/plugins/")
cfg.CatalogAppEnabled = pluginsSection.Key("catalog_app_enabled").MustBool(false)
// Read and populate feature toggles list
featureTogglesSection := iniFile.Section("feature_toggles")