nvoi 0.1.8 → 0.2.1

data/lib/nvoi/cli/config/command.rb

@@ -4,7 +4,7 @@ module Nvoi
   class Cli
     module Config
       # Command helper for all config operations
-      # Uses CredentialStore for crypto, ConfigApi for transformations
+      # Uses CredentialStore for crypto, Configuration::Builder for transformations
       class Command
         def initialize(options)
           @options = options
@@ -13,7 +13,7 @@ module Nvoi
 
         # Initialize new config
         def init(name, environment)
-          result = ConfigApi.init(name:, environment:)
+          result = Configuration::Builder.init(name:, environment:)
 
           if result.failure?
             error("Failed to initialize: #{result.error_message}")
@@ -40,118 +40,118 @@ module Nvoi
 
         # Domain provider
         def domain_set(provider, api_token:, account_id:)
-          with_config do |data|
-            ConfigApi.set_domain_provider(data, provider:, api_token:, account_id:)
+          with_config do |builder|
+            builder.domain_provider(provider, api_token:, account_id:)
           end
         end
 
         def domain_rm
-          with_config do |data|
-            ConfigApi.delete_domain_provider(data)
+          with_config do |builder|
+            builder.remove_domain_provider
           end
         end
 
         # Compute provider
         def provider_set(provider, **opts)
-          with_config do |data|
-            ConfigApi.set_compute_provider(data, provider:, **opts)
+          with_config do |builder|
+            builder.compute_provider(provider, **opts)
           end
         end
 
         def provider_rm
-          with_config do |data|
-            ConfigApi.delete_compute_provider(data)
+          with_config do |builder|
+            builder.remove_compute_provider
           end
         end
 
         # Server
         def server_set(name, master: false, type: nil, location: nil, count: 1)
-          with_config do |data|
-            ConfigApi.set_server(data, name:, master:, type:, location:, count:)
+          with_config do |builder|
+            builder.server(name, master:, type:, location:, count:)
           end
         end
 
         def server_rm(name)
-          with_config do |data|
-            ConfigApi.delete_server(data, name:)
+          with_config do |builder|
+            builder.remove_server(name)
           end
         end
 
         # Volume
         def volume_set(server, name, size: 10)
-          with_config do |data|
-            ConfigApi.set_volume(data, server:, name:, size:)
+          with_config do |builder|
+            builder.volume(server, name, size:)
           end
         end
 
         def volume_rm(server, name)
-          with_config do |data|
-            ConfigApi.delete_volume(data, server:, name:)
+          with_config do |builder|
+            builder.remove_volume(server, name)
           end
         end
 
         # App
         def app_set(name, servers:, **opts)
-          with_config do |data|
-            ConfigApi.set_app(data, name:, servers:, **opts)
+          with_config do |builder|
+            builder.app_entry(name, servers:, **opts)
           end
         end
 
         def app_rm(name)
-          with_config do |data|
-            ConfigApi.delete_app(data, name:)
+          with_config do |builder|
+            builder.remove_app(name)
           end
         end
 
         # Database
         def database_set(servers:, adapter:, **opts)
-          with_config do |data|
-            ConfigApi.set_database(data, servers:, adapter:, **opts)
+          with_config do |builder|
+            builder.database(servers:, adapter:, **opts)
           end
         end
 
         def database_rm
-          with_config do |data|
-            ConfigApi.delete_database(data)
+          with_config do |builder|
+            builder.remove_database
           end
         end
 
         # Service
         def service_set(name, servers:, image:, **opts)
-          with_config do |data|
-            ConfigApi.set_service(data, name:, servers:, image:, **opts)
+          with_config do |builder|
+            builder.service(name, servers:, image:, **opts)
           end
         end
 
         def service_rm(name)
-          with_config do |data|
-            ConfigApi.delete_service(data, name:)
+          with_config do |builder|
+            builder.remove_service(name)
           end
         end
 
         # Secret
         def secret_set(key_name, value)
-          with_config do |data|
-            ConfigApi.set_secret(data, key: key_name, value:)
+          with_config do |builder|
+            builder.secret(key_name, value)
           end
         end
 
         def secret_rm(key_name)
