renuo-cli 4.17.2 → 4.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bd8ae089520815a2934d6aa8bd1b7209af01e717c1e623c0a53bfb0cda0931e
-  data.tar.gz: 49c94fd014528566a51727e6f7938b56ff8a0ec37aa93c5a4292b3ba10a0abd2
+  metadata.gz: 4e5e4edeb2c97766d224c621442512a677b7d6c0f65578698bd70bcfe46df3df
+  data.tar.gz: c95e67243cf5cd444f3601c545c207786cf59bd67833406d6120bac816473205
 SHA512:
-  metadata.gz: 6d960d53deb1dc144cfeaa77311732139c0e29f651567934a7fbd3ea9d3a812f8f6fa77f83d90338ccc4fe55bf3f7a528aaa1e2191dbb120f09db031a13c8582
-  data.tar.gz: e70f032d4d4c1b7323cd5fc177d93e6c9d37ff83b72a54e3ee5be368eb07e88132fd81e50233217ef862ce1b3d5df696bfb957390f664f40b530f4e0a13360b7
+  metadata.gz: 70a03383d91f799fd4bcae9acce5425f550af8da2f86424ee77960da92ad976ec6c7ff09ee755d5f1490d651e7be4978539ac5b6308471efbb212b219c7034e7
+  data.tar.gz: 452fca47194f507a0e6651b116c45ab97db03cb5aa9dcfba2c0ae24b10dc3f254984def3dcb17f2bd1ea735422c2b17540d2939b7a6037be4cea7b1cabc1ac3d

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,14 +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.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 { |args| new.run(args) }
+    c.action { |args, options| new.run(args, options) }
   end
 
-  def run(args)
+  def run(args, options = {})
     @project_name, @git_url = args
+    @options = options
     parse_arguments
     setup_commands
     setup_environments
@@ -51,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
@@ -60,7 +67,7 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
 
   def set_project_name
     loop do
-      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)
@@ -69,7 +76,7 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
     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
@@ -98,7 +105,23 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
   end
 
   def set_vault_name
-    @vault_name = ask("Enter the 1Password vault name: ") { |q| q.default = "Deploio" }
+    @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_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 setup_commands
@@ -127,7 +150,7 @@ 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
 
@@ -135,14 +158,14 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
     if environment == "main"
       say <<~OUTPUT
         nctl create postgres #{environment} \\
-          --project=#{@project_name} \\
+          --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} \\
+          --project=#{@project_name_with_org_prefix} \\
           --postgres-database-version=#{@postgres_version}
       OUTPUT
     end
@@ -151,7 +174,7 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
   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}" \\
@@ -169,15 +192,15 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
         --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

data/lib/renuo/cli/version.rb

@@ -3,7 +3,7 @@
 # :nocov:
 module Renuo
   class Cli
-    VERSION = "4.17.2"
+    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.2
+  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: 4.0.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: The Renuo CLI automates some common workflows.
 test_files: []