glazed 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e764c4f949d82239b29b22b0d38b300f260e31818bf41adc5fb47ad6c091468a
-  data.tar.gz: 5788a04e0b8da61d1c46e436520ad9e3f78641310b4e0f66c210c524d0041e64
+  metadata.gz: d56201f127db708c89e5f41d4eb15e7bb6e1324a009b5ee81717790208df5b60
+  data.tar.gz: a56fea960e5bb3649add5be49c4c5ae9f537786ac1b945109bd093eec2d8303c
 SHA512:
-  metadata.gz: f456a6b2116655636c1c19e3c8253131aecc266e2d72201ecc6d531faa7ee2e8d64d4ca92147bed91f2153a7e6810c5db8268ca31c257d2cbb08db1160731a02
-  data.tar.gz: 9d4d631c639884e667c90b718476d1c99a2d37c49085bdf9c48eb7c9a4f2d96626b2681cd5cd12a62abc20e1169b5371ce313d29d6ddffcfea430e8f65cd2776
+  metadata.gz: e076356375eb72fa7a7464220b425a68ee32757138c85a22e87f0e5af3350b20fd5c3024c16d7c2f28c3e29c440527b34c2dda6b09df2fcf9ab50555fad4197f
+  data.tar.gz: 5490b94175310aef06a49685c7dd564fc958263bad22dff1a4bdbd1c99fab94e57b76a0b4481ced7874b61db92cae94429b0e2e77bee2a08e288a557b0fd43ef

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [0.4.0] - 2026-10-18
+
+### Breaking changes
+
+- Every `*_seconds` setting is a `google.protobuf.Duration` without the suffix, written as a string such as `"900s"` in ProtoJSON, and the old fields are reserved: `timeout` of the `fetch`, `command` and `batch_command` steps, command inventories and command secrets; `poll`, `inventory_refresh`, `lease`, `schedule.interval`, `schedule.retry_interval`, `schedule.jitter`, `debounce.delay`, `debounce.max_wait` of the orchestrator; `grace` of `glazed.v1.CheckTask`; and `cache` of `ssm` secrets. Configs using the old names are rejected
+- `Glazed::Coordinator#sync_inventory` and `#signal` take `Glazed::Proto::V1::Node`s instead of names, and `#complete` takes the inventory's nodes as `nodes:`
+
+### Enhancements
+
+- `schedule_rules` of an orchestrated workflow give nodes their own `schedule` and `debounce`, selected by `names`, `groups` or `name_regexp`
+
 ## [0.3.0] - 2026-10-17
 
 ### Breaking changes

data/lib/glazed/command/send_signal.rb

@@ -53,8 +53,8 @@ module Glazed
         settings = load_config(config)
         orchestration = orchestrator_settings(settings, config)
         workflows = select_orchestrated(orchestration, workflow)
-        inventory = Sources.nodes(settings.inventory.to_a).map(&:name)
-        select_nodes(inventory.map { Proto::V1::Node.new(name: it) }, nodes)
+        inventory = Sources.nodes(settings.inventory.to_a)
+        select_nodes(inventory, nodes)
         context = StepContext.from_proto(settings.storages, listener: json_listener)
         backend = state_backend(orchestration, context)
         at = Time.now

data/lib/glazed/command/status.rb

@@ -9,6 +9,7 @@ require 'glazed/proto'
 require 'glazed/proto_json'
 require 'glazed/state_backends/base'
 require 'glazed/step_context'
+require 'glazed/durations'
 
 module Glazed
   module Command
@@ -51,7 +52,7 @@ module Glazed
         records.select!(&:last_failed) if failing
 
         now = Time.now
-        poll_seconds = orchestration.poll_seconds.zero? ? Orchestrator::DEFAULT_POLL : orchestration.poll_seconds
+        poll_seconds = Durations.seconds(orchestration.poll, Orchestrator::DEFAULT_POLL)
         if json
           records.each { out.puts ProtoJson.dump(it) }
         else
@@ -75,9 +76,9 @@ module Glazed
 
       # @param record [Proto::V1::NodeSchedule] the record
       # @param now [Time] current time
-      # @param poll_seconds [Integer] seconds between the orchestrator's checks for due nodes
+      # @param poll_seconds [Numeric] seconds between the orchestrator's checks for due nodes
       # @return [Array<String>] the cells, then the notes
-      #: (Proto::V1::NodeSchedule record, now: Time, poll_seconds: Integer) -> Status::row
+      #: (Proto::V1::NodeSchedule record, now: Time, poll_seconds: Numeric) -> Status::row
       private def row(record, now:, poll_seconds:)
         status = status(record, now:, poll_seconds:)
         due = time(record.due_at)
@@ -88,16 +89,16 @@ module Glazed
 
       # @param record [Proto::V1::NodeSchedule] the record
       # @param now [Time] current time
-      # @param poll_seconds [Integer] seconds between the orchestrator's checks for due nodes
+      # @param poll_seconds [Numeric] seconds between the orchestrator's checks for due nodes
       # @return [String] "running", "overdue" when due for more than a poll interval, "due", or "waiting"
-      #: (Proto::V1::NodeSchedule record, now: Time, poll_seconds: Integer) -> String
+      #: (Proto::V1::NodeSchedule record, now: Time, poll_seconds: Numeric) -> String
       private def status(record, now:, poll_seconds:)
         return 'running' if Orchestrator::Policy.running?(record, now)
 
         due = time(record.due_at)
         return 'waiting' if due.nil? || due > now
 
-        now - due > poll_seconds ? 'overdue' : 'due'
+        now - due > poll_seconds.to_f ? 'overdue' : 'due'
       end
 
       # @param record [Proto::V1::NodeSchedule] the record

data/lib/glazed/config.rb

@@ -41,10 +41,28 @@ module Glazed
       end
 
       requires.each { require it }
-      ProtoJson.load(Proto::V1::Config, json).tap { Validation.validate!(it, origin:) }
+      ProtoJson.load(Proto::V1::Config, json).tap do
+        Validation.validate!(it, origin:)
+        check_name_regexps(it, origin:)
+      end
     rescue Google::Protobuf::ParseError, JSON::ParserError => e
       hint = e.message.include?('Type was not found') ? '; list the gem providing that plugin type in requires' : ''
       raise Glazed::Error, "#{origin}: #{e.message}#{hint}"
     end
+
+    # @param config [Proto::V1::Config] the config
+    # @param origin [String] where the config comes from, for error messages
+    # @return [void]
+    # @raise [InvalidMessage] when a schedule rule's name_regexp does not compile
+    #: (Proto::V1::Config config, origin: String) -> void
+    private_class_method def self.check_name_regexps(config, origin:)
+      config.orchestrator&.workflows&.each do |workflow, orchestration|
+        orchestration.schedule_rules.each_with_index do |rule, index|
+          Regexp.new(rule.match&.name_regexp.to_s)
+        rescue RegexpError => e
+          raise InvalidMessage, "#{origin}: orchestrator.workflows.#{workflow}.schedule_rules[#{index}].match.name_regexp: #{e.message}"
+        end
+      end
+    end
   end
 end

data/lib/glazed/coordinator/task_runner.rb

@@ -10,6 +10,7 @@ require 'glazed/proto'
 require 'glazed/runner'
 require 'glazed/steps'
 require 'glazed/workflow'
+require 'glazed/durations'
 
 module Glazed
   class Coordinator
@@ -65,12 +66,12 @@ module Glazed
       # @return [Proto::V1::Armed] when to wake up, if at all
       #: (Proto::V1::CheckTask task) -> Proto::V1::Armed
       private def check(task)
-        nodes = load_inventory.keys
+        nodes = load_inventory.values
         @coordinator.sync_inventory(nodes)
         @coordinator.signal(task.signals.to_a, nodes:) unless task.signals.empty?
         wake = @coordinator.arm(
           token: task.token, cycle: task.cycle, max_cycles: task.max_cycles.zero? ? DEFAULT_MAX_CYCLES : task.max_cycles,
-          grace: task.grace_seconds.zero? ? nil : task.grace_seconds,
+          grace: Durations.seconds(task.grace, 0).then { it.zero? ? nil : it },
         )
         Proto::V1::Armed.new(wait_until: wake && Google::Protobuf::Timestamp.from_time(wake))
       end
@@ -79,7 +80,7 @@ module Glazed
       #: () -> Proto::V1::PreparedBatches
       private def prepare
         inventory = load_inventory
-        @coordinator.sync_inventory(inventory.keys)
+        @coordinator.sync_inventory(inventory.values)
         batches = @workflows.keys.to_h do |workflow|
           owner, names = @coordinator.claim(workflow)
           nodes = names.filter_map { inventory[it] }.map { Proto::V1::NodeOutcome.new(state: Proto::V1::NodeState.new(node: it)) }
@@ -147,7 +148,7 @@ module Glazed
           error = failure ? "#{failure.step}: #{failure.error}" : batch.error
           errors[outcome.state&.node&.name.to_s] = error unless error.empty?
         end
-        @coordinator.complete(batch.workflow, owner: batch.owner, names:, errors:)
+        @coordinator.complete(batch.workflow, owner: batch.owner, names:, errors:, nodes: load_inventory)
         notify(level: 'info', workflow: batch.workflow, message: 'batch finished', nodes: names.size, failed: errors.size)
         batch
       end

data/lib/glazed/coordinator.rb

@@ -12,6 +12,7 @@ require 'glazed/orchestrator/policy'
 require 'glazed/proto'
 require 'glazed/runner'
 require 'glazed/state_backends/base'
+require 'glazed/durations'
 
 module Glazed
   # Changes node schedules in a state backend as the orchestrated workflows
@@ -63,13 +64,13 @@ module Glazed
     #: () -> Array[String]
     def workflows = @settings.workflows.keys
 