-          with_config do |data|
-            ConfigApi.delete_secret(data, key: key_name)
+          with_config do |builder|
+            builder.remove_secret(key_name)
           end
         end
 
         # Env
         def env_set(key_name, value)
-          with_config do |data|
-            ConfigApi.set_env(data, key: key_name, value:)
+          with_config do |builder|
+            builder.env(key_name, value)
           end
         end
 
         def env_rm(key_name)
-          with_config do |data|
-            ConfigApi.delete_env(data, key: key_name)
+          with_config do |builder|
+            builder.remove_env(key_name)
           end
         end
 
@@ -174,20 +174,25 @@ module Nvoi
             yaml = store.read
             data = YAML.safe_load(yaml, permitted_classes: [Symbol])
 
-            # Transform
-            result = yield(data)
+            # Transform using Builder
+            builder = Configuration::Builder.from_hash(data)
+            result = yield(builder)
 
             if result.failure?
               error("#{result.error_type}: #{result.error_message}")
             else
               # Serialize and write
-              store.write(YAML.dump(result.data))
+              store.write(builder.to_yaml)
               success("Config updated")
             end
           rescue Errors::CredentialError => e
             error(e.message)
           rescue Errors::DecryptionError => e
             error("Decryption failed: #{e.message}")
+          rescue ArgumentError => e
+            error("invalid_args: #{e.message}")
+          rescue Errors::ConfigValidationError => e
+            error("validation_error: #{e.message}")
           end
 
           def update_gitignore

data/lib/nvoi/cli/credentials/edit/command.rb

@@ -151,7 +151,7 @@ module Nvoi
 
             def resolve_working_dir
               wd = @options[:dir]
-              if wd.nil? || wd.empty? || wd == "."
+              if wd.blank? || wd == "."
                 Dir.pwd
               else
                 File.expand_path(wd)
@@ -160,7 +160,7 @@ module Nvoi
 
             def resolve_enc_path(working_dir)
               enc_path = @options[:credentials]
-              return File.join(working_dir, DEFAULT_ENCRYPTED_FILE) if enc_path.nil? || enc_path.empty?
+              return File.join(working_dir, DEFAULT_ENCRYPTED_FILE) if enc_path.blank?
 
               enc_path
             end
@@ -184,18 +184,18 @@ module Nvoi
               return "application section is required" unless app.is_a?(Hash)
 
               # Application name
-              return "application.name is required" if app["name"].nil? || app["name"].to_s.empty?
+              return "application.name is required" if app["name"].blank?
 
               # Environment
-              return "application.environment is required" if app["environment"].nil? || app["environment"].to_s.empty?
+              return "application.environment is required" if app["environment"].blank?
 
               # Domain provider
               domain_provider = app["domain_provider"]
               return "application.domain_provider.cloudflare is required" unless domain_provider&.dig("cloudflare")
 
               cf = domain_provider["cloudflare"]
-              return "application.domain_provider.cloudflare.api_token is required" if cf["api_token"].nil? || cf["api_token"].to_s.empty?
-              return "application.domain_provider.cloudflare.account_id is required" if cf["account_id"].nil? || cf["account_id"].to_s.empty?
+              return "application.domain_provider.cloudflare.api_token is required" if cf["api_token"].blank?
+              return "application.domain_provider.cloudflare.account_id is required" if cf["account_id"].blank?
 
               # Compute provider
               compute_provider = app["compute_provider"]
@@ -203,22 +203,25 @@ module Nvoi
               return "compute_provider (hetzner, aws, or scaleway) is required" unless has_compute
 
               if (h = compute_provider&.dig("hetzner"))
