nvoi 0.1.6 → 0.1.7

data/lib/nvoi/external/cloud/scaleway.rb

@@ -127,7 +127,7 @@ module Nvoi
 
         def create_server(opts)
           # Validate server type
-          server_types = list_server_types
+          server_types = list_server_types_api
           unless server_types.key?(opts.type)
             raise Errors::ValidationError, "invalid server type: #{opts.type}"
           end
@@ -170,7 +170,7 @@ module Nvoi
         end
 
         def wait_for_server(server_id, max_attempts)
-          server = Utils::Retry.poll(max_attempts: max_attempts, interval: Utils::Constants::SERVER_READY_INTERVAL) do
+          server = Utils::Retry.poll(max_attempts:, interval: Utils::Constants::SERVER_READY_INTERVAL) do
             s = get_server_api(server_id)
             to_server(s) if s["state"] == "running" && s.dig("public_ip", "address")
           end
@@ -281,7 +281,7 @@ module Nvoi
         # Validation operations
 
         def validate_instance_type(instance_type)
-          server_types = list_server_types
+          server_types = list_server_types_api
           unless server_types.key?(instance_type)
             raise Errors::ValidationError, "invalid scaleway server type: #{instance_type}"
           end
@@ -298,7 +298,7 @@ module Nvoi
         end
 
         def validate_credentials
-          list_server_types
+          list_server_types_api
           true
         rescue Errors::AuthenticationError => e
           raise Errors::ValidationError, "scaleway credentials invalid: #{e.message}"
@@ -310,6 +310,32 @@ module Nvoi
           server&.public_ipv4
         end
 
+        # List available server types for onboarding
+        def list_server_types
+          list_server_types_api.map do |name, info|
+            {
+              name:,
+              cores: info.dig("ncpus"),
+              ram: info.dig("ram"),
+              hourly_price: info.dig("hourly_price")
+            }
+          end
+        end
+
+        # List available zones for onboarding
+        def list_zones
+          VALID_ZONES.map do |z|
+            parts = z.split("-")
+            city = case parts[0..1].join("-")
+            when "fr-par" then "Paris"
+            when "nl-ams" then "Amsterdam"
+            when "pl-waw" then "Warsaw"
+            else parts[0..1].join("-")
+            end
+            { name: z, city: }
+          end
+        end
+
         private
 
           def zone_to_region(zone)
@@ -402,7 +428,7 @@ module Nvoi
             post(instance_url("/servers/#{id}/action"), { action: })
           end
 
-          def list_server_types
+          def list_server_types_api
             get(instance_url("/products/servers"))["servers"] || {}
           end
 
@@ -450,7 +476,7 @@ module Nvoi
           end
 
           def wait_for_server_state(server_id, target_state, max_attempts)
-            Utils::Retry.poll(max_attempts: max_attempts, interval: 2) do
+            Utils::Retry.poll(max_attempts:, interval: 2) do
               server = get_server_api(server_id)
               server if server["state"] == target_state
             end

data/lib/nvoi/external/containerd.rb

@@ -19,6 +19,9 @@ module Nvoi
           raise Errors::SshError, "local build failed"
         end
 
+        # Tag as :latest for next build's cache
+        system("docker", "tag", tag, cache_from) if cache_from
+
         tar_file = "/tmp/#{tag.tr(':', '_')}.tar"
         unless system("docker", "save", tag, "-o", tar_file)
           raise Errors::SshError, "docker save failed"
@@ -37,6 +40,7 @@ module Nvoi
             raise Errors::SshError, "rsync failed"
           end
 
+          Nvoi.logger.info "Importing image into containerd..."
           @ssh.execute("sudo ctr -n k8s.io images import #{remote_tar_path}")
 
           full_image_ref = "docker.io/library/#{tag}"

data/lib/nvoi/external/dns/cloudflare.rb

@@ -64,24 +64,25 @@ module Nvoi
           response["result"]
         end
 
-        def update_tunnel_configuration(tunnel_id, hostname, service_url)
+        def update_tunnel_configuration(tunnel_id, hostnames, service_url)
+          hostnames = Array(hostnames)
           url = "accounts/#{@account_id}/cfd_tunnel/#{tunnel_id}/configurations"
 
-          config = {
-            ingress: [
-              {
-                hostname:,
-                service: service_url,
-                originRequest: { httpHostHeader: hostname }
-              },
-              { service: "http_status:404" }
-            ]
-          }
+          ingress_rules = hostnames.map do |hostname|
+            {
+              hostname:,
+              service: service_url,
+              originRequest: { httpHostHeader: hostname.sub(/^\*\./, "") } # Use apex for wildcard
+            }
+          end
+          ingress_rules << { service: "http_status:404" }
 
