odysseus-core 0.3.2 → 0.9.0

data/lib/odysseus/orchestrator/{accessory_deploy.rb → dependency_deploy.rb}

@@ -1,10 +1,10 @@
-# lib/odysseus/orchestrator/accessory_deploy.rb
+# lib/odysseus/orchestrator/dependency_deploy.rb
 
 require_relative '../core/volume_namespacer'
 
 module Odysseus
   module Orchestrator
-    class AccessoryDeploy
+    class DependencyDeploy
       include Odysseus::Core::VolumeNamespacer
 
       # @param ssh [Odysseus::Deployer::SSH] SSH connection
@@ -20,64 +20,64 @@ module Odysseus
         @caddy = Odysseus::Caddy::Client.new(ssh: ssh, docker: @docker)
       end
 
-      # Deploy/ensure an accessory is running
-      # @param name [Symbol] accessory name
+      # Deploy/ensure an dependency is running
+      # @param name [Symbol] dependency name
       # @return [Hash] deploy result
       def deploy(name:)
-        accessory_config = @config[:accessories][name]
-        raise Odysseus::ConfigError, "Accessory '#{name}' not found in config" unless accessory_config
+        dependency_config = @config[:dependencies][name]
+        raise Odysseus::ConfigError, "Dependency '#{name}' not found in config" unless dependency_config
 
-        service_name = accessory_name(name)
-        image = accessory_config[:image]
+        service_name = dependency_name(name)
+        image = dependency_config[:image]
 
-        log "Deploying accessory: #{service_name}"
+        log "Deploying dependency: #{service_name}"
         log "  Image: #{image}"
 
-        # Ensure the Docker network exists (accessories may boot before any service deploy)
+        # Ensure the Docker network exists (dependencies may boot before any service deploy)
         ensure_network!
 
-        # Check if accessory is already running
+        # Check if dependency is already running
         existing = @docker.list(service: service_name)
         if existing.any? { |c| c['State'] == 'running' }
-          log "  Already running — skipping"
+          log '  Already running — skipping'
           return { success: true, already_running: true, service: service_name }
         end
 
-        # Start the accessory
+        # Start the dependency
         log "Starting #{service_name}..."
-        container_id = start_accessory(name: name, config: accessory_config)
+        container_id = start_dependency(name: name, config: dependency_config)
         log "  Container started: #{container_id[0..11]}"
 
         # Wait for healthy if healthcheck configured
-        if accessory_config[:healthcheck]
-          hc = accessory_config[:healthcheck]
+        if dependency_config[:healthcheck]
+          hc = dependency_config[:healthcheck]
           log "Waiting for health check... (cmd: #{hc[:cmd]}, interval: #{hc[:interval]}s)"
           unless @docker.wait_healthy(container_id, timeout: 120)
             log_health_failure(container_id)
             @docker.stop(container_id)
             @docker.remove(container_id, force: true)
-            raise Odysseus::DeployError, "Accessory failed health checks"
+            raise Odysseus::DeployError, 'Dependency failed health checks'
           end
-          log "  Health check passed"
+          log '  Health check passed'
         else
-          log "No health check configured, waiting 3s for startup..."
+          log 'No health check configured, waiting 3s for startup...'
           sleep 3
           unless @docker.running?(container_id)
             log_health_failure(container_id)
-            raise Odysseus::DeployError, "Accessory failed to start"
+            raise Odysseus::DeployError, 'Dependency failed to start'
           end
-          log "  Container is running"
+          log '  Container is running'
         end
 
         # Add to Caddy if proxy config is present
-        if accessory_config[:proxy]
-          proxy_hosts = accessory_config[:proxy][:hosts]&.join(', ')
+        if dependency_config[:proxy]
+          proxy_hosts = dependency_config[:proxy][:hosts]&.join(', ')
           log "Configuring proxy (hosts: #{proxy_hosts})..."
-          add_to_caddy(name: name, container_id: container_id, config: accessory_config)
-          log "  Proxy configured"
+          add_to_caddy(name: name, container_id: container_id, config: dependency_config)
+          log '  Proxy configured'
         end
 
