renuo-cli 4.17.1 → 4.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d001b3727b2158e75b84057e5520246f4a4983ebc9008a97802134a07a7fe9a1
-  data.tar.gz: d258158583a1659efea53a52cfb1e29569753e55e4c30d62c95984fed5498813
+  metadata.gz: 4e5e4edeb2c97766d224c621442512a677b7d6c0f65578698bd70bcfe46df3df
+  data.tar.gz: c95e67243cf5cd444f3601c545c207786cf59bd67833406d6120bac816473205
 SHA512:
-  metadata.gz: cea757ec3ba510fbec394fe7d313edac2ef4db8e7d31f53e0c9cf83af0ef8d8225e53fa68a3f3c4beea206ef55e022774ef2cd342a1545aa4af925016b936bb1
-  data.tar.gz: 38a9b4a0b037a9ec087fd39060b7b154fbb5ce77533e80f9d977246c62f25fc3dee99e88f36ac7cdf96ec7eb01f7651ef6a89eac22bcb43dbf8c2a95ae1a35bd
+  metadata.gz: 70a03383d91f799fd4bcae9acce5425f550af8da2f86424ee77960da92ad976ec6c7ff09ee755d5f1490d651e7be4978539ac5b6308471efbb212b219c7034e7
+  data.tar.gz: 452fca47194f507a0e6651b116c45ab97db03cb5aa9dcfba2c0ae24b10dc3f254984def3dcb17f2bd1ea735422c2b17540d2939b7a6037be4cea7b1cabc1ac3d

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

@@ -83,6 +83,11 @@ class Renuo::Cli::Commands::CheckDeploioStatus
     when "available", "success"
       puts "#{type} succeeded"
       true
+    when "superseded"
+      puts "release was superseded"
+      true
+    when "paused"
+      abort "app is paused"
     when "error", "failed", "failure"
       puts fetch_build_logs
       abort "#{type} failed"

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

@@ -9,7 +9,7 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
   PROJECT_NAME_PREFIX = "renuo-"
 
   command "create-deploio-app" do |c|
-    c.syntax = "renuo create-deploio-app"
+    c.syntax = "renuo create-deploio-app [project-name] [git-url]"
     c.summary = "Generates the script necessary to setup an application on Deploio."
     c.description = <<~DESC
       Generates the script necessary to setup an application on Deploio.
@@ -20,13 +20,16 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
       - Configure repository access by generating SSH keys and adding them to 1Password.
       - Create the application and database for each specified environment.
     DESC
-    c.example "renuo create-deploio-app",
+    c.option "--org <organization>", String, "The organization name"
+    c.example "renuo create-deploio-app my-app git@github.com:renuo/my-app.git",
               "Prompts the user for the necessary information and generates the commands " \
               "to create the project, databases, and apps on Deploio."
-    c.action { new.run }
+    c.action { |args, options| new.run(args, options) }
   end
 
-  def run
+  def run(args, options = {})
+    @project_name, @git_url = args
+    @options = options
     parse_arguments
     setup_commands
     setup_environments
@@ -50,7 +53,12 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
 
   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_git_url
     set_postgres_version
@@ -59,24 +67,25 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
 
   def set_project_name
     loop do
-      @project_name = ask("Enter the project name (e.g: my-app): ")
-
-      break if @project_name&.length&.between?(3, 63) && @project_name.match?(/^[a-z0-9-]+$/)
+      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_display_name = @project_name
-    @project_name = PROJECT_NAME_PREFIX + @project_name
+    @project_name_with_org_prefix = "#{@organization}-#{@project_name}"
   end
 
   def set_git_url
     loop do
-      @git_url = ask("Enter the git URL (e.g: git@github.com:my-org/my-app.git): ")
       break if @git_url.present? && git_url_valid?(@git_url)
 
       say ">> Git URL must be provided and valid. Please try again.".colorize(:red)
+
+      @git_url = ask("Enter the git URL: ") { |q| q.default = "git@github.com:renuo/#{@project_name}.git" }
     end
 
     return unless http_git_url?(@git_url)
@@ -87,26 +96,31 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
 
   def set_postgres_version
     loop do
