fix: common options are not forwarded to other commands (#207)

Author: rafaelgomesxyz

CONTRIBUTING.md

@@ -64,7 +64,7 @@ CPLN_ORG=your-org-for-tests bundle exec rspec --tag slow
 2. Use the `--trace` option to see full logging of HTTP requests. Warning, this will display keys to your logs or console.
 1. Add a breakpoint (`debugger`) to any line of code you want to debug.
 2. Modify the `lib/command/test.rb` file to trigger the code you want to test. To simulate a command, you can use
-   `Cpflow::Cli.start` (e.g., `Cpflow::Cli.start(["deploy-image", "-a", "my-app-name"])` would be the same as running
+   `run_cpflow_command` (e.g., `run_cpflow_command("deploy-image", "-a", "my-app-name")` would be the same as running
    `cpflow deploy-image -a my-app-name`).
 3. Run the `test` command in your test app with a `.controlplane` directory.
 

lib/command/base.rb

@@ -527,7 +527,7 @@ def run_command_in_latest_image(command, title:)
       progress.puts("Running #{title}...\n\n")
 
       begin
-        Cpflow::Cli.start(["run", "-a", config.app, "--image", "latest", "--", command])
+        run_cpflow_command("run", "-a", config.app, "--image", "latest", "--", command)
       rescue SystemExit => e
         progress.puts
 
@@ -536,5 +536,19 @@ def run_command_in_latest_image(command, title:)
         progress.puts("Finished running #{title}.\n\n")
       end
     end
+
+    def run_cpflow_command(command, *args)
+      common_args = []
+
+      self.class.common_options.each do |option|
+        value = config.options[option[:name]]
+        next if value.nil?
+
+        name = "--#{option[:name].to_s.tr('_', '-')}"
+        common_args.push(name, value)
+      end
+
+      Cpflow::Cli.start([command, *common_args, *args])
+    end
   end
 end

lib/command/cleanup_stale_apps.rb

@@ -73,7 +73,7 @@ def confirm_delete
     end
 
     def delete_app(app)
-      Cpflow::Cli.start(["delete", "-a", app, "--yes"])
+      run_cpflow_command("delete", "-a", app, "--yes")
     end
   end
 end

lib/command/maintenance_off.rb

@@ -39,7 +39,7 @@ def call # rubocop:disable Metrics/MethodLength
       cp.fetch_workload!(maintenance_workload)
 
       # Start all other workloads
-      Cpflow::Cli.start(["ps:start", "-a", config.app, "--wait"])
+      run_cpflow_command("ps:start", "-a", config.app, "--wait")
 
       progress.puts
 
@@ -54,7 +54,7 @@ def call # rubocop:disable Metrics/MethodLength
       progress.puts
 
       # Stop maintenance workload
-      Cpflow::Cli.start(["ps:stop", "-a", config.app, "-w", maintenance_workload, "--wait"])
+      run_cpflow_command("ps:stop", "-a", config.app, "-w", maintenance_workload, "--wait")
 
       progress.puts("\nMaintenance mode disabled for app '#{config.app}'.")
     end

lib/command/maintenance_on.rb

@@ -39,7 +39,7 @@ def call # rubocop:disable Metrics/MethodLength
       cp.fetch_workload!(maintenance_workload)
 
       # Start maintenance workload
-      Cpflow::Cli.start(["ps:start", "-a", config.app, "-w", maintenance_workload, "--wait"])
+      run_cpflow_command("ps:start", "-a", config.app, "-w", maintenance_workload, "--wait")
 
       progress.puts
 
@@ -54,7 +54,7 @@ def call # rubocop:disable Metrics/MethodLength
       progress.puts
 
       # Stop all other workloads
-      Cpflow::Cli.start(["ps:stop", "-a", config.app, "--wait"])
+      run_cpflow_command("ps:stop", "-a", config.app, "--wait")
 
       progress.puts("\nMaintenance mode enabled for app '#{config.app}'.")
     end

lib/command/no_command.rb

@@ -14,9 +14,9 @@ class NoCommand < Base
 
     def call
       if config.options[:version]
-        Cpflow::Cli.start(["version"])
+        run_cpflow_command("version")
       else
-        Cpflow::Cli.start(["help"])
+        run_cpflow_command("help")
       end
     end
   end

lib/command/promote_app_from_upstream.rb

@@ -25,14 +25,14 @@ def call
     private
 
     def copy_image_from_upstream
-      Cpflow::Cli.start(["copy-image-from-upstream", "-a", config.app, "-t", config.options[:upstream_token]])
+      run_cpflow_command("copy-image-from-upstream", "-a", config.app, "-t", config.options[:upstream_token])
       progress.puts
     end
 
     def deploy_image
       args = []
       args.push("--run-release-phase") if config.current[:release_script]
-      Cpflow::Cli.start(["deploy-image", "-a", config.app, *args])
+      run_cpflow_command("deploy-image", "-a", config.app, *args)
     end
   end
 end

lib/command/run.rb

@@ -306,7 +306,7 @@ def run_non_interactive_v1 # rubocop:disable Metrics/MethodLength
           exit(ExitCode::SUCCESS)
         end
 
-        Cpflow::Cli.start(["logs", *app_workload_replica_args])
+        run_cpflow_command("logs", *app_workload_replica_args)
       end
       Process.detach(logs_pid)
 

lib/command/setup_app.rb

@@ -42,7 +42,7 @@ def call # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
 
       args = []
       args.push("--add-app-identity") unless skip_secrets_setup
-      Cpflow::Cli.start(["apply-template", *templates, "-a", config.app, *args])
+      run_cpflow_command("apply-template", *templates, "-a", config.app, *args)
 
       bind_identity_to_policy unless skip_secrets_setup
       run_post_creation_hook unless config.options[:skip_post_creation_hook]

lib/command/test.rb

@@ -16,8 +16,8 @@ class Test < Base
     def call
       # Modify this method to trigger the code you want to test.
       # You can use `debugger` to debug.
-      # You can use `Cpflow::Cli.start` to simulate a command
-      # (e.g., `Cpflow::Cli.start(["deploy-image", "-a", "my-app-name"])`).
+      # You can use `run_cpflow_command` to simulate a command
+      # (e.g., `run_cpflow_command("deploy-image", "-a", "my-app-name")`).
     end
   end
 end