renuo-cli 4.22.0 → 4.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13ccfc20af1ba9cda74f9ffb3a9b8f24cbbf34808a4d94e5baab28f6da384d26
-  data.tar.gz: ac1d41b13a258f07268bb78ed0f6b697eaf4abd2ffe4ae324b4c41880bb253df
+  metadata.gz: d49d5760372b8bb7bd5ada89efeb64580a32f62997a701597a48a5ce7fda72ed
+  data.tar.gz: 384d94a32debe72aab7d4d68b0c3b4241ee4260e74caeaae63751daf8b044fba
 SHA512:
-  metadata.gz: 72fa17d236d416cb18c8f99d1e463ee8e90c6740102348df812090269c996337fad30a48c953f94ad31fc710f835d311dbf45a8190eb9e982398f7d404d88358
-  data.tar.gz: d0cf0de0355ae2b5bef63e1209b74fd818a362072054386106c495035df5c67053b3e1e18a79eecb480812dfe801acc1974b9f8e3d97dc9e198231c42db0ad0d
+  metadata.gz: e9a012730f76d8428624dbe15a56f78bab6b9c1f0109d30b1eebc0cd31434ebb1657d1704c4a5d887d6d4b8c1ec5157c1eb2dc0ab54f426a3a2f2d72317b90aa
+  data.tar.gz: cdf2265362bedb6f2172ca1058ccfdcf06f5823ea244a26aff46d1bf9bb68a537828cc4f571780eafdd41daeec3ae00e82b4d7f77869ed472233edaa5e30a9e8

data/README.md

@@ -30,7 +30,8 @@ After checking out the repo, run `bin/setup` to install dependencies.
 
 Run `rake spec` to run the tests.
 
-Run `bundle exec ruby -Ilib ./bin/renuo` to run the executable. (e.g. `ruby -Ilib ./bin/renuo -v`)
+Run `bin/renuo` to run the executable against the working tree. (e.g. `bin/renuo -v`)
+The shipped executable lives in `exe/renuo`; `bin/renuo` is a bundler binstub that loads it with the local code.
 
 You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
@@ -46,7 +47,7 @@ This binds the `renuo` command to your local version, so you can run commands di
 
 ```shell
 renuo -h
-renuo generate_github_settings
+renuo generate-password
 ```
 
 To install this gem onto your local machine, run `bundle exec rake install`.

data/exe/renuo

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "renuo/cli"
+Renuo::Cli.new.start

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

@@ -2,9 +2,10 @@
 
 # :nocov:
 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>"
@@ -17,11 +18,11 @@ module Renuo::Cli::Commands::Ci
 
     def run
       puts "(1/2) Checking build status for revision #{@revision}..."
-      poll "build"
+      with_streamed_logs("build") { poll "build" }
       abort "build check timed out after #{TIMEOUT_IN_SECONDS} seconds" if build.nil?
 
       puts "(2/2) Checking release status for build #{build_name}..."
-      poll "release"
+      with_streamed_logs("app") { poll "release" }
       abort "release check timed out after #{TIMEOUT_IN_SECONDS} seconds" if release.nil?
     end
 
@@ -49,12 +50,24 @@ module Renuo::Cli::Commands::Ci
       Psych.load_stream stdout
     end
 
-    def fetch_build_logs
-      command = "nctl logs build -a #{@app} -p #{@project} -l 5000 --no-labels"
-      stdout, stderr, status = Open3.capture3 command
+    def with_streamed_logs(type)
+      pid = Process.spawn(
+        "nctl logs application #{@app} -p #{@project} --type=#{type} -f --lines=100 --since 15m --no-labels",
+        out: $stdout, err: $stdout
+      )
+      yield
+    ensure
+      sleep LOG_DRAIN_SECONDS
+      stop_streaming(pid)
+    end
+
+    def stop_streaming(pid)
+      return unless pid
 
-      puts "error fetching build logs: #{stderr}" unless status.success?
-      stdout
+      Process.kill("KILL", pid)
+      Process.wait(pid)
+    rescue Errno::ESRCH, Errno::ECHILD
+      nil
     end
 
     def build