+          config = { ingress: ingress_rules }
           put(url, { config: })
         end
 
-        def verify_tunnel_configuration(tunnel_id, expected_hostname, expected_service, max_attempts)
+        def verify_tunnel_configuration(tunnel_id, expected_hostnames, expected_service, max_attempts)
+          expected_hostnames = Array(expected_hostnames)
           url = "accounts/#{@account_id}/cfd_tunnel/#{tunnel_id}/configurations"
 
           max_attempts.times do
@@ -90,10 +91,11 @@ module Nvoi
 
               if response["success"]
                 config = response.dig("result", "config")
-                config&.dig("ingress")&.each do |rule|
-                  if rule["hostname"] == expected_hostname && rule["service"] == expected_service
-                    return true
-                  end
+                ingress = config&.dig("ingress") || []
+                configured_hostnames = ingress.map { |r| r["hostname"] }.compact
+
+                if expected_hostnames.all? { |h| configured_hostnames.include?(h) }
+                  return true
                 end
               end
             rescue StandardError
@@ -122,6 +124,16 @@ module Nvoi
 
         # DNS operations
 
+        def list_zones
+          url = "zones"
+          response = get(url)
+
+          results = response["result"] || []
+          results.map do |z|
+            { id: z["id"], name: z["name"], status: z["status"] }
+          end
+        end
+
         def find_zone(domain)
           url = "zones"
           response = get(url)
@@ -135,6 +147,12 @@ module Nvoi
           Objects::Dns::Zone.new(id: zone_data["id"], name: zone_data["name"])
         end
 
+        def subdomain_available?(zone_id, subdomain, domain)
+          fqdn = subdomain.empty? ? domain : "#{subdomain}.#{domain}"
+          # Check for CNAME or A record
+          !find_dns_record(zone_id, fqdn, "CNAME") && !find_dns_record(zone_id, fqdn, "A")
+        end
+
         def find_dns_record(zone_id, name, record_type)
           url = "zones/#{zone_id}/dns_records"
           response = get(url)

data/lib/nvoi/objects/configuration.rb

@@ -28,6 +28,7 @@ module Nvoi
           validate_database_secrets(app.database) if app.database
           inject_database_env_vars
           validate_service_server_bindings
+          validate_domain_uniqueness
         end
 
         def provider_name
@@ -211,6 +212,25 @@ module Nvoi
               )
             end
           end
+
+          def validate_domain_uniqueness
+            app = @deploy.application
+            return unless app.app
+
+            seen = {}
+            app.app.each do |name, cfg|
+              next unless cfg.domain && !cfg.domain.empty?
+
+              hostnames = Utils::Namer.build_hostnames(cfg.subdomain, cfg.domain)
+              hostnames.each do |hostname|
+                if seen[hostname]
+                  raise Errors::ConfigValidationError,
+                    "domain '#{hostname}' used by both '#{seen[hostname]}' and '#{name}'"
+                end
+                seen[hostname] = name
+              end
+            end
+          end
       end
 
       # Deploy represents the root deployment configuration

data/lib/nvoi/utils/namer.rb

@@ -185,6 +185,15 @@ module Nvoi
         end
       end
 
+      # Returns array of hostnames - apex returns [domain, *.domain], subdomain returns [sub.domain]
+      def self.build_hostnames(subdomain, domain)
+        if subdomain.nil? || subdomain.empty? || subdomain == "@"
+          [domain, "*.#{domain}"]
+        else
+          ["#{subdomain}.#{domain}"]
+        end
+      end
+
       private
 
         def hash_string(str)

data/lib/nvoi/utils/retry.rb

@@ -77,7 +77,7 @@ module Nvoi
 
       # Poll with error on timeout
       def self.poll!(max_attempts: 30, interval: 2, error_message: "operation timed out")
-        result = poll(max_attempts: max_attempts, interval: interval) { yield }
+        result = poll(max_attempts:, interval:) { yield }
         raise Errors::TimeoutError, error_message unless result
 
         result

data/lib/nvoi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nvoi
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/nvoi.rb

@@ -16,8 +16,24 @@ require "faraday"
 
 loader = Zeitwerk::Loader.for_gem
 loader.ignore("#{__dir__}/nvoi/cli")  # CLI commands are lazy-loaded
+loader.ignore("#{__dir__}/nvoi/config_api")  # ConfigApi uses non-standard naming
 loader.setup
 