-    # @return [Integer] seconds between checks for due nodes
-    #: () -> Integer
-    def poll_seconds = @settings.poll_seconds.zero? ? DEFAULT_POLL : @settings.poll_seconds
+    # @return [Float] seconds between checks for due nodes
+    #: () -> Float
+    def poll_seconds = Durations.seconds(@settings.poll, DEFAULT_POLL)
 
-    # @return [Integer] the longest seconds a lease of any workflow lasts
-    #: () -> Integer
-    def longest_lease = @settings.workflows.values.map { lease_seconds(it) }.max || DEFAULT_LEASE
+    # @return [Float] the longest seconds a lease of any workflow lasts
+    #: () -> Float
+    def longest_lease = @settings.workflows.values.map { lease_seconds(it) }.max || DEFAULT_LEASE.to_f
 
     # @param workflow [String] workflow name
     # @return [Proto::V1::Orchestration] how the workflow is orchestrated
@@ -82,24 +83,26 @@ module Glazed
     # Adds records for nodes new to the inventory, due within the schedule's
     # jitter, and deletes those of nodes gone, in every workflow.
     #
-    # @param nodes [Array<String>] names of every node in the inventory
+    # @param nodes [Array<Proto::V1::Node>] every node in the inventory
     # @return [void]
-    #: (Array[String] nodes) -> void
+    #: (Array[Proto::V1::Node] nodes) -> void
     def sync_inventory(nodes)
       now = @clock.call
+      by_name = nodes.to_h { [it.name, it] }
       workflows.each do |workflow|
         known = @backend.list(workflow).map(&:node)
-        added = nodes - known
-        removed = known - nodes
+        added = by_name.keys - known
+        removed = known - by_name.keys
         next if added.empty? && removed.empty?
 
-        schedule = orchestration(workflow).schedule
+        orchestration = orchestration(workflow)
         @backend.update_all(workflow, added + removed) do |node, record|
           next nil if removed.include?(node)
 
+          schedule = Orchestrator::Policy.schedule_for(orchestration, by_name.fetch(node))
           record || Orchestrator::Policy.discovered(workflow, node, now:, schedule:, random: @random)
         end
-        notify(level: 'info', workflow:, message: 'inventory changed', nodes: nodes.size, added:, removed:)
+        notify(level: 'info', workflow:, message: 'inventory changed', nodes: by_name.size, added:, removed:)
       end
     end
 
@@ -107,11 +110,13 @@ module Glazed
     # Signals naming a node or workflow unknown here are reported and skipped.
     #
     # @param signals [Array<Proto::V1::Signal>] the signals
-    # @param nodes [Array<String>] names of every node in the inventory, which all_nodes signals stand for
+    # @param nodes [Array<Proto::V1::Node>] every node in the inventory, which all_nodes signals stand for
     # @return [Hash{String => Hash{String => Proto::V1::NodeSchedule}}] the resulting records, by workflow and node name
-    #: (Array[Proto::V1::Signal] signals, nodes: Array[String]) -> Hash[String, Hash[String, Proto::V1::NodeSchedule]]
+    #: (Array[Proto::V1::Signal] signals, nodes: Array[Proto::V1::Node]) -> Hash[String, Hash[String, Proto::V1::NodeSchedule]]
     def signal(signals, nodes:)
       now = @clock.call
+      by_name = nodes.to_h { [it.name, it] }
+      nodes = by_name.keys
       pending = {} #: Hash[String, Hash[String, Array[Proto::V1::Signal]]]
       signals.each do |signal|
         targets = signal.all_nodes ? nodes : [signal.node]
@@ -131,8 +136,9 @@ module Glazed
       end
 
       pending.to_h do |workflow, by_node|
-        debounce = orchestration(workflow).debounce
+        orchestration = orchestration(workflow)
         records = @backend.update_all(workflow, by_node.keys) do |node, record|
+          debounce = Orchestrator::Policy.debounce_for(orchestration, by_name.fetch(node))
           by_node.fetch(node).inject(record) { |current, signal| Orchestrator::Policy.signal(current, signal, workflow:, now:, debounce:) }
         end
         [workflow, records]
@@ -166,12 +172,15 @@ module Glazed
     # @param owner [String] identifier of the batch
     # @param names [Array<String>] names of the nodes the batch ran
     # @param errors [Hash{String => String}] why nodes failed, by node name
+    # @param nodes [Hash{String => Proto::V1::Node}] nodes of the inventory, by name; those missing follow the workflow's schedule
     # @return [void]
-    #: (String workflow, owner: String, names: Array[String], errors: Hash[String, String]) -> void
-    def complete(workflow, owner:, names:, errors:)
+    #: (String workflow, owner: String, names: Array[String], errors: Hash[String, String], nodes: Hash[String, Proto::V1::Node]) -> void
+    def complete(workflow, owner:, names:, errors:, nodes:)
       finished_at = @clock.call
-      schedule = orchestration(workflow).schedule
+      orchestration = orchestration(workflow)
       @backend.update_all(workflow, names) do |node, record|
+        found = nodes[node]
+        schedule = found ? Orchestrator::Policy.schedule_for(orchestration, found) : orchestration.schedule
         Orchestrator::Policy.completed(record, owner:, finished_at:, error: errors[node], schedule:, random: @random)
       end
     end
@@ -232,9 +241,9 @@ module Glazed
     end
 
     # @param settings [Proto::V1::Orchestration] how a workflow is orchestrated
-    # @return [Integer] seconds a lease of the workflow lasts
-    #: (Proto::V1::Orchestration settings) -> Integer
-    private def lease_seconds(settings) = settings.lease_seconds.zero? ? DEFAULT_LEASE : settings.lease_seconds
+    # @return [Float] seconds a lease of the workflow lasts
+    #: (Proto::V1::Orchestration settings) -> Float
+    private def lease_seconds(settings) = Durations.seconds(settings.lease, DEFAULT_LEASE)
 
     # @param signal [Proto::V1::Signal] a signal for one node or every node
     # @param node [String] node name

data/lib/glazed/durations.rb

@@ -0,0 +1,21 @@
+# typed: strict
+# frozen_string_literal: true
+
+# SPDX-License-Identifier: Apache-2.0
+
+require 'google/protobuf'
+require 'google/protobuf/well_known_types'
+
+module Glazed
+  # Reads google.protobuf.Duration settings.
+  module Durations
+    # @param duration [Google::Protobuf::Duration, nil] the setting
+    # @param default [Numeric] seconds used when the setting is unset or 0
+    # @return [Float] seconds
+    #: (Google::Protobuf::Duration? duration, Numeric default) -> Float
+    def self.seconds(duration, default)
+      value = duration&.to_f
+      value.nil? || value.zero? ? default.to_f : value
+    end
+  end
+end

data/lib/glazed/orchestrator/policy.rb

@@ -6,6 +6,8 @@
 require 'google/protobuf'
 require 'glazed'
 require 'glazed/proto'
+require 'glazed/must'
+require 'glazed/durations'
 
 module Glazed
   class Orchestrator
@@ -20,6 +22,35 @@ module Glazed
       # Seconds after the first signal by which a node runs when the debounce sets none.
       DEFAULT_MAX_WAIT = 600 #: Integer
 
+      # @param orchestration [Proto::V1::Orchestration] how the workflow is orchestrated
+      # @param node [Proto::V1::Node] the node
+      # @return [Proto::V1::Schedule, nil] schedule of the first rule matching the node that sets one, else the workflow's
+      #: (Proto::V1::Orchestration orchestration, Proto::V1::Node node) -> Proto::V1::Schedule?
+      def self.schedule_for(orchestration, node)
+        orchestration.schedule_rules.find { it.schedule && matches?(Must.because(it.match) { 'validation requires match' }, node) }&.schedule ||
+          orchestration.schedule
+      end
+
+      # @param orchestration [Proto::V1::Orchestration] how the workflow is orchestrated
+      # @param node [Proto::V1::Node] the node
+      # @return [Proto::V1::Debounce, nil] debounce of the first rule matching the node that sets one, else the workflow's
+      #: (Proto::V1::Orchestration orchestration, Proto::V1::Node node) -> Proto::V1::Debounce?
+      def self.debounce_for(orchestration, node)
+        orchestration.schedule_rules.find { it.debounce && matches?(Must.because(it.match) { 'validation requires match' }, node) }&.debounce ||
+          orchestration.debounce
+      end
+
+      # @param match [Proto::V1::NodeMatch] the criteria
+      # @param node [Proto::V1::Node] the node
+      # @return [Boolean] whether the node meets every criterion set
+      #: (Proto::V1::NodeMatch match, Proto::V1::Node node) -> bool
+      def self.matches?(match, node)
+        return false unless match.names.empty? || match.names.include?(node.name)
+        return false unless match.groups.empty? || match.groups.include?(node.group)
+
+        match.name_regexp.empty? || Regexp.new("\\A(?:#{match.name_regexp})\\z").match?(node.name)
+      end
+
       # Record of a node new to the inventory, due within the schedule's jitter.
       #
       # @param workflow [String] workflow name
@@ -58,7 +89,7 @@ module Glazed
         due = if signal.immediate
           at
         else
-          [at + nonzero(debounce&.delay_seconds, DEFAULT_DELAY), window + nonzero(debounce&.max_wait_seconds, DEFAULT_MAX_WAIT)].min
+          [at + Durations.seconds(debounce&.delay, DEFAULT_DELAY), window + Durations.seconds(debounce&.max_wait, DEFAULT_MAX_WAIT)].min
         end
         scheduled = time(updated.scheduled_at)
         if !running && scheduled && scheduled <= due
@@ -76,9 +107,9 @@ module Glazed
       # @param record [Proto::V1::NodeSchedule, nil] the node's record
       # @param owner [String] identifier of the claiming orchestrator and batch
       # @param now [Time] current time