-                return "application.compute_provider.hetzner.api_token is required" if h["api_token"].nil? || h["api_token"].to_s.empty?
-                return "application.compute_provider.hetzner.server_type is required" if h["server_type"].nil? || h["server_type"].to_s.empty?
-                return "application.compute_provider.hetzner.server_location is required" if h["server_location"].nil? || h["server_location"].to_s.empty?
+                return "application.compute_provider.hetzner.api_token is required" if h["api_token"].blank?
+                return "application.compute_provider.hetzner.server_type is required" if h["server_type"].blank?
+                return "application.compute_provider.hetzner.server_location is required" if h["server_location"].blank?
+                return "application.compute_provider.hetzner.architecture is required" if h["architecture"].blank?
               end
 
               if (a = compute_provider&.dig("aws"))
-                return "application.compute_provider.aws.access_key_id is required" if a["access_key_id"].nil? || a["access_key_id"].to_s.empty?
-                return "application.compute_provider.aws.secret_access_key is required" if a["secret_access_key"].nil? || a["secret_access_key"].to_s.empty?
-                return "application.compute_provider.aws.region is required" if a["region"].nil? || a["region"].to_s.empty?
-                return "application.compute_provider.aws.instance_type is required" if a["instance_type"].nil? || a["instance_type"].to_s.empty?
+                return "application.compute_provider.aws.access_key_id is required" if a["access_key_id"].blank?
+                return "application.compute_provider.aws.secret_access_key is required" if a["secret_access_key"].blank?
+                return "application.compute_provider.aws.region is required" if a["region"].blank?
+                return "application.compute_provider.aws.instance_type is required" if a["instance_type"].blank?
+                return "application.compute_provider.aws.architecture is required" if a["architecture"].blank?
               end
 
               if (s = compute_provider&.dig("scaleway"))
-                return "application.compute_provider.scaleway.secret_key is required" if s["secret_key"].nil? || s["secret_key"].to_s.empty?
-                return "application.compute_provider.scaleway.project_id is required" if s["project_id"].nil? || s["project_id"].to_s.empty?
-                return "application.compute_provider.scaleway.server_type is required" if s["server_type"].nil? || s["server_type"].to_s.empty?
+                return "application.compute_provider.scaleway.secret_key is required" if s["secret_key"].blank?
+                return "application.compute_provider.scaleway.project_id is required" if s["project_id"].blank?
+                return "application.compute_provider.scaleway.server_type is required" if s["server_type"].blank?
+                return "application.compute_provider.scaleway.architecture is required" if s["architecture"].blank?
               end
 
               # Servers (if any services defined)
@@ -236,7 +239,7 @@ module Nvoi
               app_services.each do |service_name, svc|
                 next unless svc
 
-                return "app.#{service_name}.servers is required" if svc["servers"].nil? || svc["servers"].empty?
+                return "app.#{service_name}.servers is required" if svc["servers"].to_a.empty?
 
                 svc["servers"].each do |ref|
                   return "app.#{service_name} references undefined server: #{ref}" unless defined_servers.include?(ref)
@@ -245,7 +248,7 @@ module Nvoi
 
               # Validate database
               if database
-                return "database.servers is required" if database["servers"].nil? || database["servers"].empty?
+                return "database.servers is required" if database["servers"].to_a.empty?
 
                 database["servers"].each do |ref|
                   return "database references undefined server: #{ref}" unless defined_servers.include?(ref)
@@ -268,10 +271,10 @@ module Nvoi
               adapter = db["adapter"]&.downcase
               url = db["url"]
 
-              return "database.adapter is required" if adapter.nil? || adapter.empty?
+              return "database.adapter is required" if adapter.blank?
 
               # URL takes precedence - if provided, no secrets needed
-              has_url = url && !url.to_s.empty?
+              has_url = !url.blank?
 
               case adapter
               when "postgres", "postgresql"
@@ -317,6 +320,7 @@ module Nvoi
                     api_token: YOUR_HETZNER_API_TOKEN
                     server_type: cx22
                     server_location: fsn1
+                    architecture: x86
 
                 servers:
                   master:

data/lib/nvoi/cli/credentials/show/command.rb

@@ -22,7 +22,7 @@ module Nvoi
 
             def resolve_working_dir
               wd = @options[:dir]
-              if wd.nil? || wd.empty? || wd == "."
+              if wd.blank? || wd == "."
                 Dir.pwd
               else
                 File.expand_path(wd)