-        log "Accessory #{service_name} deployed"
+        log "Dependency #{service_name} deployed"
 
         {
           success: true,
@@ -86,25 +86,25 @@ module Odysseus
           image: image
         }
       rescue StandardError => e
-        log "Accessory deploy FAILED: #{e.message}", :error
+        log "Dependency deploy FAILED: #{e.message}", :error
         raise
       end
 
-      # Stop and remove an accessory
-      # @param name [Symbol] accessory name
+      # Stop and remove an dependency
+      # @param name [Symbol] dependency name
       def remove(name:)
-        accessory_config = @config[:accessories][name]
-        raise Odysseus::ConfigError, "Accessory '#{name}' not found in config" unless accessory_config
+        dependency_config = @config[:dependencies][name]
+        raise Odysseus::ConfigError, "Dependency '#{name}' not found in config" unless dependency_config
 
-        service_name = accessory_name(name)
-        log "Removing accessory: #{service_name}"
+        service_name = dependency_name(name)
+        log "Removing dependency: #{service_name}"
 
         # Remove from Caddy if proxy configured
-        if accessory_config[:proxy]
+        if dependency_config[:proxy]
           containers = @docker.list(service: service_name)
           containers.each do |c|
             container_name = c['Names'].delete_prefix('/')
-            port = accessory_config[:proxy][:app_port]
+            port = dependency_config[:proxy][:app_port]
             @caddy.drain_upstream(service: service_name, upstream: "#{container_name}:#{port}")
           end
         end
@@ -116,49 +116,49 @@ module Odysseus
           @docker.remove(c['ID'], force: true)
         end
 
-        log "Accessory #{service_name} removed!"
+        log "Dependency #{service_name} removed!"
         { success: true, service: service_name }
       end
 
-      # Restart an accessory (remove and redeploy)
-      # @param name [Symbol] accessory name
+      # Restart an dependency (remove and redeploy)
+      # @param name [Symbol] dependency name
       def restart(name:)
         remove(name: name)
         deploy(name: name)
       end
 
-      # Upgrade an accessory to a new image version (preserves volumes)
-      # @param name [Symbol] accessory name
+      # Upgrade an dependency to a new image version (preserves volumes)
+      # @param name [Symbol] dependency name
       # @return [Hash] upgrade result
       def upgrade(name:)
-        accessory_config = @config[:accessories][name]
-        raise Odysseus::ConfigError, "Accessory '#{name}' not found in config" unless accessory_config
+        dependency_config = @config[:dependencies][name]
+        raise Odysseus::ConfigError, "Dependency '#{name}' not found in config" unless dependency_config
 
-        service_name = accessory_name(name)
-        image = accessory_config[:image]
+        service_name = dependency_name(name)
+        image = dependency_config[:image]
 
-        log "Upgrading accessory: #{service_name}"
+        log "Upgrading dependency: #{service_name}"
         log "  Image: #{image}"
 
         # Ensure the Docker network exists
         ensure_network!
 
         # Pull the new image first (before stopping anything)
-        log "Pulling new image..."
+        log 'Pulling new image...'
         @docker.pull(image)
-        log "  Image pulled"
+        log '  Image pulled'
 
         # Check for existing container
         existing = @docker.list(service: service_name, all: true)
         old_container = existing.first
 
         # Remove from Caddy if proxy configured (before stopping)
-        if accessory_config[:proxy] && old_container && old_container['State'] == 'running'
+        if dependency_config[:proxy] && old_container && old_container['State'] == 'running'
           container_name = old_container['Names'].delete_prefix('/')
-          port = accessory_config[:proxy][:app_port]
-          log "Draining from proxy..."
+          port = dependency_config[:proxy][:app_port]
+          log 'Draining from proxy...'
           @caddy.drain_upstream(service: service_name, upstream: "#{container_name}:#{port}")