+# Load ConfigApi manually (uses non-standard naming convention)
+require_relative "nvoi/config_api/result"
+require_relative "nvoi/config_api/base"
+require_relative "nvoi/config_api/actions/init"
+require_relative "nvoi/config_api/actions/domain_provider"
+require_relative "nvoi/config_api/actions/compute_provider"
+require_relative "nvoi/config_api/actions/server"
+require_relative "nvoi/config_api/actions/volume"
+require_relative "nvoi/config_api/actions/app"
+require_relative "nvoi/config_api/actions/database"
+require_relative "nvoi/config_api/actions/secret"
+require_relative "nvoi/config_api/actions/env"
+require_relative "nvoi/config_api/actions/service"
+require_relative "nvoi/config_api"
+
 module Nvoi
   class << self
     attr_accessor :logger

data/templates/app-ingress.yaml.erb

@@ -8,7 +8,8 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-  - host: <%= domain %>
+<% domains.each do |domain| -%>
+  - host: "<%= domain %>"
     http:
       paths:
       - path: /
@@ -18,3 +19,4 @@ spec:
             name: <%= name %>
             port:
               number: <%= port %>
+<% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nvoi
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - NVOI
@@ -173,6 +173,20 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".claude/todo/refactor-execution/00-entrypoint.md"
+- ".claude/todo/refactor-execution/01-objects.md"
+- ".claude/todo/refactor-execution/02-utils.md"
+- ".claude/todo/refactor-execution/03-external-cloud.md"
+- ".claude/todo/refactor-execution/04-external-dns.md"
+- ".claude/todo/refactor-execution/05-external-other.md"
+- ".claude/todo/refactor-execution/06-cli-deploy.md"
+- ".claude/todo/refactor-execution/07-cli-delete.md"
+- ".claude/todo/refactor-execution/08-cli-exec.md"
+- ".claude/todo/refactor-execution/09-cli-credentials.md"
+- ".claude/todo/refactor-execution/10-cli-db.md"
+- ".claude/todo/refactor-execution/11-cli-router.md"
+- ".claude/todo/refactor-execution/12-cleanup.md"
+- ".claude/todo/refactor-execution/_monitoring-strategy.md"
 - ".claude/todo/refactor/00-overview.md"
 - ".claude/todo/refactor/01-objects.md"
 - ".claude/todo/refactor/02-utils.md"
@@ -185,9 +199,11 @@ files:
 - ".claude/todo/refactor/09-cli-delete-command.md"
 - ".claude/todo/refactor/10-cli-exec-command.md"
 - ".claude/todo/refactor/11-cli-credentials-command.md"
+- ".claude/todo/refactor/12-cli-db-command.md"
 - ".claude/todo/refactor/_target.md"
 - ".claude/todo/scaleway.impl.md"
 - ".claude/todo/scaleway.reference.md"
+- ".claude/todos.md"
 - ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
@@ -311,8 +327,10 @@ files:
 - examples/rails-single/vendor/.keep
 - examples/rails-single/yarn.lock
 - exe/nvoi
+- ingest
 - lib/nvoi.rb
 - lib/nvoi/cli.rb
+- lib/nvoi/cli/config/command.rb
 - lib/nvoi/cli/credentials/edit/command.rb
 - lib/nvoi/cli/credentials/show/command.rb
 - lib/nvoi/cli/db/command.rb
@@ -334,13 +352,19 @@ files:
 - lib/nvoi/cli/deploy/steps/provision_volume.rb
 - lib/nvoi/cli/deploy/steps/setup_k3s.rb
 - lib/nvoi/cli/exec/command.rb
+- lib/nvoi/cli/logs/command.rb
+- lib/nvoi/cli/onboard/command.rb
+- lib/nvoi/cli/unlock/command.rb
 - lib/nvoi/config_api.rb
 - lib/nvoi/config_api/actions/app.rb
 - lib/nvoi/config_api/actions/compute_provider.rb
 - lib/nvoi/config_api/actions/database.rb
+- lib/nvoi/config_api/actions/domain_provider.rb
 - lib/nvoi/config_api/actions/env.rb
+- lib/nvoi/config_api/actions/init.rb
 - lib/nvoi/config_api/actions/secret.rb
 - lib/nvoi/config_api/actions/server.rb
+- lib/nvoi/config_api/actions/service.rb
 - lib/nvoi/config_api/actions/volume.rb
 - lib/nvoi/config_api/base.rb
 - lib/nvoi/config_api/result.rb