-      # @param lease_seconds [Integer] seconds the lease lasts
+      # @param lease_seconds [Numeric] seconds the lease lasts
       # @return [Proto::V1::NodeSchedule, nil] the leased record; the record unchanged when it is not due or leased to another
-      #: (Proto::V1::NodeSchedule? record, owner: String, now: Time, lease_seconds: Integer) -> Proto::V1::NodeSchedule?
+      #: (Proto::V1::NodeSchedule? record, owner: String, now: Time, lease_seconds: Numeric) -> Proto::V1::NodeSchedule?
       def self.claim(record, owner:, now:, lease_seconds:)
         return record unless record
         return record if running?(record, now)
@@ -107,8 +138,8 @@ module Glazed
       def self.completed(record, owner:, finished_at:, error:, schedule:, random:)
         return record unless record && record.lease_owner == owner
 
-        interval = nonzero(schedule&.interval_seconds, DEFAULT_INTERVAL)
-        interval = nonzero(schedule&.retry_interval_seconds, interval) if error
+        interval = Durations.seconds(schedule&.interval, DEFAULT_INTERVAL)
+        interval = Durations.seconds(schedule&.retry_interval, interval) if error
         due = finished_at + interval + jitter(schedule, random)
         window = time(record.signal_window_started_at)
         started = time(record.last_started_at)
@@ -156,14 +187,14 @@ module Glazed
       # @param token [String] identifies the deciding execution
       # @param next_due [Time, nil] when a node may next be claimed; nil when never
       # @param now [Time] current time
-      # @param gap [Integer] seconds the execution waits at least after its first cycle
-      # @param grace [Integer] seconds after waking until another execution may take over
+      # @param gap [Numeric] seconds the execution waits at least after its first cycle
+      # @param grace [Numeric] seconds after waking until another execution may take over
       # @param cycle [Integer] times the execution has run due nodes already
       # @param max_cycles [Integer] cycles after which the execution ends
       # @param alive [Proc] tells whether the execution of a waiter's token still runs
       # @return [Array(Proto::V1::Wakeup, Time), Array(Proto::V1::Wakeup, nil), Array(nil, nil)] the waiter
       #   record to keep, and when to wake; nil when the execution ends
-      #: (Proto::V1::Wakeup? record, token: String, next_due: Time?, now: Time, gap: Integer, grace: Integer, cycle: Integer, max_cycles: Integer, ?alive: ^(String) -> bool) -> [Proto::V1::Wakeup?, Time?]
+      #: (Proto::V1::Wakeup? record, token: String, next_due: Time?, now: Time, gap: Numeric, grace: Numeric, cycle: Integer, max_cycles: Integer, ?alive: ^(String) -> bool) -> [Proto::V1::Wakeup?, Time?]
       def self.arm(record, token:, next_due:, now:, gap:, grace:, cycle:, max_cycles:, alive: ->(_token) { true })
         own = record&.owner == token
         return [own ? nil : record, nil] if next_due.nil? || cycle >= max_cycles
@@ -199,18 +230,12 @@ module Glazed
 
       # @param schedule [Proto::V1::Schedule, nil] the schedule
       # @param random [Random] source of jitter
-      # @return [Integer] seconds of jitter
-      #: (Proto::V1::Schedule? schedule, Random random) -> Integer
+      # @return [Float, Integer] seconds of jitter
+      #: (Proto::V1::Schedule? schedule, Random random) -> (Float | Integer)
       private_class_method def self.jitter(schedule, random)
-        max = schedule&.jitter_seconds || 0
-        max.zero? ? 0 : random.rand(max + 1)
+        max = Durations.seconds(schedule&.jitter, 0)
+        max.zero? ? 0 : random.rand * max
       end
-
-      # @param value [Integer, nil] configured value
-      # @param default [Integer] value used when unset or 0
-      # @return [Integer] the value
-      #: (Integer? value, Integer default) -> Integer
-      private_class_method def self.nonzero(value, default) = value.nil? || value.zero? ? default : value
     end
   end
 end

data/lib/glazed/orchestrator.rb

@@ -10,6 +10,7 @@ require 'glazed/proto'
 require 'glazed/runner'
 require 'glazed/state_backends/base'
 require 'glazed/workflow'
+require 'glazed/durations'
 
 module Glazed
   # Runs workflows for nodes as they become due, until stopped. Due dates
@@ -128,12 +129,12 @@ module Glazed
       next_wait
     end
 
-    # @return [Integer] seconds between inventory reloads
-    #: () -> Integer
-    private def inventory_refresh_seconds = @settings.inventory_refresh_seconds.zero? ? DEFAULT_INVENTORY_REFRESH : @settings.inventory_refresh_seconds
+    # @return [Float] seconds between inventory reloads
+    #: () -> Float
+    private def inventory_refresh_seconds = Durations.seconds(@settings.inventory_refresh, DEFAULT_INVENTORY_REFRESH)
 
-    # @return [Integer] seconds between checks for due nodes
-    #: () -> Integer
+    # @return [Float] seconds between checks for due nodes
+    #: () -> Float
     private def poll_seconds = @coordinator.poll_seconds
 
     # @param request [String] one byte naming the request
@@ -178,7 +179,7 @@ module Glazed
       @nodes = nodes.to_h { [it.name, it] }
       @inventory_loaded_at = now
       notify(level: 'info', message: 'inventory loaded', nodes: @nodes.size)
-      @coordinator.sync_inventory(@nodes.keys)
+      @coordinator.sync_inventory(@nodes.values)
     end
 
     # Runs the workflow for leased nodes and records the outcomes. When
@@ -202,7 +203,7 @@ module Glazed
         raise
       end
       # Records of nodes gone from the inventory are deleted by the next reload.
-      @coordinator.complete(workflow, owner:, names: names & @nodes.keys, errors:)
+      @coordinator.complete(workflow, owner:, names: names & @nodes.keys, errors:, nodes: @nodes)
       notify(level: 'info', workflow:, message: 'batch finished', nodes: nodes.size, failed: errors.size)
     end
 

data/lib/glazed/secrets/command.rb

@@ -9,6 +9,7 @@ require 'glazed/proto'
 require 'glazed/secret'
 require 'glazed/secrets'
 require 'glazed/shell_command'
+require 'glazed/durations'
 
 module Glazed
   module Secrets
@@ -40,7 +41,7 @@ module Glazed
       #: (Google::Protobuf::MessageExts settings) -> Command
       def self.from_proto(settings)
         command = Must.be_a(settings, Proto::V1::CommandSecret)
-        new(run: ShellCommand.run_of(command.run, command.exec), timeout: command.timeout_seconds.zero? ? DEFAULT_TIMEOUT : command.timeout_seconds)
+        new(run: ShellCommand.run_of(command.run, command.exec), timeout: Durations.seconds(command.timeout, DEFAULT_TIMEOUT))
       end
 
       # @return [String, Array<String>] command line, or program and its arguments

data/lib/glazed/sources/command.rb

@@ -9,6 +9,7 @@ require 'glazed/proto'
 require 'glazed/shell_command'
 require 'glazed/sources'
 require 'glazed/sources/base'
+require 'glazed/durations'
 
 module Glazed
   module Sources
@@ -38,7 +39,7 @@ module Glazed
       #: (Google::Protobuf::MessageExts settings) -> Command
       def self.from_proto(settings)
         command = Must.be_a(settings, Proto::V1::CommandInventory)
-        new(run: ShellCommand.run_of(command.run, command.exec), timeout: command.timeout_seconds.zero? ? DEFAULT_TIMEOUT : command.timeout_seconds)
+        new(run: ShellCommand.run_of(command.run, command.exec), timeout: Durations.seconds(command.timeout, DEFAULT_TIMEOUT))
       end
 
       # @return [String, Array<String>] command line, or program and its arguments

data/lib/glazed/steps/batch_command.rb

@@ -8,6 +8,7 @@ require 'glazed/proto'
 require 'glazed/proto_json'
 require 'glazed/shell_command'
 require 'glazed/steps'
+require 'glazed/durations'
 
 module Glazed
   module Steps
@@ -40,7 +41,7 @@ module Glazed
       #: (String name, Google::Protobuf::MessageExts settings, context: StepContext) -> BatchCommand
       def self.from_proto(name, settings, context:)
         command = Must.be_a(settings, Proto::V1::BatchCommandStep)
-        new(name:, run: ShellCommand.run_of(command.run, command.exec), timeout: command.timeout_seconds.zero? ? DEFAULT_TIMEOUT : command.timeout_seconds)
+        new(name:, run: ShellCommand.run_of(command.run, command.exec), timeout: Durations.seconds(command.timeout, DEFAULT_TIMEOUT))
       end
 
       # @param batch [Proto::V1::BatchState] node states

data/lib/glazed/steps/command.rb

@@ -9,6 +9,7 @@ require 'glazed/proto_json'
 require 'glazed/shell_command'
 require 'glazed/steps'
 require 'glazed/storages'
+require 'glazed/durations'
 
 module Glazed
   module Steps
@@ -59,7 +60,7 @@ module Glazed
           input: command.input.empty? ? nil : command.input,
           output: command.output.empty? ? nil : command.output,
           storage_name: command.storage.empty? ? nil : command.storage,
-          timeout: command.timeout_seconds.zero? ? DEFAULT_TIMEOUT : command.timeout_seconds,
+          timeout: Durations.seconds(command.timeout, DEFAULT_TIMEOUT),
         )
       end
 

data/lib/glazed/steps/fetch.rb

@@ -9,6 +9,7 @@ require 'glazed/must'
 require 'glazed/proto'
 require 'glazed/steps'
 require 'glazed/storages'
+require 'glazed/durations'
 
 module Glazed
   module Steps
