dash 4.0.5 → 4.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee8ed58f4d81341ced43dc7d970c081a4c92becc3492860cf3ec8fd1a80687ec
-  data.tar.gz: 588e1b33ca3f041a54beb773472cab9b8144892a32972b71ae9c58306cbb8612
+  metadata.gz: d13e0fdb207715506d85fa85be2a719ca70640130f22ca948c075fd787b3dd88
+  data.tar.gz: cc42a4346178f4ffbcf7b7b2f03820e49f99e9d54c78ab864493a0c0b8b214e4
 SHA512:
-  metadata.gz: b24d5758340f3e3b7b7b6ecf1df765ffabab7360ddd5bc0df99dad3b90ba3662fc65dcbbe6bfa99af29dea90efb977f4b3d5a2d68454c1e652d57602857f9166
-  data.tar.gz: bbc5bfea941e10310fd01776548b462e9e0e82d4228ed25bb66a0c16b35083979473cb2232ccb7bab3820ccaa45ae32303f424ffebfe76ac321b84354c54cf2e
+  metadata.gz: cdf2135081cc1acc7de1d73d7c7156f93262ad82a5848a6db6aaf484bf4859ed3e529fede60ac0c67df99ec021acdd2cbf6a9175982af8f31873afa03cc2113b
+  data.tar.gz: 30eae7e9f41f2b216be4dd8d16ce583f5a8e2392d3b05b3ad15fcd4ba40645441c05c39a643cca2bf01876ee28aec2fa668a7ffe2a474e27c69b46edc341dbc6

data/lib/dash/cli/doctor/host_checks.rb

@@ -113,7 +113,12 @@ class Dash::Cli::Doctor::HostChecks
       elsif version.nil?
         result :proxy_version, :ok, "not running (will be started on deploy)"
       elsif Dash::Utils.older_version?(version, minimum)
-        result :proxy_version, :fail, "#{version} is older than the minimum #{minimum}, run `dash proxy reboot` to update"
+        if deploy_reboots_proxy?
+          result :proxy_version, :ok,
+            "#{version} is older than the minimum #{minimum}; the next deploy reboots the proxy to update it"
+        else
+          result :proxy_version, :fail, "#{version} is older than the minimum #{minimum}, run `dash proxy reboot` to update"
+        end
       else
         result :proxy_version, :ok, "#{version} (minimum #{minimum})"
       end
@@ -121,6 +126,18 @@ class Dash::Cli::Doctor::HostChecks
       result :proxy_version, :warn, "running image tag #{version} is not a version number"
     end
 
+    # Mirrors `proxy boot`: with reboot_on_deploy enabled it reboots a drifted
+    # proxy on its own, and a MINIMUM_VERSION bump moves the expected config
+    # digest, so a merely-stale proxy is converged by the very deploy this
+    # doctor gates. Only a version the deploy would not touch — pinned in the
+    # config, or with automatic reboots disabled — is a real failure. Any error
+    # probing drift falls back to the conservative answer.
+    def deploy_reboots_proxy?
+      DASH.config.proxy.reboot_on_deploy? && Dash::Cli::Proxy::Drift.new(host, sshkit).drifted?
+    rescue StandardError
+      false
+    end
+
     # What a container path has to look like to count as a container runtime
     # socket when the config no longer names one.
     DOCKER_SOCKET_PATTERN = %r{docker\.sock\z}

data/lib/dash/configuration/registry.rb

@@ -4,6 +4,7 @@ class Dash::Configuration::Registry
   def initialize(config:, secrets:, context: "registry")
     @registry_config = config["registry"] || {}
     @secrets = secrets
+    @context = context
     validate! registry_config, context: context, with: Dash::Configuration::Validator::Registry
   end
 
@@ -28,13 +29,33 @@ class Dash::Configuration::Registry
   end
 
   private
-    attr_reader :registry_config, :secrets
+    attr_reader :registry_config, :secrets, :context
 
+    # A blank credential would reach the remote host as an empty `docker login -p`,
+    # where docker falls back to prompting and dies with the opaque "Cannot perform
+    # an interactive login from a non TTY device" — fail locally instead.
     def lookup(key)
+      value =
+        if registry_config[key].is_a?(Array)
+          secrets[registry_config[key].first]
+        else
+          registry_config[key]
+        end
+
+      validate_present! key, value unless local?
+      value
+    end
+
+    def validate_present!(key, value)
+      return if value.present?
+
       if registry_config[key].is_a?(Array)
-        secrets[registry_config[key].first]
+        secret = registry_config[key].first
+        raise Dash::ConfigurationError,
+          "#{context}/#{key}: secret '#{secret}' resolved to an empty value — " \
+          "if your secrets file forwards it from the environment (#{secret}=$#{secret}), export the variable before running dash"
       else
-        registry_config[key]
+        raise Dash::ConfigurationError, "#{context}/#{key}: is blank"
       end
     end
 end

data/lib/dash/version.rb

@@ -1,3 +1,3 @@
 module Dash
-  VERSION = "4.0.5"
+  VERSION = "4.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dash
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.0.7
 platform: ruby
 authors:
 - Mikael Henriksson