renuo-cli 4.23.0 → 4.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d49d5760372b8bb7bd5ada89efeb64580a32f62997a701597a48a5ce7fda72ed
-  data.tar.gz: 384d94a32debe72aab7d4d68b0c3b4241ee4260e74caeaae63751daf8b044fba
+  metadata.gz: df7e7a6d263ccafd4c253e16e68a8ce4dbb489e1f726d6f8e55988fa82a3c9f3
+  data.tar.gz: be67e8df4fedb4a8e08913e2758a83ab43a4ee5e7117277db93a4fac64e6326e
 SHA512:
-  metadata.gz: e9a012730f76d8428624dbe15a56f78bab6b9c1f0109d30b1eebc0cd31434ebb1657d1704c4a5d887d6d4b8c1ec5157c1eb2dc0ab54f426a3a2f2d72317b90aa
-  data.tar.gz: cdf2265362bedb6f2172ca1058ccfdcf06f5823ea244a26aff46d1bf9bb68a537828cc4f571780eafdd41daeec3ae00e82b4d7f77869ed472233edaa5e30a9e8
+  metadata.gz: bf10d74c836b636236cedf3acceea7cf01ee682ef5f79d153f5d4c08a39a0d17ff8f574e3c49e6505e289ed4b178dedf2eca1ec42af1018085c3c22ab4911a34
+  data.tar.gz: 19320a9d06dd5d2d4cde92bd86c68f3d6efd5509ccfb4d18cdcebc26653f9109c0cd6fbedb9755ed68ba7744ed9d4c9a40ecf86842ea637572440fd27918c2b8

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

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-# :nocov:
+# simplecov:disable
 module Renuo::Cli::Commands::Ci
-  class CheckDeploioStatus # rubocop:disable Metrics/ClassLength
+  class CheckDeploioStatus
     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 and release status of the deployment."
+      c.summary = "Checks the build 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,13 +17,9 @@ module Renuo::Cli::Commands::Ci
     end
 
     def run
-      puts "(1/2) Checking build status for revision #{@revision}..."
-      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}..."
-      with_streamed_logs("app") { poll "release" }
-      abort "release check timed out after #{TIMEOUT_IN_SECONDS} seconds" if release.nil?
+      puts "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
     end
 
     private
@@ -42,17 +38,17 @@ module Renuo::Cli::Commands::Ci
       abort unless system cmd
     end
 
-    def fetch(type)
-      command = "nctl get #{type} -a #{@app} -p #{@project} -o yaml"
+    def fetch_builds
+      command = "nctl get builds -a #{@app} -p #{@project} -o yaml"
       stdout, stderr, status = Open3.capture3 command
 
-      abort "error fetching #{type} information: #{stderr}" unless status.success?
+      abort "error fetching build information: #{stderr}" unless status.success?
       Psych.load_stream stdout
     end
 
-    def with_streamed_logs(type)
+    def with_streamed_build_logs
       pid = Process.spawn(
-        "nctl logs application #{@app} -p #{@project} --type=#{type} -f --lines=100 --since 15m --no-labels",
+        "nctl logs application #{@app} -p #{@project} --type=build -f --lines=100 --since 15m --no-labels",
         out: $stdout, err: $stdout
       )
       yield
@@ -71,63 +67,54 @@ 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
 
     def build_name
