renuo-cli 4.19.0 → 4.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67d1a1aabbf0a54a5f93018178724eef959d87e61b6b5e7819c72c826646b925
-  data.tar.gz: 8b584d301b391e7bab989af846092bffd7635ba84862d31621fc45b76969b580
+  metadata.gz: 96e87891f76ac2c03e7d49276a00ec9f28b6d51530636c9fe18861b517202d56
+  data.tar.gz: 58a5b66274436e087f13ba451b252d2fc16a3e96c873e1abc43e6901e47dbc6c
 SHA512:
-  metadata.gz: 6c94a81ccf21115e5bdd9149ea408d31686c0f7b018a292f633bfae5b9da0e2dde58ecb3cd32d88f7ebb2a63207ecffd38c526ba342aa2d552bd07554256cf14
-  data.tar.gz: 7bb4bb3454243794e9efed8becd728a7d976f972618b8d29af226072c602c2c49d069e7a01ed8500faaf9645556bdcf9f490040e3ada0d2e3609e6a64e65944a
+  metadata.gz: 3f8ead33a76b828827e9ffeb699d9b4005d84bb3eb92bc984fae844c9d11acf3008d60cb980d75ee52707f98c68ad675a13d75d5d34c3bdc95b3ebab3a6fbef9
+  data.tar.gz: 682b8f5e3c1ce078db1bca379297a29c174f382d1a7ce882ee0a52db2056f6b54a6b3e330c6e790d0cb926130535b1e8982768886b1847fca5e7bd51b7f0a9ac

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

@@ -7,7 +7,7 @@ class Renuo::Cli::Commands::CheckDeploioStatus
 
   command "check-deploio-status" do |c|
     c.syntax = "renuo check-deploio-status"
-    c.summary = "Checks the build and release status of the deployment."
+    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"
@@ -25,6 +25,7 @@ class Renuo::Cli::Commands::CheckDeploioStatus
   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?

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

@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+# :nocov:
+module Renuo::Cli::Commands::Ci
+  class CheckDeploioStatus
+    TIMEOUT_IN_SECONDS = 600
+    INTERVAL_IN_SECONDS = 5
+
+    command "ci check-deploio-status" do |c|
+      c.syntax = "renuo ci check-deploio-status"
+      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.action { |args, options| new(args, options).run }
+    end
+
+    def run
+      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 initialize(args, options)
+      @app = args.first
+      @project = options.project
+      @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
+    end
+
+    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
+end
+# :nocov:

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Renuo::Cli::Commands::Ci
+  class UpdateDeploioApp
+    command "ci update-deploio-app" do |c|
+      c.syntax = "renuo ci update-deploio-app"
+      c.summary = "Updates a Deploio app."
+      c.description = c.summary
+      c.option "-d", "--docker", "If the app uses a Dockerfile"
+      c.option "-p", "--project <name>", String, "The name of the project"
+      c.example "renuo ci update-deploio-app main -dp renuo-dashboard",
+                "Updates the 'main' app of the 'renuo-dashboard' project using a Dockerfile"
+      c.action { |args, options| new(args, options).run }
+    end
+
+    def run
+      system! "checkout --use-cache" if @docker
+      system! "echo 'deb [trusted=yes] https://repo.nine.ch/deb/ /' " \
+              "| sudo tee /etc/apt/sources.list.d/repo.nine.ch.list"
+      system! "sudo apt-get update -qqo Dir::Etc::sourcelist=/etc/apt/sources.list.d/repo.nine.ch.list"
+      system! "sudo apt-get install -qq nctl"
+      system! "nctl auth login"
+      system! "nctl update app #{@app} -p #{@project} --env APP_REVISION=$SEMAPHORE_GIT_SHA " \
+              "#{"--build-env RUBY_VERSION=#{File.read(".ruby-version").strip} " if @docker}" \
+              "--git-revision $SEMAPHORE_GIT_SHA --skip-repo-access-check"
+    end
+
+    private
+
+    def initialize(args, options)
+      @app = args.first
+      @project = options.project
+      @docker = options.docker
+
+      abort "missing app name" unless @app
+      abort "missing project name" unless @project
+      abort "this command must be run in Semaphore" unless ENV.key?("SEMAPHORE_GIT_SHA")
+    end
+
+    def system!(cmd)
+      abort unless system cmd
+    end
+  end
+end

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