-      @postgres_version = ask("Enter Postgres version (e.g., 16) or leave empty to skip database creation: ")
+      @postgres_version = ask("Enter Postgres version (e.g., 17) 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 16 instead of 16.4. Please try again.".colorize(:red)
+          "For example, use 17 instead of 17.4. Please try again.".colorize(:red)
+    end
+  end
+
+  def set_vault_name
+    @vault_name = ask("SSH Credentials for deploio to access the git repo will be stored on 1Password. " \
+                      "Enter the 1Password vault name: ") do |q|
+      q.default = "Deploio"
     end
   end
 
-  def set_vault_name # rubocop:disable Metrics/MethodLength
+  def set_organization
+    @organization = @options.org if @options.org
+
     loop do
-      @vault_name = ask("Enter the 1Password vault name (leave empty to skip): ")
-      if @vault_name.empty?
-        say "Skipping 1Password vault setup. Defaulting to Deploio."
-        @vault_name = "Deploio"
-        break
-      elsif @vault_name.present?
-        break
-      else
-        say ">> The vault name must be provided. Please try again.".colorize(:red)
-      end
+      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
 
@@ -136,28 +150,36 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
 
   def say_project_creation
     say <<~OUTPUT
-      nctl create project #{@project_name} --display-name='#{@project_display_name}'
+      nctl create project #{@project_name_with_org_prefix} --display-name='#{@project_display_name}' --organization=#{@organization}
     OUTPUT
   end
 
   def say_database_creation(environment)
-    say <<~OUTPUT
-      nctl create postgres #{environment} \\
-        --project=#{@project_name} \\
-        --postgres-version=#{@postgres_version} \\
-        --machine-type=nine-db-xs
-    OUTPUT
+    if environment == "main"
+      say <<~OUTPUT
+        nctl create postgres #{environment} \\
+          --project=#{@project_name_with_org_prefix} \\
+          --postgres-version=#{@postgres_version} \\
+          --machine-type=nine-db-xs
+      OUTPUT
+    else
+      say <<~OUTPUT
+        nctl create postgresdatabase #{environment} \\
+          --project=#{@project_name_with_org_prefix} \\
+          --postgres-database-version=#{@postgres_version}
+      OUTPUT
+    end
   end
 
   def say_app_creation(environment)
     say <<~OUTPUT
       nctl create app #{environment} \\
-        --project #{@project_name} \\
+        --project #{@project_name_with_org_prefix} \\
         --git-ssh-private-key-from-file=#{GITHUB_SSH_KEY_FILE_NAME} \\
         --git-url=#{@git_url} \\
         --git-revision="#{environment}" \\
-        --basic-auth=false `# Disabling Deploio basic auth as Rails app handles authentication` \\
-        --build-env=SECRET_KEY_BASE='rails secret' `# Do not forget to generate the secret key` \\
+        --basic-auth=#{environment == "develop"} \\
+        --build-env=SECRET_KEY_BASE="$(rails secret)" \\
         --language=ruby \\
         --size=mini
     OUTPUT
@@ -167,16 +189,19 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
     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}-deploy-key" \\
+        --title "#{@project_name_with_org_prefix}-deploy-key" \\
         --vault #{@vault_name} \\
-        --tags #{@project_name}
+        --tags #{@project_name_with_org_prefix}
 
       # Extract keys to temp files for deploio usage
-      op item get "#{@project_name}-deploy-key" --vault #{@vault_name} \\
+      op item get "#{@project_name_with_org_prefix}-deploy-key" --vault #{@vault_name} \\
+        --account renuo.1password.com \\
         --reveal --fields "public key" > #{file_name}.pub
-      op item get "#{@project_name}-deploy-key" --vault #{@vault_name} --reveal \\
+      op item get "#{@project_name_with_org_prefix}-deploy-key" --vault #{@vault_name} --reveal \\
+        --account renuo.1password.com \\
         --fields "private key" --format json | jq -r '.ssh_formats.openssh.value' > #{file_name}
     OUTPUT
   end

data/lib/renuo/cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: renuo-cli
 version: !ruby/object:Gem::Version
-  version: 4.17.1
+  version: 4.17.3
 platform: ruby
 authors:
 - Renuo AG
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: The Renuo CLI automates some common workflows.
 test_files: []