renuo-cli 4.24.0 → 4.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df7e7a6d263ccafd4c253e16e68a8ce4dbb489e1f726d6f8e55988fa82a3c9f3
-  data.tar.gz: be67e8df4fedb4a8e08913e2758a83ab43a4ee5e7117277db93a4fac64e6326e
+  metadata.gz: 2db0ed70e43dfb8e6c5d05d3d08ed4313e7bb15a418cf05920561d55a4973c3e
+  data.tar.gz: a68fd2324f7d09dac3e1bed32f2d3b8ba3dccaf8ccc6e847b9d9585adc3d5c2a
 SHA512:
-  metadata.gz: bf10d74c836b636236cedf3acceea7cf01ee682ef5f79d153f5d4c08a39a0d17ff8f574e3c49e6505e289ed4b178dedf2eca1ec42af1018085c3c22ab4911a34
-  data.tar.gz: 19320a9d06dd5d2d4cde92bd86c68f3d6efd5509ccfb4d18cdcebc26653f9109c0cd6fbedb9755ed68ba7744ed9d4c9a40ecf86842ea637572440fd27918c2b8
+  metadata.gz: 25f6a3ae51271d7c93227af3f147ea47ce7d041bb2d1194632eea875e58c161b4ed12794064192614d10ff8407d66179874be15571e90e9db9c0efac3d31bc00
+  data.tar.gz: db3b684155e2447af9a94fd48e2d9ef2e62e3ff9af11d3f47565cf87ec6a61d53ae841809d3a74e2b15408df9e096f7bc74670850170f4d6c333ce63228e3d61

data/lib/renuo/cli/commands/ci/check_deploio_status.rb

@@ -2,14 +2,14 @@
 
 # simplecov:disable
 module Renuo::Cli::Commands::Ci
-  class CheckDeploioStatus
+  class CheckDeploioStatus # rubocop:disable Metrics/ClassLength
     TIMEOUT_IN_SECONDS = 600
     INTERVAL_IN_SECONDS = 5
     LOG_DRAIN_SECONDS = 2
 
     command "ci check-deploio-status" do |c|
       c.syntax = "renuo ci check-deploio-status [options] <app-name>"
-      c.summary = "Checks the build status of the deployment."
+      c.summary = "Checks the build and release status of the deployment."
       c.description = c.summary
       c.option "-p", "--project <name>", String, "The name of the project"
       c.option "-g", "--git-revision <hash>", String, "The Git revision"
@@ -17,9 +17,12 @@ module Renuo::Cli::Commands::Ci
     end
 
     def run
-      puts "Checking build status for revision #{@revision}..."
+      puts "[RENUO-CLI] (1/2) Checking build status for revision #{@revision}..."
       succeeded = with_streamed_build_logs { poll_build }
-      abort "build check timed out after #{TIMEOUT_IN_SECONDS} seconds" unless succeeded
+      abort "[RENUO-CLI] build check timed out after #{TIMEOUT_IN_SECONDS} seconds" unless succeeded
+
+      puts "[RENUO-CLI] (2/2) Checking release status for build #{build_name}..."
+      abort "[RENUO-CLI] release check timed out after #{TIMEOUT_IN_SECONDS} seconds" unless poll_release
     end
 
     private
@@ -29,20 +32,20 @@ module Renuo::Cli::Commands::Ci
       @project = options.project
       @revision = options.git_revision || ENV.fetch("SEMAPHORE_GIT_SHA", nil)
 
-      abort "missing app name" unless @app
-      abort "missing project name" unless @project
-      abort "this command must be run in Semaphore" unless @revision
+      abort "[RENUO-CLI] missing app name" unless @app
+      abort "[RENUO-CLI] missing project name" unless @project
+      abort "[RENUO-CLI] this command must be run in Semaphore" unless @revision
     end
 
     def system!(cmd)
       abort unless system cmd
     end
 
-    def fetch_builds
-      command = "nctl get builds -a #{@app} -p #{@project} -o yaml"
+    def fetch(type)
+      command = "nctl get #{type} -a #{@app} -p #{@project} -o yaml"
       stdout, stderr, status = Open3.capture3 command
 
-      abort "error fetching build information: #{stderr}" unless status.success?
+      abort "[RENUO-CLI] error fetching #{type} information: #{stderr}" unless status.success?
       Psych.load_stream stdout
     end
 
@@ -67,7 +70,7 @@ module Renuo::Cli::Commands::Ci
     end
 
     def build
-      @build ||= fetch_builds.find do |build|
+      @build ||= fetch("builds").find do |build|
         build.dig("spec", "forProvider", "sourceConfig", "git", "revision") == @revision
       end
     end
@@ -80,34 +83,63 @@ module Renuo::Cli::Commands::Ci
       build.dig("status", "atProvider", "buildStatus")
     end
 