@@ -42,7 +43,7 @@ module Glazed
       #: (String name, Google::Protobuf::MessageExts settings, context: StepContext) -> Fetch
       def self.from_proto(name, settings, context:)
         fetch = Must.be_a(settings, Proto::V1::FetchStep)
-        timeout = fetch.timeout_seconds.zero? ? CliSession::DEFAULT_TIMEOUT : fetch.timeout_seconds
+        timeout = Durations.seconds(fetch.timeout, CliSession::DEFAULT_TIMEOUT)
         new(name:, output: fetch.output, storage_name: fetch.storage, context:, timeout:)
       end
 

data/lib/glazed/v1/coordinator_pb.rb

@@ -7,10 +7,11 @@ require 'google/protobuf'
 require 'buf/validate/validate_pb'
 require 'glazed/v1/orchestrator_pb'
 require 'glazed/v1/steps_pb'
+require 'google/protobuf/duration_pb'
 require 'google/protobuf/timestamp_pb'
 
 
-descriptor_data = "\n\x1bglazed/v1/coordinator.proto\x12\tglazed.v1\x1a\x1b\x62uf/validate/validate.proto\x1a\x1cglazed/v1/orchestrator.proto\x1a\x15glazed/v1/steps.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xac\x02\n\x0f\x43oordinatorTask\x12,\n\x05\x63heck\x18\x01 \x01(\x0b\x32\x14.glazed.v1.CheckTaskH\x00R\x05\x63heck\x12\x32\n\x07prepare\x18\x02 \x01(\x0b\x32\x16.glazed.v1.PrepareTaskH\x00R\x07prepare\x12\x36\n\tnode_step\x18\x03 \x01(\x0b\x32\x17.glazed.v1.NodeStepTaskH\x00R\x08nodeStep\x12\x39\n\nbatch_step\x18\x04 \x01(\x0b\x32\x18.glazed.v1.BatchStepTaskH\x00R\tbatchStep\x12\x35\n\x08\x63omplete\x18\x05 \x01(\x0b\x32\x17.glazed.v1.CompleteTaskH\x00R\x08\x63ompleteB\r\n\x04task\x12\x05\xbaH\x02\x08\x01\"\xb1\x01\n\tCheckTask\x12+\n\x07signals\x18\x01 \x03(\x0b\x32\x11.glazed.v1.SignalR\x07signals\x12\x1d\n\x05token\x18\x02 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x05token\x12\x14\n\x05\x63ycle\x18\x03 \x01(\rR\x05\x63ycle\x12#\n\rgrace_seconds\x18\x04 \x01(\rR\x0cgraceSeconds\x12\x1d\n\nmax_cycles\x18\x05 \x01(\rR\tmaxCycles\"B\n\x05\x41rmed\x12\x39\n\nwait_until\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\twaitUntil\"\r\n\x0bPrepareTask\"\xa2\x01\n\x0fPreparedBatches\x12\x41\n\x07\x62\x61tches\x18\x01 \x03(\x0b\x32\'.glazed.v1.PreparedBatches.BatchesEntryR\x07\x62\x61tches\x1aL\n\x0c\x42\x61tchesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x10.glazed.v1.BatchR\x05value:\x02\x38\x01\"\x86\x01\n\x05\x42\x61tch\x12#\n\x08workflow\x18\x01 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x08workflow\x12\x14\n\x05owner\x18\x02 \x01(\tR\x05owner\x12,\n\x05nodes\x18\x03 \x03(\x0b\x32\x16.glazed.v1.NodeOutcomeR\x05nodes\x12\x14\n\x05\x65rror\x18\x04 \x01(\tR\x05\x65rror\"s\n\x0bNodeOutcome\x12\x32\n\x05state\x18\x01 \x01(\x0b\x32\x14.glazed.v1.NodeStateB\x06\xbaH\x03\xc8\x01\x01R\x05state\x12\x30\n\x07\x66\x61ilure\x18\x02 \x01(\x0b\x32\x16.glazed.v1.StepFailureR\x07\x66\x61ilure\"7\n\x0bStepFailure\x12\x12\n\x04step\x18\x01 \x01(\tR\x04step\x12\x14\n\x05\x65rror\x18\x02 \x01(\tR\x05\x65rror\"\x8a\x01\n\x0cNodeStepTask\x12#\n\x08workflow\x18\x01 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x08workflow\x12\x1b\n\x04step\x18\x02 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x04step\x12\x38\n\x07outcome\x18\x03 \x01(\x0b\x32\x16.glazed.v1.NodeOutcomeB\x06\xbaH\x03\xc8\x01\x01R\x07outcome\"\\\n\rBatchStepTask\x12\x1b\n\x04step\x18\x01 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x04step\x12.\n\x05\x62\x61tch\x18\x02 \x01(\x0b\x32\x10.glazed.v1.BatchB\x06\xbaH\x03\xc8\x01\x01R\x05\x62\x61tch\">\n\x0c\x43ompleteTask\x12.\n\x05\x62\x61tch\x18\x01 \x01(\x0b\x32\x10.glazed.v1.BatchB\x06\xbaH\x03\xc8\x01\x01R\x05\x62\x61tchB\x14\xea\x02\x11Glazed::Proto::V1b\x06proto3"
+descriptor_data = "\n\x1bglazed/v1/coordinator.proto\x12\tglazed.v1\x1a\x1b\x62uf/validate/validate.proto\x1a\x1cglazed/v1/orchestrator.proto\x1a\x15glazed/v1/steps.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xac\x02\n\x0f\x43oordinatorTask\x12,\n\x05\x63heck\x18\x01 \x01(\x0b\x32\x14.glazed.v1.CheckTaskH\x00R\x05\x63heck\x12\x32\n\x07prepare\x18\x02 \x01(\x0b\x32\x16.glazed.v1.PrepareTaskH\x00R\x07prepare\x12\x36\n\tnode_step\x18\x03 \x01(\x0b\x32\x17.glazed.v1.NodeStepTaskH\x00R\x08nodeStep\x12\x39\n\nbatch_step\x18\x04 \x01(\x0b\x32\x18.glazed.v1.BatchStepTaskH\x00R\tbatchStep\x12\x35\n\x08\x63omplete\x18\x05 \x01(\x0b\x32\x17.glazed.v1.CompleteTaskH\x00R\x08\x63ompleteB\r\n\x04task\x12\x05\xbaH\x02\x08\x01\"\xdc\x01\n\tCheckTask\x12+\n\x07signals\x18\x01 \x03(\x0b\x32\x11.glazed.v1.SignalR\x07signals\x12\x1d\n\x05token\x18\x02 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x05token\x12\x14\n\x05\x63ycle\x18\x03 \x01(\rR\x05\x63ycle\x12\x39\n\x05grace\x18\x06 \x01(\x0b\x32\x19.google.protobuf.DurationB\x08\xbaH\x05\xaa\x01\x02\x32\x00R\x05grace\x12\x1d\n\nmax_cycles\x18\x05 \x01(\rR\tmaxCyclesJ\x04\x08\x04\x10\x05R\rgrace_seconds\"B\n\x05\x41rmed\x12\x39\n\nwait_until\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\twaitUntil\"\r\n\x0bPrepareTask\"\xa2\x01\n\x0fPreparedBatches\x12\x41\n\x07\x62\x61tches\x18\x01 \x03(\x0b\x32\'.glazed.v1.PreparedBatches.BatchesEntryR\x07\x62\x61tches\x1aL\n\x0c\x42\x61tchesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x10.glazed.v1.BatchR\x05value:\x02\x38\x01\"\x86\x01\n\x05\x42\x61tch\x12#\n\x08workflow\x18\x01 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x08workflow\x12\x14\n\x05owner\x18\x02 \x01(\tR\x05owner\x12,\n\x05nodes\x18\x03 \x03(\x0b\x32\x16.glazed.v1.NodeOutcomeR\x05nodes\x12\x14\n\x05\x65rror\x18\x04 \x01(\tR\x05\x65rror\"s\n\x0bNodeOutcome\x12\x32\n\x05state\x18\x01 \x01(\x0b\x32\x14.glazed.v1.NodeStateB\x06\xbaH\x03\xc8\x01\x01R\x05state\x12\x30\n\x07\x66\x61ilure\x18\x02 \x01(\x0b\x32\x16.glazed.v1.StepFailureR\x07\x66\x61ilure\"7\n\x0bStepFailure\x12\x12\n\x04step\x18\x01 \x01(\tR\x04step\x12\x14\n\x05\x65rror\x18\x02 \x01(\tR\x05\x65rror\"\x8a\x01\n\x0cNodeStepTask\x12#\n\x08workflow\x18\x01 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x08workflow\x12\x1b\n\x04step\x18\x02 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x04step\x12\x38\n\x07outcome\x18\x03 \x01(\x0b\x32\x16.glazed.v1.NodeOutcomeB\x06\xbaH\x03\xc8\x01\x01R\x07outcome\"\\\n\rBatchStepTask\x12\x1b\n\x04step\x18\x01 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x04step\x12.\n\x05\x62\x61tch\x18\x02 \x01(\x0b\x32\x10.glazed.v1.BatchB\x06\xbaH\x03\xc8\x01\x01R\x05\x62\x61tch\">\n\x0c\x43ompleteTask\x12.\n\x05\x62\x61tch\x18\x01 \x01(\x0b\x32\x10.glazed.v1.BatchB\x06\xbaH\x03\xc8\x01\x01R\x05\x62\x61tchB\x14\xea\x02\x11Glazed::Proto::V1b\x06proto3"
 
 pool = ::Google::Protobuf::DescriptorPool.generated_pool
 pool.add_serialized_file(descriptor_data)

data/lib/glazed/v1/inventory_pb.rb

@@ -7,9 +7,10 @@ require 'google/protobuf'
 require 'buf/validate/validate_pb'
 require 'glazed/v1/secret_pb'
 require 'google/protobuf/any_pb'