@@ -82,7 +95,7 @@ module Renuo::Cli::Commands::Ci
     end
 
     def succeeded?(status, type) # rubocop:disable Metrics/MethodLength
-      time = "[#{Time.now.utc.iso8601}]"
+      time = Time.current.iso8601.to_s
 
       case status
       when "available", "success"
@@ -94,7 +107,6 @@ module Renuo::Cli::Commands::Ci
       when "paused"
         abort "#{time} app is paused"
       when "error", "failed", "failure"
-        puts fetch_build_logs
         abort "#{time} #{type} failed"
       else
         puts "#{time} #{type} status is #{status}, waiting..."

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

@@ -15,7 +15,7 @@ module Renuo::Cli::Commands::Ci
     end
 
     def run
-      system! "nctl update app #{@app} -p #{@project} --env APP_REVISION=#{@git_revision} " \
+      system! "nctl update app #{@app} -p #{@project} " \
               "#{"--build-env RUBY_VERSION=#{File.read(".ruby-version").strip} " if @docker}" \
               "--git-revision #{@git_revision} --skip-repo-access-check"
     end

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

@@ -96,11 +96,11 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
 
   def set_postgres_version
     loop do
-      @postgres_version = ask("Enter Postgres version (e.g., 17) or leave empty to skip database creation: ")
+      @postgres_version = ask("Enter Postgres version (e.g., 18) or leave empty to skip database creation: ")
       break if @postgres_version.empty? || @postgres_version.match?(/^\d+$/)
 
       say ">> The postgres version is invalid. Only major versions are allowed. " \
-          "For example, use 17 instead of 17.4. Please try again.".colorize(:red)
+          "For example, use 18 instead of 18.4. Please try again.".colorize(:red)
     end
   end
 

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

