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
+1 -1
View File
@@ -26,7 +26,7 @@ const (
func TestPluginInstallAccess(t *testing.T) {
dir, cfgPath := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
MarketplaceAppEnabled: true,
CatalogAppEnabled: true,
})
store := testinfra.SetUpDatabase(t, dir)
store.Bus = bus.GetBus() // in order to allow successful user auth
+8 -8
View File
@@ -233,10 +233,10 @@ func CreateGrafDir(t *testing.T, opts ...GrafanaOpts) (string, string) {
_, err = anonSect.NewKey("enabled", "false")
require.NoError(t, err)
}
if o.MarketplaceAppEnabled {
if o.CatalogAppEnabled {
anonSect, err := cfg.NewSection("plugins")
require.NoError(t, err)
_, err = anonSect.NewKey("marketplace_app_enabled", "true")
_, err = anonSect.NewKey("catalog_app_enabled", "true")
require.NoError(t, err)
}
}
@@ -252,10 +252,10 @@ func CreateGrafDir(t *testing.T, opts ...GrafanaOpts) (string, string) {
}
type GrafanaOpts struct {
EnableCSP bool
EnableFeatureToggles []string
AnonymousUserRole models.RoleType
EnableQuota bool
DisableAnonymous bool
MarketplaceAppEnabled bool
EnableCSP bool
EnableFeatureToggles []string
AnonymousUserRole models.RoleType
EnableQuota bool
DisableAnonymous bool
CatalogAppEnabled bool
}