+require 'google/protobuf/duration_pb'
 
 
-descriptor_data = "\n\x19glazed/v1/inventory.proto\x12\tglazed.v1\x1a\x1b\x62uf/validate/validate.proto\x1a\x16glazed/v1/secret.proto\x1a\x19google/protobuf/any.proto\"\xb6\x05\n\x04Node\x12)\n\x04name\x18\x01 \x01(\tB\x15\xbaH\x12r\x10\x32\x07^[^/]*$Z\x01.Z\x02..R\x04name\x12\x30\n\x05group\x18\x02 \x01(\tB\x1a\xbaH\x17r\x15\x32\x13^([^/]+(/[^/]+)*)?$R\x05group\x12\x12\n\x04host\x18\x03 \x01(\tR\x04host\x12\x1d\n\x04port\x18\x04 \x01(\rB\t\xbaH\x06*\x04\x18\xff\xff\x03R\x04port\x12\x35\n\x07\x64ialect\x18\x05 \x01(\tB\x1b\xbaH\x18r\x16\x32\x14^([a-z][a-z0-9_]*)?$R\x07\x64ialect\x12\x39\n\ttransport\x18\x06 \x01(\tB\x1b\xbaH\x18r\x16\x32\x14^([a-z][a-z0-9_]*)?$R\ttransport\x12\x1a\n\x08username\x18\x07 \x01(\tR\x08username\x12\x30\n\x08password\x18\x08 \x01(\x0b\x32\x14.glazed.v1.SecretRefR\x08password\x12\x41\n\x06params\x18\t \x03(\x0b\x32\x1b.glazed.v1.Node.ParamsEntryB\x0c\xbaH\t\x9a\x01\x06\"\x04r\x02\x10\x01R\x06params\x12\x44\n\x07secrets\x18\n \x03(\x0b\x32\x1c.glazed.v1.Node.SecretsEntryB\x0c\xbaH\t\x9a\x01\x06\"\x04r\x02\x10\x01R\x07secrets\x12H\n\x11transport_options\x18\x0b \x01(\x0b\x32\x1b.glazed.v1.TransportOptionsR\x10transportOptions\x1a\x39\n\x0bParamsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aP\n\x0cSecretsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12*\n\x05value\x18\x02 \x01(\x0b\x32\x14.glazed.v1.SecretRefR\x05value:\x02\x38\x01\";\n\x10TransportOptions\x12\'\n\x03ssh\x18\x01 \x01(\x0b\x32\x15.glazed.v1.SshOptionsR\x03ssh\"\xf8\x07\n\nSshOptions\x12%\n\x04keys\x18\x01 \x03(\x0b\x32\x11.glazed.v1.SshKeyR\x04keys\x12\x34\n\npassphrase\x18\x02 \x01(\x0b\x32\x14.glazed.v1.SecretRefR\npassphrase\x12\x1b\n\tkeys_only\x18\x03 \x01(\x08R\x08keysOnly\x12/\n\x0c\x61uth_methods\x18\x04 \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\x0b\x61uthMethods\x12;\n\x1anumber_of_password_prompts\x18\x05 \x01(\rR\x17numberOfPasswordPrompts\x12[\n\x0fverify_host_key\x18\x06 \x01(\x0e\x32).glazed.v1.SshOptions.HostKeyVerificationB\x08\xbaH\x05\x82\x01\x02\x10\x01R\rverifyHostKey\x12?\n\x15user_known_hosts_file\x18\x07 \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\x12userKnownHostsFile\x12\x43\n\x17global_known_hosts_file\x18\x08 \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\x14globalKnownHostsFile\x12\'\n\x08host_key\x18\t \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\x07hostKey\x12\x1e\n\x03kex\x18\n \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\x03kex\x12,\n\nencryption\x18\x0b \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\nencryption\x12 \n\x04hmac\x18\x0c \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\x04hmac\x12 \n\x0b\x63ompression\x18\r \x01(\x08R\x0b\x63ompression\x12#\n\rproxy_command\x18\x0e \x01(\tR\x0cproxyCommand\x12#\n\rforward_agent\x18\x0f \x01(\x08R\x0c\x66orwardAgent\x12)\n\x0euse_ssh_config\x18\x10 \x01(\x08H\x00R\x0cuseSshConfig\x88\x01\x01\"\xdb\x01\n\x13HostKeyVerification\x12%\n!HOST_KEY_VERIFICATION_UNSPECIFIED\x10\x00\x12\x1f\n\x1bHOST_KEY_VERIFICATION_NEVER\x10\x01\x12$\n HOST_KEY_VERIFICATION_ACCEPT_NEW\x10\x02\x12\x34\n0HOST_KEY_VERIFICATION_ACCEPT_NEW_OR_LOCAL_TUNNEL\x10\x03\x12 \n\x1cHOST_KEY_VERIFICATION_ALWAYS\x10\x04\x42\x11\n\x0f_use_ssh_config\"b\n\x06SshKey\x12\x1d\n\x04path\x18\x01 \x01(\tB\x07\xbaH\x04r\x02\x10\x01H\x00R\x04path\x12(\n\x03raw\x18\x02 \x01(\x0b\x32\x14.glazed.v1.SecretRefH\x00R\x03rawB\x0f\n\x06source\x12\x05\xbaH\x02\x08\x01\"\x89\x04\n\rInventoryFile\x12+\n\x08\x64\x65\x66\x61ults\x18\x01 \x01(\x0b\x32\x0f.glazed.v1.NodeR\x08\x64\x65\x66\x61ults\x12%\n\x05nodes\x18\x02 \x03(\x0b\x32\x0f.glazed.v1.NodeR\x05nodes:\xa3\x03\xbaH\x9f\x03\x1aP\n\x14inventory_file.names\x12\x17\x65very node needs a name\x1a\x1fthis.nodes.all(n, n.name != \'\')\x1aV\n\x1cinventory_file.defaults_name\x12\x1c\x64\x65\x66\x61ults must not set a name\x1a\x18this.defaults.name == \'\'\x1a\\\n\x1binventory_file.unique_names\x12\x19node names must be unique\x1a\"this.nodes.map(n, n.name).unique()\x1a\x94\x01\n\x16inventory_file.dialect\x12\x37\x65very node needs a dialect, from itself or the defaults\x1a\x41this.defaults.dialect != \'\' || this.nodes.all(n, n.dialect != \'\')\"\x81\x02\n\x0fInventorySource\x12>\n\njson_files\x18\x01 \x01(\x0b\x32\x1d.glazed.v1.JsonFilesInventoryH\x00R\tjsonFiles\x12\x32\n\x06inline\x18\x02 \x01(\x0b\x32\x18.glazed.v1.InventoryFileH\x00R\x06inline\x12.\n\x06plugin\x18\x03 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00R\x06plugin\x12\x37\n\x07\x63ommand\x18\x04 \x01(\x0b\x32\x1b.glazed.v1.CommandInventoryH\x00R\x07\x63ommandB\x11\n\x08provider\x12\x05\xbaH\x02\x08\x01\"\x83\x01\n\x10\x43ommandInventory\x12\x10\n\x03run\x18\x01 \x01(\tR\x03run\x12\'\n\x0ftimeout_seconds\x18\x02 \x01(\rR\x0etimeoutSeconds\x12 \n\x04\x65xec\x18\x03 \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\x04\x65xec:\x12\xbaH\x0f\"\r\n\x03run\n\x04\x65xec\x10\x01\":\n\x12JsonFilesInventory\x12$\n\x05paths\x18\x01 \x03(\tB\x0e\xbaH\x0b\x92\x01\x08\x08\x01\"\x04r\x02\x10\x01R\x05pathsB\x14\xea\x02\x11Glazed::Proto::V1b\x06proto3"
+descriptor_data = "\n\x19glazed/v1/inventory.proto\x12\tglazed.v1\x1a\x1b\x62uf/validate/validate.proto\x1a\x16glazed/v1/secret.proto\x1a\x19google/protobuf/any.proto\x1a\x1egoogle/protobuf/duration.proto\"\xb6\x05\n\x04Node\x12)\n\x04name\x18\x01 \x01(\tB\x15\xbaH\x12r\x10\x32\x07^[^/]*$Z\x01.Z\x02..R\x04name\x12\x30\n\x05group\x18\x02 \x01(\tB\x1a\xbaH\x17r\x15\x32\x13^([^/]+(/[^/]+)*)?$R\x05group\x12\x12\n\x04host\x18\x03 \x01(\tR\x04host\x12\x1d\n\x04port\x18\x04 \x01(\rB\t\xbaH\x06*\x04\x18\xff\xff\x03R\x04port\x12\x35\n\x07\x64ialect\x18\x05 \x01(\tB\x1b\xbaH\x18r\x16\x32\x14^([a-z][a-z0-9_]*)?$R\x07\x64ialect\x12\x39\n\ttransport\x18\x06 \x01(\tB\x1b\xbaH\x18r\x16\x32\x14^([a-z][a-z0-9_]*)?$R\ttransport\x12\x1a\n\x08username\x18\x07 \x01(\tR\x08username\x12\x30\n\x08password\x18\x08 \x01(\x0b\x32\x14.glazed.v1.SecretRefR\x08password\x12\x41\n\x06params\x18\t \x03(\x0b\x32\x1b.glazed.v1.Node.ParamsEntryB\x0c\xbaH\t\x9a\x01\x06\"\x04r\x02\x10\x01R\x06params\x12\x44\n\x07secrets\x18\n \x03(\x0b\x32\x1c.glazed.v1.Node.SecretsEntryB\x0c\xbaH\t\x9a\x01\x06\"\x04r\x02\x10\x01R\x07secrets\x12H\n\x11transport_options\x18\x0b \x01(\x0b\x32\x1b.glazed.v1.TransportOptionsR\x10transportOptions\x1a\x39\n\x0bParamsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aP\n\x0cSecretsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12*\n\x05value\x18\x02 \x01(\x0b\x32\x14.glazed.v1.SecretRefR\x05value:\x02\x38\x01\";\n\x10TransportOptions\x12\'\n\x03ssh\x18\x01 \x01(\x0b\x32\x15.glazed.v1.SshOptionsR\x03ssh\"\xf8\x07\n\nSshOptions\x12%\n\x04keys\x18\x01 \x03(\x0b\x32\x11.glazed.v1.SshKeyR\x04keys\x12\x34\n\npassphrase\x18\x02 \x01(\x0b\x32\x14.glazed.v1.SecretRefR\npassphrase\x12\x1b\n\tkeys_only\x18\x03 \x01(\x08R\x08keysOnly\x12/\n\x0c\x61uth_methods\x18\x04 \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\x0b\x61uthMethods\x12;\n\x1anumber_of_password_prompts\x18\x05 \x01(\rR\x17numberOfPasswordPrompts\x12[\n\x0fverify_host_key\x18\x06 \x01(\x0e\x32).glazed.v1.SshOptions.HostKeyVerificationB\x08\xbaH\x05\x82\x01\x02\x10\x01R\rverifyHostKey\x12?\n\x15user_known_hosts_file\x18\x07 \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\x12userKnownHostsFile\x12\x43\n\x17global_known_hosts_file\x18\x08 \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\x14globalKnownHostsFile\x12\'\n\x08host_key\x18\t \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\x07hostKey\x12\x1e\n\x03kex\x18\n \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\x03kex\x12,\n\nencryption\x18\x0b \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\nencryption\x12 \n\x04hmac\x18\x0c \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\x04hmac\x12 \n\x0b\x63ompression\x18\r \x01(\x08R\x0b\x63ompression\x12#\n\rproxy_command\x18\x0e \x01(\tR\x0cproxyCommand\x12#\n\rforward_agent\x18\x0f \x01(\x08R\x0c\x66orwardAgent\x12)\n\x0euse_ssh_config\x18\x10 \x01(\x08H\x00R\x0cuseSshConfig\x88\x01\x01\"\xdb\x01\n\x13HostKeyVerification\x12%\n!HOST_KEY_VERIFICATION_UNSPECIFIED\x10\x00\x12\x1f\n\x1bHOST_KEY_VERIFICATION_NEVER\x10\x01\x12$\n HOST_KEY_VERIFICATION_ACCEPT_NEW\x10\x02\x12\x34\n0HOST_KEY_VERIFICATION_ACCEPT_NEW_OR_LOCAL_TUNNEL\x10\x03\x12 \n\x1cHOST_KEY_VERIFICATION_ALWAYS\x10\x04\x42\x11\n\x0f_use_ssh_config\"b\n\x06SshKey\x12\x1d\n\x04path\x18\x01 \x01(\tB\x07\xbaH\x04r\x02\x10\x01H\x00R\x04path\x12(\n\x03raw\x18\x02 \x01(\x0b\x32\x14.glazed.v1.SecretRefH\x00R\x03rawB\x0f\n\x06source\x12\x05\xbaH\x02\x08\x01\"\x89\x04\n\rInventoryFile\x12+\n\x08\x64\x65\x66\x61ults\x18\x01 \x01(\x0b\x32\x0f.glazed.v1.NodeR\x08\x64\x65\x66\x61ults\x12%\n\x05nodes\x18\x02 \x03(\x0b\x32\x0f.glazed.v1.NodeR\x05nodes:\xa3\x03\xbaH\x9f\x03\x1aP\n\x14inventory_file.names\x12\x17\x65very node needs a name\x1a\x1fthis.nodes.all(n, n.name != \'\')\x1aV\n\x1cinventory_file.defaults_name\x12\x1c\x64\x65\x66\x61ults must not set a name\x1a\x18this.defaults.name == \'\'\x1a\\\n\x1binventory_file.unique_names\x12\x19node names must be unique\x1a\"this.nodes.map(n, n.name).unique()\x1a\x94\x01\n\x16inventory_file.dialect\x12\x37\x65very node needs a dialect, from itself or the defaults\x1a\x41this.defaults.dialect != \'\' || this.nodes.all(n, n.dialect != \'\')\"\x81\x02\n\x0fInventorySource\x12>\n\njson_files\x18\x01 \x01(\x0b\x32\x1d.glazed.v1.JsonFilesInventoryH\x00R\tjsonFiles\x12\x32\n\x06inline\x18\x02 \x01(\x0b\x32\x18.glazed.v1.InventoryFileH\x00R\x06inline\x12.\n\x06plugin\x18\x03 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00R\x06plugin\x12\x37\n\x07\x63ommand\x18\x04 \x01(\x0b\x32\x1b.glazed.v1.CommandInventoryH\x00R\x07\x63ommandB\x11\n\x08provider\x12\x05\xbaH\x02\x08\x01\"\xb0\x01\n\x10\x43ommandInventory\x12\x10\n\x03run\x18\x01 \x01(\tR\x03run\x12=\n\x07timeout\x18\x04 \x01(\x0b\x32\x19.google.protobuf.DurationB\x08\xbaH\x05\xaa\x01\x02\x32\x00R\x07timeout\x12 \n\x04\x65xec\x18\x03 \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\x04\x65xec:\x12\xbaH\x0f\"\r\n\x03run\n\x04\x65xec\x10\x01J\x04\x08\x02\x10\x03R\x0ftimeout_seconds\":\n\x12JsonFilesInventory\x12$\n\x05paths\x18\x01 \x03(\tB\x0e\xbaH\x0b\x92\x01\x08\x08\x01\"\x04r\x02\x10\x01R\x05pathsB\x14\xea\x02\x11Glazed::Proto::V1b\x06proto3"
 
 pool = ::Google::Protobuf::DescriptorPool.generated_pool
 pool.add_serialized_file(descriptor_data)