data/lib/nvoi/cli/db/command.rb

@@ -60,7 +60,7 @@ module Nvoi
             result = ssh.execute("test -f #{metadata_file} && cat #{metadata_file} || echo '{}'")
 
             begin
-              metadata = Objects::Database::BranchMetadata.from_json(result)
+              metadata = External::Database::Types::BranchMetadata.from_json(result)
               branches = metadata.branches
             rescue JSON::ParserError
               branches = []
@@ -185,9 +185,9 @@ module Nvoi
 
           def apply_branch_override
             branch = @options[:branch]
-            return if branch.nil? || branch.empty?
+            return if branch.blank?
 
-            override = Objects::ConfigOverride.new(branch:)
+            override = Configuration::Override.new(branch:)
             override.apply(@config)
           end
 
@@ -204,12 +204,12 @@ module Nvoi
 
           def build_dump_options
             if @db_provider.is_a?(External::Database::Sqlite)
-              Objects::Database::DumpOptions.new(
+              External::Database::Types::DumpOptions.new(
                 host_path: @creds.host_path,
                 database: @creds.database
               )
             else
-              Objects::Database::DumpOptions.new(
+              External::Database::Types::DumpOptions.new(
                 pod_name: @config.namer.database_pod_name,
                 database: @creds.database,
                 user: @creds.user,
@@ -222,12 +222,12 @@ module Nvoi
             sanitized_name = sanitize_db_name(new_db_name)
 
             if @db_provider.is_a?(External::Database::Sqlite)
-              Objects::Database::RestoreOptions.new(
+              External::Database::Types::RestoreOptions.new(
                 host_path: @creds.host_path,
                 database: sanitized_name
               )
             else
-              Objects::Database::RestoreOptions.new(
+              External::Database::Types::RestoreOptions.new(
                 pod_name: @config.namer.database_pod_name,
                 database: sanitized_name,
                 user: @creds.user,
@@ -255,12 +255,12 @@ module Nvoi
             result = ssh.execute("test -f #{metadata_file} && cat #{metadata_file} || echo '{}'")
 
             metadata = begin
-              Objects::Database::BranchMetadata.from_json(result)
+              External::Database::Types::BranchMetadata.from_json(result)
             rescue JSON::ParserError
-              Objects::Database::BranchMetadata.new
+              External::Database::Types::BranchMetadata.new
             end
 
-            metadata.branches << Objects::Database::Branch.new(
+            metadata.branches << External::Database::Types::Branch.new(
               id: branch_id,
               created_at: Time.now.iso8601,
               size:,

data/lib/nvoi/cli/delete/command.rb

@@ -64,9 +64,9 @@ module Nvoi
 
           def apply_branch_override
             branch = @options[:branch]
-            return if branch.nil? || branch.empty?
+            return if branch.blank?
 
-            override = Objects::ConfigOverride.new(branch:)
+            override = Configuration::Override.new(branch:)
             override.apply(@config)
           end
       end

data/lib/nvoi/cli/deploy/command.rb

@@ -65,9 +65,9 @@ module Nvoi
 
           def apply_branch_override
             branch = @options[:branch]
-            return if branch.nil? || branch.empty?
+            return if branch.blank?
 
-            override = Objects::ConfigOverride.new(branch:)
+            override = Configuration::Override.new(branch:)
             override.apply(@config)
           end
 

data/lib/nvoi/cli/deploy/steps/build_image.rb

@@ -28,11 +28,12 @@ module Nvoi
             def build_image(working_dir, tag)
               cache_from = @config.namer.latest_image_tag
               cache_args = "--cache-from #{cache_from}"
+              platform = @config.docker_platform
 
               build_cmd = [
                 "cd #{working_dir} &&",
                 "DOCKER_BUILDKIT=1 docker build",
-                "--platform linux/amd64",
+                "--platform #{platform}",
                 cache_args,
                 "--build-arg BUILDKIT_INLINE_CACHE=1",
                 "-t #{tag} ."

data/lib/nvoi/cli/deploy/steps/configure_tunnel.rb

@@ -43,7 +43,7 @@ module Nvoi
 
               tunnel = setup_tunnel(tunnel_name, hostnames, service_url, service_config.domain)
 
-              Objects::Tunnel::Info.new(
+              External::Dns::Types::Tunnel::Info.new(
                 service_name:,
                 hostname: primary_hostname,
                 tunnel_id: tunnel.tunnel_id,
@@ -90,7 +90,7 @@ module Nvoi
 
               @log.success "Tunnel configured: %s", tunnel_name
 
-              Objects::Tunnel::Info.new(
+              External::Dns::Types::Tunnel::Info.new(
                 tunnel_id: tunnel.id,
                 tunnel_token: token
               )

data/lib/nvoi/cli/deploy/steps/deploy_service.rb

@@ -345,18 +345,21 @@ module Nvoi
             end
 
             def check_public_url(url)
-              curl_cmd = "curl -si -m 10 '#{url}' 2>/dev/null"
+              # -L follows redirects, -s silent, -i include headers, -m timeout
+              curl_cmd = "curl -Lsi -m 10 '#{url}' 2>/dev/null"
               output = @ssh.execute(curl_cmd).strip
 
-              http_code = output.lines.first&.match(/HTTP\/[\d.]+ (\d+)/)&.captures&.first || "000"
+              # With -L, last HTTP line is the final response after redirects
+              http_lines = output.lines.select { |l| l.match?(/^HTTP\/[\d.]+\s+\d+/) }
+              http_code = http_lines.last&.match(/HTTP\/[\d.]+ (\d+)/)&.captures&.first || "000"
               has_error_header = output.lines.any? { |line| line.downcase.start_with?("x-nvoi-error:") }
 
-              if http_code == "200" && !has_error_header
+              if http_code.start_with?("2") && !has_error_header
                 { success: true, http_code:, message: "OK" }
               elsif has_error_header
                 { success: false, http_code:, message: "Error backend responding (X-Nvoi-Error header present) - app is down" }
               else
-                { success: false, http_code:, message: "HTTP #{http_code} (expected: 200)" }
+                { success: false, http_code:, message: "HTTP #{http_code} (expected: 2xx)" }
               end
             end
 

data/lib/nvoi/cli/deploy/steps/provision_server.rb

@@ -71,7 +71,7 @@ module Nvoi
               # Create cloud-init user data
               user_data = generate_user_data
 
-              opts = Objects::Server::CreateOptions.new(
+              opts = External::Cloud::Types::Server::CreateOptions.new(
                 name:,
                 type: server_type,
                 image:,

data/lib/nvoi/cli/deploy/steps/provision_volume.rb

@@ -66,7 +66,7 @@ module Nvoi
               raise Errors::VolumeError, "server not found: #{vol_config[:server_name]}" unless server
 
               # Create volume
-              opts = Objects::Volume::CreateOptions.new(
+              opts = External::Cloud::Types::Volume::CreateOptions.new(
                 name: vol_config[:name],
                 size: vol_config[:size],
                 server_id: server.id

data/lib/nvoi/cli/exec/command.rb

@@ -55,9 +55,9 @@ module Nvoi
 
           def apply_branch_override
             branch = @options[:branch]
-            return if branch.nil? || branch.empty?
+            return if branch.blank?
 
-            override = Objects::ConfigOverride.new(branch:)
+            override = Configuration::Override.new(branch:)
             override.apply(@config)
           end
 
@@ -132,7 +132,7 @@ module Nvoi
           end
 
           def resolve_server_name(name)
-            return @config.server_name if name.nil? || name.empty? || name == "main"
+            return @config.server_name if name.blank? || name == "main"
 
             parts = name.split("-")
             if parts.length >= 2

data/lib/nvoi/cli/logs/command.rb

@@ -55,9 +55,9 @@ module Nvoi
 
           def apply_branch_override
             branch = @options[:branch]
-            return if branch.nil? || branch.empty?
+            return if branch.blank?
 
-            override = Objects::ConfigOverride.new(branch:)
+            override = Configuration::Override.new(branch:)
             override.apply(@config)
           end
       end