-    def build_succeeded? # rubocop:disable Metrics/MethodLength
+    def release
+      @release ||= fetch("releases").find do |release|
+        release.dig("spec", "forProvider", "build", "name") == build_name
+      end
+    end
+
+    def release_name
+      release.dig("metadata", "name")
+    end
+
+    def release_status
+      release.dig("status", "atProvider", "releaseStatus")
+    end
+
+    def succeeded?(type, name, status) # rubocop:disable Metrics/MethodLength
       time = Time.current.iso8601.to_s
 
-      case build_status
+      case status
       when "available", "success"
-        puts "[RENUO-CLI] #{time} build #{build_name} succeeded"
+        puts "[RENUO-CLI] #{time} #{type} #{name} succeeded"
+        true
+      when "superseded"
+        puts "[RENUO-CLI] #{time} #{type} #{name} was superseded"
         true
       when "paused"
         abort "[RENUO-CLI] #{time} app is paused"
       when "error", "failed", "failure"
-        abort "[RENUO-CLI] #{time} build #{build_name} failed"
+        abort "[RENUO-CLI] #{time} #{type} #{name} failed"
       else
-        puts "[RENUO-CLI] #{time} build #{build_name} status is #{build_status}, waiting..."
+        puts "[RENUO-CLI] #{time} #{type} #{name} status is #{status}, waiting..."
         false
       end
     end
 
-    def poll_build # rubocop:disable Metrics/MethodLength
+    def poll_build
+      poll do
+        next puts("[RENUO-CLI] no matching build found, waiting...") unless build
+        next true if succeeded?("build", build_name, build_status)
+
+        @build = nil
+      end
+    end
+
+    def poll_release
+      poll do
+        next puts("[RENUO-CLI] no matching release found, waiting...") unless release
+        next true if succeeded?("release", release_name, release_status)
+
+        @release = nil
+      end
+    end
+
+    def poll
       elapsed = 0
 
       while elapsed < TIMEOUT_IN_SECONDS
-        if build
-          return true if build_succeeded?
-
-          @build = nil
-        else
-          puts "no matching build found, waiting..."
-        end
+        return true if yield
 
         sleep INTERVAL_IN_SECONDS
         elapsed += INTERVAL_IN_SECONDS

data/lib/renuo/cli/commands/create_nine_cloudvm.rb

@@ -96,14 +96,7 @@ class Renuo::Cli::Commands::CreateNineCloudvm
 
   def set_vault_name
     @vault_name = ask("An SSH key to access the cloud VM will be stored on 1Password. " \
-                      "Enter the 1Password vault name: ") do |q|
-      q.default = "Deploio"
-    end
-  end
-
-  def setup_ssh_key
-    say "\n# Generate the SSH key to access the cloud VM\n".bold
-    generate_ssh_key(SSH_KEY_FILE_NAME)
+                      "Enter the 1Password vault name: ") { |q| q.default = "Deploio" }
   end
 
   def setup_environments
@@ -133,17 +126,25 @@ class Renuo::Cli::Commands::CreateNineCloudvm
         --wait \\
         --location="#{@location}" \\
         --machine-type="#{@machine_type}" \\
-        --hostname="#{hostname(environment)}" \\
+        --hostname="#{@project_name_with_org_prefix}-#{environment}" \\
         --os="#{@os}" \\
         --ssh-keys-from-files=#{SSH_KEY_FILE_NAME}.pub
+
+      # Add an A record for #{domain(environment)} pointing to the IP address of the #{environment} cloud VM
+      # (see: nctl get cloudvm #{environment} --project #{@project_name_with_org_prefix})
     OUTPUT
   end
 
-  def hostname(environment)
-    "#{@project_name_with_org_prefix}-#{environment}"
+  def domain(environment)
+    "#{@project_name}-#{environment}.renuoapp.ch"
+  end
+
+  def ssh_url_fields
+    ENVIRONMENTS.map { |environment| "'#{environment}[url]=ssh://root@#{domain(environment)}'" }.join(" \\\n  ")
   end
 
-  def generate_ssh_key(file_name)
+  def setup_ssh_key
+    say "\n# Generate the SSH key to access the cloud VM\n".bold
     say <<~OUTPUT
       # Create SSH key item in 1Password directly
       op item create \\
@@ -152,15 +153,16 @@ class Renuo::Cli::Commands::CreateNineCloudvm
         --ssh-generate-key #{SSH_ALGORITHM.downcase} \\
         --title "#{@project_name_with_org_prefix}-cloudvm-key" \\
         --vault #{@vault_name} \\
-        --tags #{@project_name_with_org_prefix}
+        --tags #{@project_name_with_org_prefix} \\
+        #{ssh_url_fields}
 
       # Extract keys to temp files for cloud VM usage
       op item get "#{@project_name_with_org_prefix}-cloudvm-key" --vault #{@vault_name} \\
         --account renuo.1password.com \\
-        --reveal --fields "public key" > #{file_name}.pub
+        --reveal --fields "public key" > #{SSH_KEY_FILE_NAME}.pub
       op item get "#{@project_name_with_org_prefix}-cloudvm-key" --vault #{@vault_name} --reveal \\
         --account renuo.1password.com \\