data/lib/glazed/v1/orchestrator_pb.rb

@@ -6,10 +6,11 @@ require 'google/protobuf'
 
 require 'buf/validate/validate_pb'
 require 'glazed/v1/state_pb'
+require 'google/protobuf/duration_pb'
 require 'google/protobuf/timestamp_pb'
 
 
-descriptor_data = "\n\x1cglazed/v1/orchestrator.proto\x12\tglazed.v1\x1a\x1b\x62uf/validate/validate.proto\x1a\x15glazed/v1/state.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xd8\x02\n\x0cOrchestrator\x12;\n\x05state\x18\x01 \x01(\x0b\x32\x1d.glazed.v1.StateBackendConfigB\x06\xbaH\x03\xc8\x01\x01R\x05state\x12T\n\tworkflows\x18\x02 \x03(\x0b\x32&.glazed.v1.Orchestrator.WorkflowsEntryB\x0e\xbaH\x0b\x9a\x01\x08\x08\x01\"\x04r\x02\x10\x01R\tworkflows\x12!\n\x0cpoll_seconds\x18\x03 \x01(\rR\x0bpollSeconds\x12:\n\x19inventory_refresh_seconds\x18\x04 \x01(\rR\x17inventoryRefreshSeconds\x1aV\n\x0eWorkflowsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12.\n\x05value\x18\x02 \x01(\x0b\x32\x18.glazed.v1.OrchestrationR\x05value:\x02\x38\x01\"\xb5\x01\n\rOrchestration\x12/\n\x08schedule\x18\x01 \x01(\x0b\x32\x13.glazed.v1.ScheduleR\x08schedule\x12/\n\x08\x64\x65\x62ounce\x18\x02 \x01(\x0b\x32\x13.glazed.v1.DebounceR\x08\x64\x65\x62ounce\x12\x1d\n\nbatch_size\x18\x03 \x01(\rR\tbatchSize\x12#\n\rlease_seconds\x18\x04 \x01(\rR\x0cleaseSeconds\"\x92\x01\n\x08Schedule\x12)\n\x10interval_seconds\x18\x01 \x01(\rR\x0fintervalSeconds\x12\x34\n\x16retry_interval_seconds\x18\x02 \x01(\rR\x14retryIntervalSeconds\x12%\n\x0ejitter_seconds\x18\x03 \x01(\rR\rjitterSeconds\"Y\n\x08\x44\x65\x62ounce\x12#\n\rdelay_seconds\x18\x01 \x01(\rR\x0c\x64\x65laySeconds\x12(\n\x10max_wait_seconds\x18\x02 \x01(\rR\x0emaxWaitSeconds\"\xba\x02\n\x06Signal\x12\x12\n\x04node\x18\x01 \x01(\tR\x04node\x12\x1f\n\x06source\x18\x02 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x06source\x12;\n\x0breceived_at\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\nreceivedAt\x12\x1c\n\timmediate\x18\x04 \x01(\x08R\timmediate\x12\x1b\n\tall_nodes\x18\x05 \x01(\x08R\x08\x61llNodes\x12*\n\tworkflows\x18\x06 \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\tworkflows:W\xbaHT\x1aR\n\rsignal.target\x12\x1cset either node or all_nodes\x1a#(this.node != \'\') != this.all_nodesB\x14\xea\x02\x11Glazed::Proto::V1b\x06proto3"
+descriptor_data = "\n\x1cglazed/v1/orchestrator.proto\x12\tglazed.v1\x1a\x1b\x62uf/validate/validate.proto\x1a\x15glazed/v1/state.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xb9\x03\n\x0cOrchestrator\x12;\n\x05state\x18\x01 \x01(\x0b\x32\x1d.glazed.v1.StateBackendConfigB\x06\xbaH\x03\xc8\x01\x01R\x05state\x12T\n\tworkflows\x18\x02 \x03(\x0b\x32&.glazed.v1.Orchestrator.WorkflowsEntryB\x0e\xbaH\x0b\x9a\x01\x08\x08\x01\"\x04r\x02\x10\x01R\tworkflows\x12\x37\n\x04poll\x18\x05 \x01(\x0b\x32\x19.google.protobuf.DurationB\x08\xbaH\x05\xaa\x01\x02\x32\x00R\x04poll\x12P\n\x11inventory_refresh\x18\x06 \x01(\x0b\x32\x19.google.protobuf.DurationB\x08\xbaH\x05\xaa\x01\x02\x32\x00R\x10inventoryRefresh\x1aV\n\x0eWorkflowsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12.\n\x05value\x18\x02 \x01(\x0b\x32\x18.glazed.v1.OrchestrationR\x05value:\x02\x38\x01J\x04\x08\x03\x10\x04J\x04\x08\x04\x10\x05R\x0cpoll_secondsR\x19inventory_refresh_seconds\"\xa0\x02\n\rOrchestration\x12/\n\x08schedule\x18\x01 \x01(\x0b\x32\x13.glazed.v1.ScheduleR\x08schedule\x12/\n\x08\x64\x65\x62ounce\x18\x02 \x01(\x0b\x32\x13.glazed.v1.DebounceR\x08\x64\x65\x62ounce\x12\x1d\n\nbatch_size\x18\x03 \x01(\rR\tbatchSize\x12\x39\n\x05lease\x18\x06 \x01(\x0b\x32\x19.google.protobuf.DurationB\x08\xbaH\x05\xaa\x01\x02\x32\x00R\x05lease\x12>\n\x0eschedule_rules\x18\x05 \x03(\x0b\x32\x17.glazed.v1.ScheduleRuleR\rscheduleRulesJ\x04\x08\x04\x10\x05R\rlease_seconds\"\x8d\x02\n\x0cScheduleRule\x12\x32\n\x05match\x18\x01 \x01(\x0b\x32\x14.glazed.v1.NodeMatchB\x06\xbaH\x03\xc8\x01\x01R\x05match\x12/\n\x08schedule\x18\x02 \x01(\x0b\x32\x13.glazed.v1.ScheduleR\x08schedule\x12/\n\x08\x64\x65\x62ounce\x18\x03 \x01(\x0b\x32\x13.glazed.v1.DebounceR\x08\x64\x65\x62ounce:g\xbaHd\x1a\x62\n\x16schedule_rule.settings\x12\x1eset schedule, debounce or both\x1a(has(this.schedule) || has(this.debounce)\"\x93\x02\n\tNodeMatch\x12\"\n\x05names\x18\x01 \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\x05names\x12$\n\x06groups\x18\x02 \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\x06groups\x12\x1f\n\x0bname_regexp\x18\x03 \x01(\tR\nnameRegexp:\x9a\x01\xbaH\x96\x01\x1a\x93\x01\n\x13node_match.criteria\x12\x31set at least one of names, groups and name_regexp\x1aIthis.names.size() > 0 || this.groups.size() > 0 || this.name_regexp != \'\'\"\xa0\x02\n\x08Schedule\x12?\n\x08interval\x18\x04 \x01(\x0b\x32\x19.google.protobuf.DurationB\x08\xbaH\x05\xaa\x01\x02\x32\x00R\x08interval\x12J\n\x0eretry_interval\x18\x05 \x01(\x0b\x32\x19.google.protobuf.DurationB\x08\xbaH\x05\xaa\x01\x02\x32\x00R\rretryInterval\x12;\n\x06jitter\x18\x06 \x01(\x0b\x32\x19.google.protobuf.DurationB\x08\xbaH\x05\xaa\x01\x02\x32\x00R\x06jitterJ\x04\x08\x01\x10\x02J\x04\x08\x02\x10\x03J\x04\x08\x03\x10\x04R\x10interval_secondsR\x16retry_interval_secondsR\x0ejitter_seconds\"\xb2\x01\n\x08\x44\x65\x62ounce\x12\x39\n\x05\x64\x65lay\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationB\x08\xbaH\x05\xaa\x01\x02\x32\x00R\x05\x64\x65lay\x12>\n\x08max_wait\x18\x04 \x01(\x0b\x32\x19.google.protobuf.DurationB\x08\xbaH\x05\xaa\x01\x02\x32\x00R\x07maxWaitJ\x04\x08\x01\x10\x02J\x04\x08\x02\x10\x03R\rdelay_secondsR\x10max_wait_seconds\"\xba\x02\n\x06Signal\x12\x12\n\x04node\x18\x01 \x01(\tR\x04node\x12\x1f\n\x06source\x18\x02 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x06source\x12;\n\x0breceived_at\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\nreceivedAt\x12\x1c\n\timmediate\x18\x04 \x01(\x08R\timmediate\x12\x1b\n\tall_nodes\x18\x05 \x01(\x08R\x08\x61llNodes\x12*\n\tworkflows\x18\x06 \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\tworkflows:W\xbaHT\x1aR\n\rsignal.target\x12\x1cset either node or all_nodes\x1a#(this.node != \'\') != this.all_nodesB\x14\xea\x02\x11Glazed::Proto::V1b\x06proto3"
 
 pool = ::Google::Protobuf::DescriptorPool.generated_pool
 pool.add_serialized_file(descriptor_data)
