OCPBUGS-43792: Follow-on fix. Add new "plugins-order" flag to bridge cli args since "plugins" is an

undordered map. We need a way to persist plugin order from console operator config to the frontend
server flag.

Author: TheRealJon

cmd/bridge/main.go

@@ -128,6 +128,7 @@ func main() {
 
 	consolePluginsFlags := serverconfig.MultiKeyValue{}
 	fs.Var(&consolePluginsFlags, "plugins", "List of plugin entries that are enabled for the console. Each entry consist of plugin-name as a key and plugin-endpoint as a value.")
+	fPluginsOrder := fs.String("plugins-order", "", "List of plugin names which determines the order in which plugin extensions will be resolved.")
 	fPluginProxy := fs.String("plugin-proxy", "", "Defines various service types to which will console proxy plugins requests. (JSON as string)")
 	fI18NamespacesFlags := fs.String("i18n-namespaces", "", "List of namespaces separated by comma. Example --i18n-namespaces=plugin__acm,plugin__kubevirt")
 	fContentSecurityPolicyEnabled := fs.Bool("content-security-policy-enabled", false, "Flag to indicate if Content Secrity Policy features should be enabled.")
@@ -229,6 +230,20 @@ func main() {
 		}
 	}
 
+	pluginsOrder := []string{}
+	if *fPluginsOrder != "" {
+		for _, str := range strings.Split(*fPluginsOrder, ",") {
+			str = strings.TrimSpace(str)
+			if str == "" {
+				flags.FatalIfFailed(flags.NewInvalidFlagError("plugins-order", "list must contain names of plugins separated by comma"))
+			}
+			if consolePluginsFlags[str] == "" {
+				flags.FatalIfFailed(flags.NewInvalidFlagError("plugins-order", "list must only contain currently enabled plugins"))
+			}
+			pluginsOrder = append(pluginsOrder, str)
+		}
+	}
+
 	nodeArchitectures := []string{}
 	if *fNodeArchitectures != "" {
 		for _, str := range strings.Split(*fNodeArchitectures, ",") {
@@ -295,6 +310,7 @@ func main() {
 		K8sMode:                      *fK8sMode,
 		CopiedCSVsDisabled:           *fCopiedCSVsDisabled,
 		Capabilities:                 capabilities,
+		PluginsOrder:                 pluginsOrder,
 	}
 
 	completedAuthnOptions, err := authOptions.Complete()

pkg/server/server.go

@@ -209,6 +209,7 @@ type Server struct {
 	ThanosTenancyProxyConfig            *proxy.Config
 	ThanosTenancyProxyForRulesConfig    *proxy.Config
 	UserSettingsLocation                string
+	PluginsOrder                        []string
 }
 
 func disableDirectoryListing(handler http.Handler) http.Handler {
@@ -712,19 +713,14 @@ func (s *Server) indexHandler(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Security-Policy-Report-Only", strings.Join(cspDirectives, "; "))
 	}
 
-	plugins := make([]string, 0, len(s.EnabledConsolePlugins))
-	for plugin := range s.EnabledConsolePlugins {
-		plugins = append(plugins, plugin)
-	}
-
 	jsg := &jsGlobals{
 		AddPage:                   s.AddPage,
 		AlertManagerPublicURL:     s.AlertManagerPublicURL.String(),
 		AuthDisabled:              s.Authenticator.IsStatic(),
 		BasePath:                  s.BaseURL.Path,
 		Branding:                  s.Branding,
 		Capabilities:              s.Capabilities,
-		ConsolePlugins:            plugins,
+		ConsolePlugins:            s.PluginsOrder,
 		ConsoleVersion:            version.Version,
 		ControlPlaneTopology:      s.ControlPlaneTopology,
 		CopiedCSVsDisabled:        s.CopiedCSVsDisabled,

pkg/serverconfig/config.go

@@ -171,6 +171,7 @@ func SetFlagsFromConfig(fs *flag.FlagSet, config *Config) (err error) {
 	addMonitoringInfo(fs, &config.MonitoringInfo)
 	addHelmConfig(fs, &config.Helm)
 	addPlugins(fs, config.Plugins)
+	addPluginsOrder(fs, config.PluginsOrder)
 	addI18nNamespaces(fs, config.I18nNamespaces)
 	err = addProxy(fs, &config.Proxy)
 	if err != nil {
@@ -424,6 +425,10 @@ func addPlugins(fs *flag.FlagSet, plugins MultiKeyValue) {
 	}
 }
 
+func addPluginsOrder(fs *flag.FlagSet, pluginsOrder []string) {
+	fs.Set("plugins-order", strings.Join(pluginsOrder, ","))
+}
+
 func addTelemetry(fs *flag.FlagSet, telemetry MultiKeyValue) {
 	for key, value := range telemetry {
 		fs.Set("telemetry", fmt.Sprintf("%s=%s", key, value))

pkg/serverconfig/types.go

@@ -24,6 +24,7 @@ type Config struct {
 	Helm                         `yaml:"helm"`
 	MonitoringInfo               `yaml:"monitoringInfo,omitempty"`
 	Plugins                      MultiKeyValue                 `yaml:"plugins,omitempty"`
+	PluginsOrder                 []string                      `yaml:"pluginsOrder,omitempty"`
 	I18nNamespaces               []string                      `yaml:"i18nNamespaces,omitempty"`
 	Proxy                        Proxy                         `yaml:"proxy,omitempty"`
 	ContentSecurityPolicyEnabled bool                          `yaml:"contentSecurityPolicyEnabled,omitempty"`