renuo-cli 4.24.0 → 4.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df7e7a6d263ccafd4c253e16e68a8ce4dbb489e1f726d6f8e55988fa82a3c9f3
-  data.tar.gz: be67e8df4fedb4a8e08913e2758a83ab43a4ee5e7117277db93a4fac64e6326e
+  metadata.gz: 456b03fb5a2d4bfa991efb571755004c00a515b672de04d5d99cb40176445201
+  data.tar.gz: 108335dbceb383a2be328ed1f16f28c97f0e62dcb5c270495704c30ed1ecd23f
 SHA512:
-  metadata.gz: bf10d74c836b636236cedf3acceea7cf01ee682ef5f79d153f5d4c08a39a0d17ff8f574e3c49e6505e289ed4b178dedf2eca1ec42af1018085c3c22ab4911a34
-  data.tar.gz: 19320a9d06dd5d2d4cde92bd86c68f3d6efd5509ccfb4d18cdcebc26653f9109c0cd6fbedb9755ed68ba7744ed9d4c9a40ecf86842ea637572440fd27918c2b8
+  metadata.gz: d69d47ce40a20dd5b590d684e62117613c074db0f6178a0a8c4470af451ddb171637b6fe23e23198f4f5ed2fa40661cbbfb87ed5b92357adbbfb56085a0e2689
+  data.tar.gz: 81e5ff22b46aa16b11ad3fa9cf1a0a91d7eb0c91cebc88604611610018ea47957b5e51d0c44217e0c9cca75aa86dc7eca37aea5a9ce7600b211d1b9f6c3c69c3

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/version.rb

@@ -3,7 +3,7 @@
 # simplecov:disable
 module Renuo
   class Cli
-    VERSION = "4.24.0"
+    VERSION = "4.24.1"
     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.24.1
 platform: ruby
 authors:
 - Renuo AG