@@ -155,25 +155,14 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
   end
 
   def say_database_creation(environment)
-    if environment == "main"
-      say <<~OUTPUT
-        nctl create postgres #{environment} \\
-          --project=#{@project_name_with_org_prefix} \\
-          --postgres-version=#{@postgres_version} \\
-          --machine-type=nine-db-xs \\
-          --allowed-cidrs=0.0.0.0/0 \\
-          --location=nine-es34
-      OUTPUT
-    else
-      say <<~OUTPUT
-        nctl create postgresdatabase #{environment} \\
-          --project=#{@project_name_with_org_prefix} \\
-          --postgres-database-version=#{@postgres_version} \\
-          --location=nine-es34 \\
-          --backup-schedule=daily
-          --collation=C.UTF-8
-      OUTPUT
-    end
+    say <<~OUTPUT
+      nctl create postgresdatabase #{environment} \\
+        --project=#{@project_name_with_org_prefix} \\
+        --postgres-database-version=#{@postgres_version} \\
+        --location=nine-es34 \\
+        --backup-schedule=daily
+        --collation=C.UTF-8
+    OUTPUT
   end
 
   def say_app_creation(environment)

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

@@ -3,8 +3,8 @@ name: <%= environment %>-deploy
 
 agent:
   machine:
-    type: f1-standard-4
-    os_image: ubuntu2204
+    type: e1-standard-2
+    os_image: ubuntu2404
 
 blocks:
   - name: cd
@@ -17,10 +17,6 @@ blocks:
       jobs:
         - name: deploying
           commands:
-            - echo 'deb [trusted=yes] https://repo.nine.ch/deb/ /' | sudo tee /etc/apt/sources.list.d/repo.nine.ch.list
-            - sudo apt-get update -qqo Dir::Etc::sourcelist=/etc/apt/sources.list.d/repo.nine.ch.list
-            - sudo apt-get install -qq nctl
-            - nctl auth login --api-client-id=$NCTL_API_CLIENT_ID --api-client-secret=$NCTL_API_CLIENT_SECRET --organization=$NCTL_ORGANIZATION
-            - nctl update app <%= environment %> -p <%= project_name %> --build-env="RUBY_VERSION=$(cat .ruby-version)" --git-revision=$SEMAPHORE_GIT_SHA --skip-repo-access-check
             - gem i -q renuo-cli
-            - renuo check-deploio-status -a <%= environment %> -p <%= project_name %> -g $SEMAPHORE_GIT_SHA
+            - renuo ci update-deploio-app <%= environment %> -p renuo-<%= project_name %>
+            - renuo ci check-deploio-status <%= environment %> -p renuo-<%= project_name %>

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

@@ -4,7 +4,7 @@ name: <%= project_name %>
 agent:
   machine:
     type: f1-standard-4
-    os_image: ubuntu2204
+    os_image: ubuntu2404
 
 auto_cancel:
   running:

data/lib/renuo/cli/version.rb

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

data/lib/renuo/cli.rb

@@ -34,7 +34,7 @@ module Renuo
       program :description, "Renuo CLI"
       program :help_paging, false
 
-      Dir[File.expand_path("cli/{commands,services}/*.rb", __dir__)].each { |f| require f }
+      Dir[File.expand_path("cli/{commands,services}/**/*.rb", __dir__)].each { |f| require f }
       default_command :help
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: renuo-cli
 version: !ruby/object:Gem::Version
-  version: 4.19.0
+  version: 4.20.0
 platform: ruby
 authors:
 - Renuo AG
@@ -65,6 +65,8 @@ files:
 - bin/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/update_deploio_app.rb
 - lib/renuo/cli/commands/commit_leaderboard_stage.rb
 - lib/renuo/cli/commands/commit_leaderboard_sync.rb
 - lib/renuo/cli/commands/configure_semaphore.rb