@@ -0,0 +1,166 @@
+# frozen_string_literal: true
+
+require_relative "../helpers/environments"
+
+class Renuo::Cli::Commands::CreateNineCloudvm
+  SSH_KEY_FILE_NAME = "temporary_cloudvm_ssh_key"
+  SSH_ALGORITHM = "Ed25519"
+  DEFAULT_LOCATION = "nine-es34"
+  DEFAULT_MACHINE_TYPE = "nine-small-1"
+  DEFAULT_OS = "debian13"
+  VPS_SETUP_GUIDE_REPO = "https://github.com/renuo/vps-setup-guide"
+
+  command "create-nine-cloudvm" do |c|
+    c.syntax = "renuo create-nine-cloudvm [project-name]"
+    c.summary = "Generates the script necessary to setup a cloud VM on Nine."
+    c.description = <<~DESC
+      Generates the script necessary to setup a cloud VM on Nine.
+      This command will:
+      - Prompt for the organization, project name, location, machine type, OS, and 1Password vault name.
+      - Validate the provided inputs.
+      - Generate an SSH key (stored in 1Password) to access the cloud VM.
+      - Generate the commands to create a cloud VM for each environment on Nine.
+    DESC
+    c.option "-o", "--org <organization>", String, "The organization name"
+    c.example "renuo create-nine-cloudvm my-app",
+              "Prompts the user for the necessary information and generates the commands " \
+              "to create the cloud VMs on Nine."
+    c.action { |args, options| new.run(args, options) }
+  end
+
+  def run(args, options = {})
+    @project_name, = args
+    @options = options
+    parse_arguments
+    setup_ssh_key
+    setup_environments
+    say_configuration_note
+  ensure
+    cleanup
+  end
+
+  private
+
+  def valid_name?(name)
+    name&.length&.between?(3, 63) && name.match?(/^[a-z0-9-]+$/)
+  end
+
+  def parse_arguments
+    set_organization
+    set_project_name
+    set_location
+    set_machine_type
+    set_os
+    set_vault_name
+  end
+
+  def set_project_name
+    loop do
+      break if valid_name?(@project_name)
+
+      say ">> Project name must be between 3 and 63 characters and can only contain lowercase letters, " \
+          "numbers, and hyphens. Please try again.".colorize(:red)
+
+      @project_name = ask("Enter the project name (e.g: my-app): ")
+    end
+
+    @project_name_with_org_prefix = "#{@organization}-#{@project_name}"
+  end
+
+  def set_organization
+    @organization = @options.org if @options.org
+
+    loop do
+      break if valid_name?(@organization)
+
+      say ">> Organization name must be between 3 and 63 characters and can only contain lowercase letters, " \
+          "numbers, and hyphens. Please try again.".colorize(:red)
+
+      @organization = ask("Enter the organization name (default: renuo): ") { |q| q.default = "renuo" }
+    end
+  end
+
+  def set_location
+    @location = ask("Enter the location (default: #{DEFAULT_LOCATION}): ") { |q| q.default = DEFAULT_LOCATION }
+  end
+
+  def set_machine_type
+    @machine_type = ask("Enter the machine type (default: #{DEFAULT_MACHINE_TYPE}): ") do |q|
+      q.default = DEFAULT_MACHINE_TYPE
+    end
+  end
+
+  def set_os
+    @os = ask("Enter the operating system (default: #{DEFAULT_OS}): ") { |q| q.default = DEFAULT_OS }
+  end
+
+  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)
+  end
+
+  def setup_environments
+    ENVIRONMENTS.each do |environment|
+      say "\n# Commands to create #{environment} cloud VM \n".bold
+      say_cloudvm_creation(environment)
+    end
+  end
+
+  def say_configuration_note
+    say "\n# Configure the cloud VMs\n".bold
+    say <<~OUTPUT
+      Once the cloud VMs are up, configure them (SSH access, monitoring, backups) with the
+      Ansible VPS setup guide: #{VPS_SETUP_GUIDE_REPO}
+    OUTPUT
+  end
+
+  def cleanup
+    say "\n# Cleanup temporary files\n".bold
+    say "rm #{SSH_KEY_FILE_NAME} #{SSH_KEY_FILE_NAME}.pub"
+  end
+
+  def say_cloudvm_creation(environment)
+    say <<~OUTPUT
+      nctl create cloudvm #{environment} \\
+        --project #{@project_name_with_org_prefix} \\
+        --wait \\
+        --location="#{@location}" \\
+        --machine-type="#{@machine_type}" \\
+        --hostname="#{hostname(environment)}" \\
+        --os="#{@os}" \\
+        --ssh-keys-from-files=#{SSH_KEY_FILE_NAME}.pub
+    OUTPUT
+  end
+
+  def hostname(environment)
+    "#{@project_name_with_org_prefix}-#{environment}"
+  end
+
+  def generate_ssh_key(file_name)
+    say <<~OUTPUT
+      # Create SSH key item in 1Password directly
+      op item create \\
+        --account renuo.1password.com \\
+        --category ssh \\
+        --ssh-generate-key #{SSH_ALGORITHM.downcase} \\
+        --title "#{@project_name_with_org_prefix}-cloudvm-key" \\
+        --vault #{@vault_name} \\
+        --tags #{@project_name_with_org_prefix}
+
+      # 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
+      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}
+    OUTPUT
+  end
+end

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

@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
 class Renuo::Cli::Commands::SetupUptimerobot
-  CONTACT_GROUP_IDS = "2811620_0_0-6298845_0_0-5223624_0_0"
-  HTTPS_MONITORING = 1
-  STATUS_PAUSED = 0
-
   command "setup-uptimerobot" do |c|
     c.syntax = "renuo setup-uptimerobot"
     c.summary = "Sets up uptimerobot for the given project"
@@ -17,8 +13,8 @@ class Renuo::Cli::Commands::SetupUptimerobot
 
   def initialize(args)
     abort("No project name given.") if args.nil?
-    @api_key = ask_for_api_key
     @url = validate_url(args)
+    @api_key = read_api_key
   end
 
   def run
@@ -30,10 +26,18 @@ class Renuo::Cli::Commands::SetupUptimerobot
 
   private
 
