Some of the OSS changes were clobbered when merging with quotas out of, master (#9343)

* OSS side of Global Plugin Reload
This commit is contained in:
Scott Miller
2020-06-29 16:58:51 -05:00
committed by GitHub
parent f98afb998a
commit 8719a9b7c4
7 changed files with 172 additions and 39 deletions

View File

@@ -63,7 +63,7 @@ func (c *PluginReloadCommand) Flags() *FlagSets {
Name: "scope",
Target: &c.scope,
Completion: complete.PredictAnything,
Usage: `The scope of the reload, omitted for local, "cluster", for cluster-wide`,
Usage: "The scope of the reload, omitted for local, 'global', for replicated reloads",
})
return set
@@ -92,7 +92,7 @@ func (c *PluginReloadCommand) Run(args []string) int {
case c.plugin != "" && len(c.mounts) > 0:
c.UI.Error(fmt.Sprintf("Too many arguments (expected 1, got %d)", len(args)))
return 1
case c.scope != "" && c.scope != "cluster":
case c.scope != "" && c.scope != "global":
c.UI.Error(fmt.Sprintf("Invalid reload scope: %s", c.scope))
}
@@ -122,7 +122,7 @@ func (c *PluginReloadCommand) Run(args []string) int {
if rid != "" {
c.UI.Output(fmt.Sprintf("Success! Reloading plugin: %s, reload_id: %s", c.plugin, rid))
} else {
c.UI.Output(fmt.Sprintf("Success! Reloaded plugin: %s", c.mounts))
c.UI.Output(fmt.Sprintf("Success! Reloaded plugin: %s", c.plugin))
}
}