-      @build_name ||= build.dig("metadata", "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
+    def build_succeeded? # rubocop:disable Metrics/MethodLength
       time = Time.current.iso8601.to_s
 
-      case status
+      case build_status
       when "available", "success"
-        puts "#{time} #{type} succeeded"
-        true
-      when "superseded"
-        puts "#{time} release was superseded"
+        puts "[RENUO-CLI] #{time} build #{build_name} succeeded"
         true
       when "paused"
-        abort "#{time} app is paused"
+        abort "[RENUO-CLI] #{time} app is paused"
       when "error", "failed", "failure"
-        abort "#{time} #{type} failed"
+        abort "[RENUO-CLI] #{time} build #{build_name} failed"
       else
-        puts "#{time} #{type} status is #{status}, waiting..."
-        instance_variable_set :"@#{type}", nil
+        puts "[RENUO-CLI] #{time} build #{build_name} status is #{build_status}, waiting..."
+        false
       end
     end
 
-    def poll(type)
+    def poll_build # rubocop:disable Metrics/MethodLength
       elapsed = 0
 
       while elapsed < TIMEOUT_IN_SECONDS
-        if send type
-          break if succeeded?(send(:"#{type}_status"), type)
+        if build
+          return true if build_succeeded?
+
+          @build = nil
         else
-          puts "no matching #{type} found, waiting..."
+          puts "no matching build found, waiting..."
         end
 
         sleep INTERVAL_IN_SECONDS
         elapsed += INTERVAL_IN_SECONDS
       end
+
+      false
     end
   end
 end
-# :nocov:
+# simplecov:enable

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# :nocov:
+# simplecov:disable
 class Renuo::Cli::Commands::CreateAwsProject
   command "create-aws-project" do |c|
     c.syntax = "renuo create-aws-project"
@@ -139,4 +139,4 @@ class Renuo::Cli::Commands::CreateAwsProject
     CLOUDFRONT_COMMANDS
   end
 end
-# :nocov:
+# simplecov:enable

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# :nocov:
+# simplecov:disable
 
 class Renuo::Cli::Commands::CreateDeploioObjectStorage
   include CommandHelper

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

@@ -18,18 +18,24 @@ class Renuo::Cli::Commands::SetupUptimerobot
   end
 
   def run
-    robot_obj = monitoring_call(:new, create_robot_params)
-    validate_new_project(robot_obj)
-    response = monitoring_call(:edit, edit_robot_params(robot_obj["monitor"]["id"]))
-    final_command_status(response)
+    monitor = api_call(Net::HTTP::Post, "/monitors", create_monitor_params)
+    api_call(Net::HTTP::Post, "/monitors/#{monitor["id"]}/pause")
+    say "Successfully configured uptimerobot 🤩😎👍"
+    say "The monitor https://dashboard.uptimerobot.com/monitors/#{monitor["id"]} checks from Europe " \
+        "and is paused for now..."
+    say "You can start it once your app is ready to go live 🤠"
   end
 
   private
 
-  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."
+    ENV.fetch("UPTIMEROBOT_API_KEY") { read_api_key_from_1password }
+  end
+
+  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_from_1password
     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?
@@ -46,60 +52,38 @@ 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
+  UPTIME_SLACK_CHANNEL_ALERT_CONTACT_ID = "7783511"
+  EUROPE_REGION = "eu"
+  def create_monitor_params
     {
-      friendly_name: @url.host.downcase,
+      friendlyName: @url.host.downcase,
       url: @url.to_s,
-      type: HTTPS_MONITORING,
+      type: "HTTP",
       interval: 300,
-      alert_contacts: ALERT_CONTACTS,
-      disable_domain_expire_notifications: DOMAIN_EXPIRY_NOTIFICATIONS_DISABLED
+      timeout: 30,
+      checkSSLErrors: true,
+      # notify #uptime after 10 minutes of downtime, without re-notifying
+      assignedAlertContacts: [{ alertContactId: UPTIME_SLACK_CHANNEL_ALERT_CONTACT_ID, threshold: 10, recurrence: 0 }],
+      regionData: { REGION: [EUROPE_REGION], MANUAL_SELECTED: true },
+      domainExpirationReminder: false
     }
   end
 
-  def edit_robot_params(uptimerobot_monitoring_id)
-    { id: uptimerobot_monitoring_id, status: STATUS_PAUSED }
-  end
-
-  def final_command_status(response)
-    if response["stat"] == "ok"
-      say "Successfully configured uptimerobot 🤩😎👍"
-      say "The status for the monitored project has paused for now..."
-      say "You can start it once your app is ready to go live 🤠"
-    else
-      say "Something went wrong during the configuration...😕. Uptimerobot returned '#{response["error"]["message"]}'"
-    end
-  end
-
-  def validate_new_project(robot_obj)
-    return if robot_obj["stat"] == "ok"
-
-    abort("An error occoured. Uptimerobot returned '#{robot_obj["error"]["message"]}'")
-  end
+  API_URL = "https://api.uptimerobot.com/v3"
+  def api_call(request_class, path, params = {})
+    uri = URI("#{API_URL}#{path}")
+    request = request_class.new(uri, "Authorization" => "Bearer #{@api_key}", "Content-Type" => "application/json")
+    request.body = params.to_json
+    response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) { |http| http.request(request) }
+    abort("An error occurred. Uptimerobot returned '#{error_message(response)}'") unless response.is_a?(Net::HTTPSuccess)
 
-  def https_request(path, params = {})
-    uri = URI(path)
-    req = request_body(uri, params)
-    Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
-      http.request(req)
-    end
-  end
-
-  def request_body(uri, params)
-    params[:api_key] = @api_key
-    data = URI.encode_www_form params
-    req = Net::HTTP::Post.new(uri)
-    req.body = data
-    req
+    JSON.parse(response.body)
   end
 
-  def monitoring_call(action, params)
-    response = https_request("https://api.uptimerobot.com/v2/#{action}Monitor", params)
-    JSON.parse(response.body)
+  def error_message(response)
+    body = JSON.parse(response.body)
+    Array(body["message"] || body["error"] || response.body).join(", ")
+  rescue JSON::ParserError
+    response.body
   end
 end

data/lib/renuo/cli/version.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-# :nocov:
+# simplecov:disable
 module Renuo
   class Cli
-    VERSION = "4.23.0"
+    VERSION = "4.24.0"
     NAME = "renuo-cli"
   end
 end
-# :nocov:
+# simplecov:enable

data/lib/renuo/cli.rb

@@ -21,7 +21,7 @@ def agree(question)
   super
 end
 
-# :nocov:
+# simplecov:disable
 module Renuo
   class Cli
     module Commands; end
@@ -40,4 +40,4 @@ module Renuo
     end
   end
 end
-# :nocov:
+# simplecov:enable

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: renuo-cli
 version: !ruby/object:Gem::Version
-  version: 4.23.0
+  version: 4.24.0
 platform: ruby
 authors:
 - Renuo AG