-  def ask_for_api_key
+  LIST_API_KEY_CMD = "op item list --tags renuo-cli-uptimerobot-api-key --format=json"
+  EXTRACT_API_KEY_CMD = "op item get --reveal --field credential"
+  def read_api_key
     say "This command will configure uptimerobot for your project."
-    say "Please give in the api_key for uptimerobot"
-    ask("API-key: ")
+    say "Fetching the uptimerobot api_key from 1Password..."
+    stdout, stderr, status = Open3.capture3("#{LIST_API_KEY_CMD} | #{EXTRACT_API_KEY_CMD}")
+    abort("Failed to fetch the uptimerobot api_key from 1Password: #{stderr.strip}") unless status.success?
+
+    api_key = stdout.strip
+    abort("No 1Password item tagged 'renuo-cli-uptimerobot-api-key' was found.") if api_key.empty?
+
+    api_key
   end
 
   def validate_url(args)
@@ -42,13 +46,19 @@ class Renuo::Cli::Commands::SetupUptimerobot
     URI.parse(args.first)
   end
 
+  HTTPS_MONITORING = 1
+  STATUS_PAUSED = 0
+  DOMAIN_EXPIRY_NOTIFICATIONS_DISABLED = 1
+  # Format is "id_threshold_recurrence": notify #uptime after 10 minutes of downtime, without re-notifying.
+  ALERT_CONTACTS = "7783511_10_0"
   def create_robot_params
     {
       friendly_name: @url.host.downcase,
       url: @url.to_s,
       type: HTTPS_MONITORING,
       interval: 300,
-      alert_contacts: CONTACT_GROUP_IDS
+      alert_contacts: ALERT_CONTACTS,
+      disable_domain_expire_notifications: DOMAIN_EXPIRY_NOTIFICATIONS_DISABLED
     }
   end
 

data/lib/renuo/cli/templates/semaphore/semaphore.yml.erb

@@ -24,7 +24,7 @@ global_job_config:
       - source .semaphore/bin/cache_restore rails
       - bundle config set deployment 'true'
       - bundle config set path 'vendor/bundle'
-      - bundle install
+      - bundle install --retry 3
 
 blocks:
   - name: linting
@@ -49,7 +49,7 @@ blocks:
           value: test
       prologue:
         commands:
-          - sem-service start postgres 17
+          - sem-service start postgres 18
           - cp .env.example .env
           - bundle exec rails db:create db:schema:load
       jobs:

data/lib/renuo/cli/version.rb

@@ -3,7 +3,7 @@
 # :nocov:
 module Renuo
   class Cli
-    VERSION = "4.22.0"
+    VERSION = "4.23.0"
     NAME = "renuo-cli"
   end
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: renuo-cli
 version: !ruby/object:Gem::Version
-  version: 4.22.0
+  version: 4.23.0
 platform: ruby
 authors:
 - Renuo AG
-bindir: bin
+bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
@@ -62,9 +62,8 @@ extra_rdoc_files: []
 files:
 - LICENSE.txt
 - README.md
-- bin/renuo
+- exe/renuo
 - lib/renuo/cli.rb
-- lib/renuo/cli/commands/check_deploio_status.rb
 - lib/renuo/cli/commands/ci/check_deploio_status.rb
 - lib/renuo/cli/commands/ci/setup.rb
 - lib/renuo/cli/commands/ci/update_deploio_app.rb
@@ -77,6 +76,7 @@ files:
 - lib/renuo/cli/commands/create_deploio_object_storage.rb
 - lib/renuo/cli/commands/create_heroku_app.rb
 - lib/renuo/cli/commands/create_new_logins.rb
+- lib/renuo/cli/commands/create_nine_cloudvm.rb
 - lib/renuo/cli/commands/create_pr.rb
 - lib/renuo/cli/commands/create_slidev_presentation.rb
 - lib/renuo/cli/commands/debug.rb
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.8
+rubygems_version: 4.0.15
 specification_version: 4
 summary: The Renuo CLI automates some common workflows.
 test_files: []

data/bin/renuo

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'renuo/cli'
-Renuo::Cli.new.start

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