-          log "  Drained from proxy"
+          log '  Drained from proxy'
         end
 
         # Stop and remove old container if exists
@@ -166,44 +166,44 @@ module Odysseus
           log "Stopping old container #{old_container['ID'][0..11]} (30s grace period)..."
           @docker.stop(old_container['ID'], timeout: 30) if old_container['State'] == 'running'
           @docker.remove(old_container['ID'], force: true)
-          log "  Old container removed"
+          log '  Old container removed'
         end
 
-        # Start the accessory with the new image (volumes are preserved on host)
-        log "Starting new container..."
-        container_id = start_accessory(name: name, config: accessory_config)
+        # Start the dependency with the new image (volumes are preserved on host)
+        log 'Starting new container...'
+        container_id = start_dependency(name: name, config: dependency_config)
         log "  Container started: #{container_id[0..11]}"
 
         # Wait for healthy if healthcheck configured
-        if accessory_config[:healthcheck]
-          hc = accessory_config[:healthcheck]
+        if dependency_config[:healthcheck]
+          hc = dependency_config[:healthcheck]
           log "Waiting for health check... (cmd: #{hc[:cmd]}, interval: #{hc[:interval]}s)"
           unless @docker.wait_healthy(container_id, timeout: 120)
             log_health_failure(container_id)
             @docker.stop(container_id)
             @docker.remove(container_id, force: true)
-            raise Odysseus::DeployError, "Accessory failed health checks after upgrade"
+            raise Odysseus::DeployError, 'Dependency failed health checks after upgrade'
           end
-          log "  Health check passed"
+          log '  Health check passed'
         else
-          log "No health check configured, waiting 3s for startup..."
+          log 'No health check configured, waiting 3s for startup...'
           sleep 3
           unless @docker.running?(container_id)
             log_health_failure(container_id)
-            raise Odysseus::DeployError, "Accessory failed to start after upgrade"
+            raise Odysseus::DeployError, 'Dependency failed to start after upgrade'
           end
-          log "  Container is running"
+          log '  Container is running'
         end
 
         # Add to Caddy if proxy config is present
-        if accessory_config[:proxy]
-          proxy_hosts = accessory_config[:proxy][:hosts]&.join(', ')
+        if dependency_config[:proxy]
+          proxy_hosts = dependency_config[:proxy][:hosts]&.join(', ')
           log "Configuring proxy (hosts: #{proxy_hosts})..."
-          add_to_caddy(name: name, container_id: container_id, config: accessory_config)
-          log "  Proxy configured"
+          add_to_caddy(name: name, container_id: container_id, config: dependency_config)
+          log '  Proxy configured'
         end
 
-        log "Accessory #{service_name} upgraded"
+        log "Dependency #{service_name} upgraded"
 
         {
           success: true,
@@ -213,17 +213,17 @@ module Odysseus
           upgraded: true
         }
       rescue StandardError => e
-        log "Accessory upgrade failed: #{e.message}", :error
+        log "Dependency upgrade failed: #{e.message}", :error
         raise
       end
 
-      # List status of all accessories
-      # @return [Array<Hash>] accessory statuses
+      # List status of all dependencies
+      # @return [Array<Hash>] dependency statuses
       def list_status
-        return [] unless @config[:accessories]
+        return [] unless @config[:dependencies]
 
-        @config[:accessories].map do |name, config|
-          service_name = accessory_name(name)
+        @config[:dependencies].map do |name, config|
+          service_name = dependency_name(name)
           containers = @docker.list(service: service_name, all: true)
           running = containers.find { |c| c['State'] == 'running' }
 
@@ -240,29 +240,25 @@ module Odysseus
 
       private
 
-      def accessory_name(name)
+      def dependency_name(name)
         "#{@config[:service]}-#{name}"
       end
 
       def ensure_network!
-        log "Ensuring Docker network exists..."
+        log 'Ensuring Docker network exists...'
         @docker.ensure_network('odysseus', labels: { 'odysseus.managed' => 'true' })
       end
 
