Consitently list stack before demo

Author: sbernauer

rust/stackable-cockpit/src/platform/demo/params.rs

@@ -4,12 +4,12 @@ use stackable_operator::kvp::Labels;
 use crate::platform::operator::ChartSourceType;
 
 pub struct DemoInstallParameters {
-    /// Name of the demo, which is always present
-    pub demo_name: String,
-
     /// Name of the stack, which is always present, as a demo builds on top of a stack
     pub stack_name: String,
 
+    /// Name of the demo, which is always present
+    pub demo_name: String,
+
     pub operator_namespace: String,
     pub demo_namespace: String,
 

rust/stackable-cockpit/src/platform/demo/spec.rs

@@ -204,8 +204,8 @@ impl DemoSpec {
             &self.manifests,
             &params,
             &install_params.demo_namespace,
-            &install_params.demo_name,
-            Some(&install_params.stack_name),
+            &install_params.stack_name,
+            Some(&install_params.demo_name),
             install_params.labels,
             client,
             transfer_client,

rust/stackable-cockpit/src/platform/stack/params.rs

@@ -5,13 +5,13 @@ use crate::platform::operator::ChartSourceType;
 
 #[derive(Debug)]
 pub struct StackInstallParameters {
+    /// Name of the stack, which is always present
+    pub stack_name: String,
+
     /// Optional name of the demo, which is only present in case this stack is installed as part of
     /// a demo. This is unset in case a stack is installed directly.
     pub demo_name: Option<String>,
 
-    /// Name of the stack, which is always present
-    pub stack_name: String,
-
     pub operator_namespace: String,
     pub stack_namespace: String,
 

rust/stackablectl/src/cmds/demo.rs

@@ -388,8 +388,8 @@ async fn install_cmd(
         .context(LoadOperatorValuesSnafu)?;
 
     let install_parameters = DemoInstallParameters {
-        demo_name: args.demo_name.clone(),
         stack_name: demo.stack.clone(),
+        demo_name: args.demo_name.clone(),
         operator_namespace: args.namespaces.operator_namespace.clone(),
         demo_namespace: args.namespaces.namespace.clone(),
         stack_parameters: args.stack_parameters.clone(),