@@ -19,6 +20,8 @@ module Glazed
     module V1
       Orchestrator = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("glazed.v1.Orchestrator").msgclass
       Orchestration = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("glazed.v1.Orchestration").msgclass
+      ScheduleRule = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("glazed.v1.ScheduleRule").msgclass
+      NodeMatch = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("glazed.v1.NodeMatch").msgclass
       Schedule = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("glazed.v1.Schedule").msgclass
       Debounce = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("glazed.v1.Debounce").msgclass
       Signal = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("glazed.v1.Signal").msgclass

data/lib/glazed/v1/secret_pb.rb

@@ -6,9 +6,10 @@ require 'google/protobuf'
 
 require 'buf/validate/validate_pb'
 require 'google/protobuf/any_pb'
+require 'google/protobuf/duration_pb'
 
 
-descriptor_data = "\n\x16glazed/v1/secret.proto\x12\tglazed.v1\x1a\x1b\x62uf/validate/validate.proto\x1a\x19google/protobuf/any.proto\"\x9b\x02\n\tSecretRef\x12\x16\n\x05value\x18\x01 \x01(\tH\x00R\x05value\x12\x33\n\x03\x65nv\x18\x02 \x01(\tB\x1f\xbaH\x1cr\x1a\x32\x18^[A-Za-z_][A-Za-z0-9_]*$H\x00R\x03\x65nv\x12\x1d\n\x04\x66ile\x18\x03 \x01(\tB\x07\xbaH\x04r\x02\x10\x01H\x00R\x04\x66ile\x12.\n\x06plugin\x18\x04 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00R\x06plugin\x12+\n\x03ssm\x18\x05 \x01(\x0b\x32\x17.glazed.v1.SsmParameterH\x00R\x03ssm\x12\x34\n\x07\x63ommand\x18\x06 \x01(\x0b\x32\x18.glazed.v1.CommandSecretH\x00R\x07\x63ommandB\x0f\n\x06source\x12\x05\xbaH\x02\x08\x01\"h\n\x0cSsmParameter\x12\x1b\n\x04name\x18\x01 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x04name\x12\x16\n\x06region\x18\x02 \x01(\tR\x06region\x12#\n\rcache_seconds\x18\x03 \x01(\rR\x0c\x63\x61\x63heSeconds\"\x80\x01\n\rCommandSecret\x12\x10\n\x03run\x18\x01 \x01(\tR\x03run\x12\'\n\x0ftimeout_seconds\x18\x02 \x01(\rR\x0etimeoutSeconds\x12 \n\x04\x65xec\x18\x03 \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\x04\x65xec:\x12\xbaH\x0f\"\r\n\x03run\n\x04\x65xec\x10\x01\x42\x14\xea\x02\x11Glazed::Proto::V1b\x06proto3"
+descriptor_data = "\n\x16glazed/v1/secret.proto\x12\tglazed.v1\x1a\x1b\x62uf/validate/validate.proto\x1a\x19google/protobuf/any.proto\x1a\x1egoogle/protobuf/duration.proto\"\x9b\x02\n\tSecretRef\x12\x16\n\x05value\x18\x01 \x01(\tH\x00R\x05value\x12\x33\n\x03\x65nv\x18\x02 \x01(\tB\x1f\xbaH\x1cr\x1a\x32\x18^[A-Za-z_][A-Za-z0-9_]*$H\x00R\x03\x65nv\x12\x1d\n\x04\x66ile\x18\x03 \x01(\tB\x07\xbaH\x04r\x02\x10\x01H\x00R\x04\x66ile\x12.\n\x06plugin\x18\x04 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00R\x06plugin\x12+\n\x03ssm\x18\x05 \x01(\x0b\x32\x17.glazed.v1.SsmParameterH\x00R\x03ssm\x12\x34\n\x07\x63ommand\x18\x06 \x01(\x0b\x32\x18.glazed.v1.CommandSecretH\x00R\x07\x63ommandB\x0f\n\x06source\x12\x05\xbaH\x02\x08\x01\"\x93\x01\n\x0cSsmParameter\x12\x1b\n\x04name\x18\x01 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x04name\x12\x16\n\x06region\x18\x02 \x01(\tR\x06region\x12\x39\n\x05\x63\x61\x63he\x18\x04 \x01(\x0b\x32\x19.google.protobuf.DurationB\x08\xbaH\x05\xaa\x01\x02\x32\x00R\x05\x63\x61\x63heJ\x04\x08\x03\x10\x04R\rcache_seconds\"\xad\x01\n\rCommandSecret\x12\x10\n\x03run\x18\x01 \x01(\tR\x03run\x12=\n\x07timeout\x18\x04 \x01(\x0b\x32\x19.google.protobuf.DurationB\x08\xbaH\x05\xaa\x01\x02\x32\x00R\x07timeout\x12 \n\x04\x65xec\x18\x03 \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\x04\x65xec:\x12\xbaH\x0f\"\r\n\x03run\n\x04\x65xec\x10\x01J\x04\x08\x02\x10\x03R\x0ftimeout_secondsB\x14\xea\x02\x11Glazed::Proto::V1b\x06proto3"
 
 pool = ::Google::Protobuf::DescriptorPool.generated_pool
 pool.add_serialized_file(descriptor_data)