-        --fields "private key" --format json | jq -r '.ssh_formats.openssh.value' > #{file_name}
+        --fields "private key" --format json | jq -r '.ssh_formats.openssh.value' > #{SSH_KEY_FILE_NAME}
     OUTPUT
   end
 end

data/lib/renuo/cli/commands/debug/all.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require_relative "../debug"
+
+class Renuo::Cli::Commands::Debug
+  # Lists all known apps grouped by service. Invoked via `renuo debug --all`.
+  # Prints every app and server found in the caches, grouped by category (Hetzner, Deploio, Heroku).
+  class All
+    CATEGORIES = [
+      { title: "Hetzner", cache: "hetzner_vms", row: :hetzner_vm_row },
+      { title: "Deploio", cache: "deploio_apps", row: :deploio_app_row },
+      { title: "Deploio VMs", cache: "deploio_vms", row: :deploio_vm_row },
+      { title: "Heroku", cache: "heroku_apps", row: :heroku_app_row }
+    ].freeze
+
+    def run
+      CATEGORIES.each { |category| print_category(category) }
+    end
+
+    private
+
+    def print_category(category)
+      rows = rows_for(category).sort_by(&:first)
+
+      say "\n#{header_for(category, rows.size)}"
+      return say "  no entries, update the cache with `renuo debug <app-name or domain>`".light_black if rows.empty?
+
+      print_rows(rows)
+    end
+
+    def rows_for(category)
+      entries = Cache.restore(category[:cache]) || []
+      entries.map { |entry| send(category[:row], entry) }
+    end
+
+    def header_for(category, count)
+      title = "#{category[:title]} (#{count})".bold
+      "#{title} #{"updated #{Cache.stored_at(category[:cache]) || "never"}".light_black}"
+    end
+
+    def print_rows(rows)
+      widths = column_widths(rows)
+      rows.each do |row|
+        columns = row.each_with_index.map { |column, index| column.ljust(widths[index]) }
+        say "  #{columns.join("  ").rstrip}"
+      end
+    end
+
+    def column_widths(rows)
+      rows.first.each_index.map { |index| rows.map { |row| row[index].length }.max }
+    end
+
+    def hetzner_vm_row(server)
+      [server[:name].to_s, server[:public_ip].to_s, server[:fqdn].to_s]
+    end
+
+    def deploio_app_row(app)
+      [app[:name].to_s, [app[:organization], app[:namespace]].compact_blank.uniq.join("/"), app[:hosts].to_a.join(", ")]
+    end
+
+    def deploio_vm_row(server)
+      [server[:name].to_s, server[:namespace].to_s, [server[:ip], server[:fqdn]].compact_blank.join("  ")]
+    end
+
+    def heroku_app_row(app)
+      [app[:name].to_s, app[:domains].to_a.join(", ")]
+    end
+  end
+end

data/lib/renuo/cli/commands/debug.rb

@@ -4,6 +4,7 @@ require_relative "../services/cache"
 require_relative "../services/deploio"
 require_relative "../services/heroku"
 require_relative "../services/hetzner"
+require_relative "debug/all"
 require "shellwords"
 
 class Renuo::Cli::Commands::Debug # rubocop:disable Metrics/ClassLength
@@ -23,6 +24,8 @@ class Renuo::Cli::Commands::Debug # rubocop:disable Metrics/ClassLength
     c.option "-H", "--heroku", "Show only Heroku apps"
     c.option "-d", "--deploio", "Show only Deploio apps"
     c.option "-z", "--hetzner", "Show only Hetzner vms"
+    c.option "-a", "--all", "List all known apps grouped by category"
+    c.example "renuo debug --all", "Lists all cached apps and servers"
     c.action do |args, options|
       new.run(args, options)
     rescue Interrupt
@@ -34,6 +37,8 @@ class Renuo::Cli::Commands::Debug # rubocop:disable Metrics/ClassLength
   # rubocop:todo Metrics/MethodLength
   # rubocop:todo Metrics/AbcSize
   def run(args, options) # rubocop:todo Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
+    return All.new.run if options.all
+
     query = args[0]
     abort(">> Please provide an app name or domain.") if query.blank?
 

data/lib/renuo/cli/version.rb

@@ -3,7 +3,7 @@
 # simplecov:disable
 module Renuo
   class Cli
-    VERSION = "4.24.0"
+    VERSION = "4.25.0"
     NAME = "renuo-cli"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: renuo-cli
 version: !ruby/object:Gem::Version
-  version: 4.24.0
+  version: 4.25.0
 platform: ruby
 authors:
 - Renuo AG
@@ -80,6 +80,7 @@ files:
 - lib/renuo/cli/commands/create_pr.rb
 - lib/renuo/cli/commands/create_slidev_presentation.rb
 - lib/renuo/cli/commands/debug.rb
+- lib/renuo/cli/commands/debug/all.rb
 - lib/renuo/cli/commands/display_name.rb
 - lib/renuo/cli/commands/fetch_emails.rb
 - lib/renuo/cli/commands/fetch_secrets.rb
@@ -132,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.15
+rubygems_version: 4.0.21
 specification_version: 4
 summary: The Renuo CLI automates some common workflows.
 test_files: []