-      def start_accessory(name:, config:)
-        service_name = accessory_name(name)
+      def start_dependency(name:, config:)
+        service_name = dependency_name(name)
 
         env = build_environment(config[:env])
         log "  Environment: #{env.size} variable(s) injected" if env.any?
 
         volumes = namespace_volumes(config[:volumes], service: service_name)
-        if volumes&.any?
-          log "  Volumes: #{volumes.join(', ')}"
-        end
+        log "  Volumes: #{volumes.join(', ')}" if volumes&.any?
 
-        if config[:ports]&.any?
-          log "  Ports: #{config[:ports].join(', ')}"
-        end
+        log "  Ports: #{config[:ports].join(', ')}" if config[:ports]&.any?
 
         @docker.run(
           name: service_name,
@@ -329,7 +325,7 @@ module Odysseus
         upstream = "#{container_name}:#{port}"
 
         @caddy.add_upstream(
-          service: accessory_name(name),
+          service: dependency_name(name),
           hosts: proxy_config[:hosts],
           upstream: upstream,
           ssl: proxy_config[:ssl],
@@ -343,7 +339,7 @@ module Odysseus
         begin
           recent_logs = @docker.logs(container_id, tail: 30)
           unless recent_logs.strip.empty?
-            log "  Container logs (last 30 lines):", :error
+            log '  Container logs (last 30 lines):', :error
             recent_logs.each_line { |line| log "    #{line.rstrip}", :error }
           end
         rescue StandardError => e
@@ -360,9 +356,9 @@ module Odysseus
 
       def default_logger
         @default_logger ||= Object.new.tap do |l|
-          def l.info(msg); puts msg; end
-          def l.warn(msg); puts "[WARN] #{msg}"; end
-          def l.error(msg); puts "[ERROR] #{msg}"; end
+          def l.info(msg) = puts(msg)
+          def l.warn(msg) = puts("[WARN] #{msg}")
+          def l.error(msg) = puts("[ERROR] #{msg}")
         end
       end
 

data/lib/odysseus/orchestrator/job_deploy.rb

@@ -6,6 +6,7 @@ module Odysseus
   module Orchestrator
     class JobDeploy
       include Odysseus::Core::VolumeNamespacer
+      include Odysseus::Core::DeployVersioning
 
       # @param ssh [Odysseus::Deployer::SSH] SSH connection
       # @param config [Hash] parsed deploy config
@@ -39,7 +40,7 @@ module Odysseus
         log "  Found #{old_containers.size} existing container(s)"
 
         # Step 2: Start new container
-        log "Starting new container..."
+        log 'Starting new container...'
         new_container_id = start_new_container(image: image, role: role)
         log "  Container started: #{new_container_id[0..11]}"
 
@@ -50,25 +51,25 @@ module Odysseus
           unless wait_for_healthy(new_container_id)
             log_health_failure(new_container_id)
             handle_failed_deploy(new_container_id)
-            raise Odysseus::DeployError, "Container failed health checks"
+            raise Odysseus::DeployError, 'Container failed health checks'
           end
-          log "  Health check passed"
+          log '  Health check passed'
         else
-          log "No health check configured, waiting 5s for startup..."
+          log 'No health check configured, waiting 5s for startup...'
           sleep 5
           unless @docker.running?(new_container_id)
             log_health_failure(new_container_id)
             handle_failed_deploy(new_container_id)
-            raise Odysseus::DeployError, "Container failed to start"
+            raise Odysseus::DeployError, 'Container failed to start'
           end
-          log "  Container is running"
+          log '  Container is running'
         end
 
         # Step 4: Stop old containers gracefully
         old_containers.each do |old|
           log "Stopping old container #{old['ID'][0..11]} (30s grace period)..."
           graceful_stop(old['ID'])
-          log "  Old container removed"
+          log '  Old container removed'
         end
 
         # Step 5: Cleanup old stopped containers
@@ -93,19 +94,22 @@ module Odysseus
       def start_new_container(image:, role:)
         service = @config[:service]
         role_name = "#{service}-#{role}"
-        timestamp = Time.now.strftime('%Y%m%d%H%M%S')
-        container_name = "#{role_name}-#{timestamp}"
+        timestamp = Time.now.utc.strftime('%Y%m%d%H%M%S')
+        container_name = "#{role_name}-#{deploy_version_tag(image)}-#{timestamp}"
 
         server_config = @config[:servers][role] || {}
         options = server_config[:options] || {}
 
+        # A jobs-only deploy may be the first thing ever run on this host, so
+        # the network can't be assumed to exist (a web role gets it as a side
+        # effect of ensure_caddy!, and DependencyDeploy has its own copy).
+        ensure_network!
+
         env = build_environment
         log "  Environment: #{env.size} variable(s) injected"
 
         volumes = namespace_volumes(server_config[:volumes], service: role_name)
-        if volumes&.any?
-          log "  Volumes: #{volumes.join(', ')}"
-        end
+        log "  Volumes: #{volumes.join(', ')}" if volumes&.any?
 
         if options[:memory] || options[:cpus]
           log "  Resources: memory=#{options[:memory] || 'default'}, cpus=#{options[:cpus] || 'default'}"
@@ -116,7 +120,8 @@ module Odysseus
           image: image,
           options: {
             service: role_name,
-            version: timestamp,
+            version: deploy_version_tag(image),
+            labels: version_labels,
             env: env,
             volumes: volumes,
             memory: options[:memory],
@@ -130,31 +135,14 @@ module Odysseus
         )
       end
 
-      def build_environment
-        env = {}
-
-        # Clear env vars (hardcoded values)
-        @config[:env][:clear]&.each do |key, value|
-          env[key.to_s] = value.to_s
-        end
-
-        # Secret env vars (from encrypted file or server environment)
-        @config[:env][:secret]&.each do |key|
-          # Try encrypted secrets file first
-          if @secrets_loader&.configured?
-            value = @secrets_loader.get(key)
-            if value
-              env[key.to_s] = value.to_s
-              next
-            end
-          end
-
-          # Fall back to server's environment
-          value = @ssh.execute("echo $#{key}").strip
-          env[key.to_s] = value unless value.empty?
-        end
+      def ensure_network!
+        log 'Ensuring Docker network exists...'
+        @docker.ensure_network('odysseus', labels: { 'odysseus.managed' => 'true' })
+      end
 
-        env
+      # Same environment a web container gets — see Core::Environment.
+      def build_environment
+        Odysseus::Core::Environment.new(config: @config, secrets_loader: @secrets_loader, ssh: @ssh).build
       end
 
       def build_healthcheck(hc_config)
@@ -179,10 +167,10 @@ module Odysseus
       end
 
       def handle_failed_deploy(new_container_id)
-        log "Rolling back failed deploy...", :warn
+        log 'Rolling back failed deploy...', :warn
         @docker.stop(new_container_id)
         @docker.remove(new_container_id, force: true)
-        log "Rollback complete — failed container removed"
+        log 'Rollback complete — failed container removed'
       end
 
       def log_health_failure(container_id)
@@ -191,7 +179,7 @@ module Odysseus
         begin
           recent_logs = @docker.logs(container_id, tail: 30)
           unless recent_logs.strip.empty?
-            log "  Container logs (last 30 lines):", :error
+            log '  Container logs (last 30 lines):', :error
             recent_logs.each_line { |line| log "    #{line.rstrip}", :error }
           end
         rescue StandardError => e
@@ -208,9 +196,9 @@ module Odysseus
 
       def default_logger
         @default_logger ||= Object.new.tap do |l|
-          def l.info(msg); puts msg; end
-          def l.warn(msg); puts "[WARN] #{msg}"; end
-          def l.error(msg); puts "[ERROR] #{msg}"; end
+          def l.info(msg) = puts(msg)
+          def l.warn(msg) = puts("[WARN] #{msg}")
+          def l.error(msg) = puts("[ERROR] #{msg}")
         end
       end