data/lib/glazed/v1/workflow_pb.rb

@@ -7,9 +7,10 @@ require 'google/protobuf'
 require 'buf/validate/validate_pb'
 require 'glazed/v1/redaction_pb'
 require 'google/protobuf/any_pb'
+require 'google/protobuf/duration_pb'
 
 
-descriptor_data = "\n\x18glazed/v1/workflow.proto\x12\tglazed.v1\x1a\x1b\x62uf/validate/validate.proto\x1a\x19glazed/v1/redaction.proto\x1a\x19google/protobuf/any.proto\"\x9d\x01\n\x08Workflow\x12/\n\x05steps\x18\x01 \x03(\x0b\x32\x0f.glazed.v1.StepB\x08\xbaH\x05\x92\x01\x02\x08\x01R\x05steps:`\xbaH]\x1a[\n\x1aworkflow.unique_step_names\x12\x19step names must be unique\x1a\"this.steps.map(s, s.name).unique()\"\xef\x02\n\x04Step\x12\x1b\n\x04name\x18\x01 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x04name\x12,\n\x05\x66\x65tch\x18\x02 \x01(\x0b\x32\x14.glazed.v1.FetchStepH\x00R\x05\x66\x65tch\x12/\n\x06redact\x18\x03 \x01(\x0b\x32\x15.glazed.v1.RedactStepH\x00R\x06redact\x12\x32\n\x07publish\x18\x04 \x01(\x0b\x32\x16.glazed.v1.PublishStepH\x00R\x07publish\x12\x32\n\x07\x63ommand\x18\x05 \x01(\x0b\x32\x16.glazed.v1.CommandStepH\x00R\x07\x63ommand\x12\x42\n\rbatch_command\x18\x06 \x01(\x0b\x32\x1b.glazed.v1.BatchCommandStepH\x00R\x0c\x62\x61tchCommand\x12.\n\x06plugin\x18\x07 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00R\x06pluginB\x0f\n\x06\x61\x63tion\x12\x05\xbaH\x02\x08\x01\"x\n\tFetchStep\x12\x1f\n\x06output\x18\x01 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x06output\x12!\n\x07storage\x18\x02 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x07storage\x12\'\n\x0ftimeout_seconds\x18\x03 \x01(\rR\x0etimeoutSeconds\"\xa3\x01\n\nRedactStep\x12\x1d\n\x05input\x18\x01 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x05input\x12\x1f\n\x06output\x18\x02 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x06output\x12!\n\x07storage\x18\x03 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x07storage\x12\x32\n\tredaction\x18\x04 \x01(\x0b\x32\x14.glazed.v1.RedactionR\tredaction\"g\n\x0bPublishStep\x12\x1d\n\x05input\x18\x01 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x05input\x12!\n\x07storage\x18\x02 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x07storage\x12\x16\n\x06output\x18\x03 \x01(\tR\x06output\"\xb2\x02\n\x0b\x43ommandStep\x12\x10\n\x03run\x18\x01 \x01(\tR\x03run\x12\x14\n\x05input\x18\x02 \x01(\tR\x05input\x12\x16\n\x06output\x18\x03 \x01(\tR\x06output\x12\x18\n\x07storage\x18\x04 \x01(\tR\x07storage\x12\'\n\x0ftimeout_seconds\x18\x05 \x01(\rR\x0etimeoutSeconds\x12 \n\x04\x65xec\x18\x06 \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\x04\x65xec:~\xbaH{\x1aj\n\x1b\x63ommand_step.output_storage\x12\x1eoutput and storage go together\x1a+(this.output == \'\') == (this.storage == \'\')\"\r\n\x03run\n\x04\x65xec\x10\x01\"\x83\x01\n\x10\x42\x61tchCommandStep\x12\x10\n\x03run\x18\x01 \x01(\tR\x03run\x12\'\n\x0ftimeout_seconds\x18\x02 \x01(\rR\x0etimeoutSeconds\x12 \n\x04\x65xec\x18\x03 \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\x04\x65xec:\x12\xbaH\x0f\"\r\n\x03run\n\x04\x65xec\x10\x01\x42\x14\xea\x02\x11Glazed::Proto::V1b\x06proto3"
+descriptor_data = "\n\x18glazed/v1/workflow.proto\x12\tglazed.v1\x1a\x1b\x62uf/validate/validate.proto\x1a\x19glazed/v1/redaction.proto\x1a\x19google/protobuf/any.proto\x1a\x1egoogle/protobuf/duration.proto\"\x9d\x01\n\x08Workflow\x12/\n\x05steps\x18\x01 \x03(\x0b\x32\x0f.glazed.v1.StepB\x08\xbaH\x05\x92\x01\x02\x08\x01R\x05steps:`\xbaH]\x1a[\n\x1aworkflow.unique_step_names\x12\x19step names must be unique\x1a\"this.steps.map(s, s.name).unique()\"\xef\x02\n\x04Step\x12\x1b\n\x04name\x18\x01 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x04name\x12,\n\x05\x66\x65tch\x18\x02 \x01(\x0b\x32\x14.glazed.v1.FetchStepH\x00R\x05\x66\x65tch\x12/\n\x06redact\x18\x03 \x01(\x0b\x32\x15.glazed.v1.RedactStepH\x00R\x06redact\x12\x32\n\x07publish\x18\x04 \x01(\x0b\x32\x16.glazed.v1.PublishStepH\x00R\x07publish\x12\x32\n\x07\x63ommand\x18\x05 \x01(\x0b\x32\x16.glazed.v1.CommandStepH\x00R\x07\x63ommand\x12\x42\n\rbatch_command\x18\x06 \x01(\x0b\x32\x1b.glazed.v1.BatchCommandStepH\x00R\x0c\x62\x61tchCommand\x12.\n\x06plugin\x18\x07 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00R\x06pluginB\x0f\n\x06\x61\x63tion\x12\x05\xbaH\x02\x08\x01\"\xa5\x01\n\tFetchStep\x12\x1f\n\x06output\x18\x01 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x06output\x12!\n\x07storage\x18\x02 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x07storage\x12=\n\x07timeout\x18\x04 \x01(\x0b\x32\x19.google.protobuf.DurationB\x08\xbaH\x05\xaa\x01\x02\x32\x00R\x07timeoutJ\x04\x08\x03\x10\x04R\x0ftimeout_seconds\"\xa3\x01\n\nRedactStep\x12\x1d\n\x05input\x18\x01 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x05input\x12\x1f\n\x06output\x18\x02 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x06output\x12!\n\x07storage\x18\x03 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x07storage\x12\x32\n\tredaction\x18\x04 \x01(\x0b\x32\x14.glazed.v1.RedactionR\tredaction\"g\n\x0bPublishStep\x12\x1d\n\x05input\x18\x01 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x05input\x12!\n\x07storage\x18\x02 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x07storage\x12\x16\n\x06output\x18\x03 \x01(\tR\x06output\"\xdf\x02\n\x0b\x43ommandStep\x12\x10\n\x03run\x18\x01 \x01(\tR\x03run\x12\x14\n\x05input\x18\x02 \x01(\tR\x05input\x12\x16\n\x06output\x18\x03 \x01(\tR\x06output\x12\x18\n\x07storage\x18\x04 \x01(\tR\x07storage\x12=\n\x07timeout\x18\x07 \x01(\x0b\x32\x19.google.protobuf.DurationB\x08\xbaH\x05\xaa\x01\x02\x32\x00R\x07timeout\x12 \n\x04\x65xec\x18\x06 \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\x04\x65xec:~\xbaH{\x1aj\n\x1b\x63ommand_step.output_storage\x12\x1eoutput and storage go together\x1a+(this.output == \'\') == (this.storage == \'\')\"\r\n\x03run\n\x04\x65xec\x10\x01J\x04\x08\x05\x10\x06R\x0ftimeout_seconds\"\xb0\x01\n\x10\x42\x61tchCommandStep\x12\x10\n\x03run\x18\x01 \x01(\tR\x03run\x12=\n\x07timeout\x18\x04 \x01(\x0b\x32\x19.google.protobuf.DurationB\x08\xbaH\x05\xaa\x01\x02\x32\x00R\x07timeout\x12 \n\x04\x65xec\x18\x03 \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\x04\x65xec:\x12\xbaH\x0f\"\r\n\x03run\n\x04\x65xec\x10\x01J\x04\x08\x02\x10\x03R\x0ftimeout_secondsB\x14\xea\x02\x11Glazed::Proto::V1b\x06proto3"
 
 pool = ::Google::Protobuf::DescriptorPool.generated_pool
 pool.add_serialized_file(descriptor_data)

data/lib/glazed/version.rb

@@ -5,5 +5,5 @@
 
 module Glazed
   # Gem version.
-  VERSION = '0.3.0' #: String
+  VERSION = '0.4.0' #: String
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glazed
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Sorah Fukumori
@@ -173,6 +173,7 @@ files:
 - lib/glazed/dialects/junos.rb
 - lib/glazed/dialects/nec_ix.rb
 - lib/glazed/dialects/routeros.rb
+- lib/glazed/durations.rb
 - lib/glazed/finder.rb
 - lib/glazed/must.rb
 - lib/glazed/node_session.rb