@@ -1,120 +0,0 @@
-# frozen_string_literal: true
-
-# :nocov:
-class Renuo::Cli::Commands::CheckDeploioStatus
-  TIMEOUT_IN_SECONDS = 600
-  INTERVAL_IN_SECONDS = 5
-
-  command "check-deploio-status" do |c|
-    c.syntax = "renuo check-deploio-status"
-    c.summary = "DEPRECATED: Use 'renuo ci check-deploio-status' instead."
-    c.description = "Checks the build and release status of the deployment."
-    c.option "-a", "--app <name>", String, "The name of the app"
-    c.option "-p", "--project <name>", String, "The name of the project"
-    c.option "-g", "--git-revision <revision>", String, "The git revision to check"
-    c.action { |_, options| new(options).run }
-  end
-
-  def initialize(options)
-    @revision = options.git_revision || `git rev-parse HEAD`.strip
-    @app = options.app || ENV.fetch("DEPLOIO_APP_NAME", nil)
-    @project = options.project || ENV.fetch("DEPLOIO_PROJECT", nil)
-
-    abort "missing app name" if @app.nil?
-    abort "missing project name" if @project.nil?
-  end
-
-  def run
-    warn "DEPRECATED: Use 'renuo ci check-deploio-status' instead."
-    puts "(1/2) Checking build status for revision #{@revision}..."
-    poll "build"
-    abort "build check timed out after #{TIMEOUT_IN_SECONDS} seconds" if build.nil?
-
-    puts "(2/2) Checking release status for build #{build_name}..."
-    poll "release"
-    abort "release check timed out after #{TIMEOUT_IN_SECONDS} seconds" if release.nil?
-  end
-
-  private
-
-  def system!(cmd)
-    abort unless system cmd
-  end
-
-  def fetch(type)
-    command = "nctl get #{type} -a #{@app} -p #{@project} -o yaml"
-    stdout, stderr, status = Open3.capture3 command
-
-    abort "error fetching #{type} information: #{stderr}" unless status.success?
-    Psych.load_stream stdout
-  end
-
-  def fetch_build_logs
-    command = "nctl logs build -a #{@app} -p #{@project} -l 5000 --no-labels"
-    stdout, stderr, status = Open3.capture3 command
-
-    puts "error fetching build logs: #{stderr}" unless status.success?
-    stdout
-  end
-
-  def build
-    @build ||= fetch("builds").find do |build|
-      build.dig("spec", "forProvider", "sourceConfig", "git", "revision") == @revision
-    end
-  end
-
-  def build_name
-    @build_name ||= build.dig("metadata", "name")
-  end
-
-  def build_status
-    build.dig("status", "atProvider", "buildStatus")
-  end
-
-  def release
-    @release ||= fetch("releases").find do |release|
-      release.dig("spec", "forProvider", "build", "name") == build_name
-    end
-  end
-
-  def release_status
-    release.dig("status", "atProvider", "releaseStatus")
-  end
-
-  def succeeded?(status, type) # rubocop:disable Metrics/MethodLength
-    time = "[#{Time.now.utc.iso8601}]"
-
-    case status
-    when "available", "success"
-      puts "#{time} #{type} succeeded"
-      true
-    when "superseded"
-      puts "#{time} release was superseded"
-      true
-    when "paused"
-      abort "#{time} app is paused"
-    when "error", "failed", "failure"
-      puts fetch_build_logs
-      abort "#{time} #{type} failed"
-    else
-      puts "#{time} #{type} status is #{status}, waiting..."
-      instance_variable_set :"@#{type}", nil
-    end
-  end
-
-  def poll(type)
-    elapsed = 0
-
-    while elapsed < TIMEOUT_IN_SECONDS
-      if send type
-        break if succeeded?(send(:"#{type}_status"), type)
-      else
-        puts "no matching #{type} found, waiting..."
-      end
-
-      sleep INTERVAL_IN_SECONDS
-      elapsed += INTERVAL_IN_SECONDS
-    end
-  end
-end
-# :nocov: