nomadsl 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b922b8afddb2292de6a32df69d1af95540765381ccc0d7b34eac16f7818140b8
-  data.tar.gz: 07e3c17ba4d39e4916dbe2961696b1e917334c31c7220cbd1ba2f51412c77cb0
+  metadata.gz: 516890be1a6a0126435bc38bb940ddd4b42ed7bfdc449603eefc79c2836d76de
+  data.tar.gz: 52df9fdd5da1dc4e3fde08f53648501d4df8ea56142ae01b9ebaa63b345fa476
 SHA512:
-  metadata.gz: e6e33accbe57b2883a116ed41dfdc2da4ebbde028de5900eef0a1caed747d1af1225e6f660f3073f3a6d297ea31b5e65f7ec8d0c8b2a255491f31b24aff54637
-  data.tar.gz: 30a0abf272cbfeeeab3bc15bf71044d296df718fa8e86de7f6a3f5255e6e60efe3add2e276b3c246c24d09028c011190b2811b4f83b5fe488829845923a02a55
+  metadata.gz: 9c84f1b38735ba993d61c58764c6d46c3c5a9b09fa04dcf448c5e773a7400e9de025203f028d2ef4ab280c35f126bc72e74de35f2fc87363ed9730331b5201b2
+  data.tar.gz: 94ce12136ed7aa33ee243b42ca4afb7bcece3a5a96c28b0b550454249df5ced9cb642337a8e9d37b5713d076f4da7b49c2c4474b73e600770e2dbcbbc7542024

data/README.md

@@ -6,7 +6,9 @@ Methods mapping to keys and attributes described in the Nomad Job Specification
 (https://www.nomadproject.io/docs/job-specification/index.html) are defined in
 an includable module.
 
-The mapping of key and attribute names to method names is generally one-to-one.
+Nomadsl supports Nomad configuration syntax through version 0.9.0. The mapping
+of key and attribute names to method names is generally one-to-one, but you can
+specify arbitrary configuration values to be rendered if necessary.
 
 ## Example: DSL direct to stdout
 
@@ -122,7 +124,6 @@ By requiring only `nomadsl`, you can inject these methods into another class:
 
 ## Roadmap
 
-* Make all attributes explicitly callable
 * Make subkeys embeddable in arglists if sensible
 * Allow injecting comments into the rendered file
 * Finish custom config blocks for each task driver

data/lib/nomadsl.rb

@@ -69,6 +69,21 @@ module Nomadsl
     @out << "#{v.chomp}\nBLOB\n"
   end
 
+  def strmap!(k, v)
+    die "Value for '#{k}' is nil" if v.nil?
+    strmap(k, v)
+  end
+
+  def strmap(k, v)
+    if v
+      block(k) do
+        v.each do |k2,v2|
+          str k2, v2
+        end
+      end
+    end
+  end
+
   # try really hard
   def any(k, v)
     if v.nil?
@@ -137,13 +152,18 @@ module Nomadsl
       str! :source, source
       str :destination, destination
       str :mode, mode
-      if options
-        block(:options) do
-          options.each do |k,v|
-            str k, v
-          end
-        end
-      end
+      strmap :options, options
+    end
+  end
+
+  # https://www.nomadproject.io/docs/job-specification/affinity.html
+  def affinity(attribute: nil, operator: nil, value: nil, weight: nil)
+    only :job, :group, :task, :device
+    block(:affinity) do
+      str! :attribute, attribute
+      str :operator, operator
+      str! :value, value
+      int :weight, weight
     end
   end
 
@@ -207,7 +227,7 @@ module Nomadsl
 
   # https://www.nomadproject.io/docs/job-specification/constraint.html
   def constraint(attribute: nil, operator: nil, value: nil)
-    only :job, :group, :task
+    only :job, :group, :task, :device
     block(:constraint) do
       str :attribute, attribute
       str :operator, operator
@@ -221,6 +241,15 @@ module Nomadsl
     list! :datacenters, d
   end
 
+  # https://www.nomadproject.io/docs/job-specification/device.html
+  def device(name: nil, count: nil)
+    only :resources
+    block(:device, name) do
+      int :count, count
+      yield if block_given?
+    end
+  end
+
   # https://www.nomadproject.io/docs/job-specification/dispatch_payload.html
   def dispatch_payload(file:)
     only :task
@@ -232,11 +261,7 @@ module Nomadsl
   # https://www.nomadproject.io/docs/job-specification/env.html
   def env(**opts)
     only :task
-    block(:env) do
-      opts.each do |k,v|
-        str k, v
-      end
-    end
+    strmap :env, opts
   end
 
   # https://www.nomadproject.io/docs/job-specification/ephemeral_disk.html
@@ -294,11 +319,7 @@ module Nomadsl
   # https://www.nomadproject.io/docs/job-specification/meta.html
   def meta(**opts)
     only :job, :group, :task
-    block(:meta) do
-      opts.each do |k,v|
-        str k, v
-      end
-    end
+    strmap :meta, opts
   end
 
   # https://www.nomadproject.io/docs/job-specification/migrate.html
@@ -421,6 +442,25 @@ module Nomadsl
     end
   end
 
+  # https://www.nomadproject.io/docs/job-specification/spread.html
+  def spread(attribute: nil, weight: nil)
+    only :job, :group, :task
+    block(:spread) do
+      str! :attribute, attribute
+      int :weight, weight
+      yield if block_given?
+    end
+  end
+
+  # https://www.nomadproject.io/docs/job-specification/spread.html#target-parameters
+  def target(name: nil, value: nil, percent: nil)
+    only :spread
+    block(:target, name) do
+      str :value, value
+      str :weight, weight
+    end
+  end
+
   # https://www.nomadproject.io/docs/job-specification/task.html
   def task(t, driver: "exec", kill_signal: nil, kill_timeout: nil, leader: nil, shutdown_delay: nil, user: nil)
     only :group
@@ -502,47 +542,41 @@ module Nomadsl
     end
   end
 
-  def preloaded_vault_aws_creds(name, path)
-    data = <<~DATA
+  def _vault_aws_creds(path, export)
+    prefix = export ? "export " : ""
+    <<~DATA
       {{with secret "#{path}"}}
-      AWS_ACCESS_KEY_ID={{.Data.access_key}}
-      AWS_SECRET_ACCESS_KEY={{.Data.secret_key}}
+      #{prefix}AWS_ACCESS_KEY_ID={{.Data.access_key}}
+      #{prefix}AWS_SECRET_ACCESS_KEY={{.Data.secret_key}}
       {{if .Data.security_token}}
-      AWS_SESSION_TOKEN={{.Data.security_token}}
+      #{prefix}AWS_SESSION_TOKEN={{.Data.security_token}}
       {{end}}
       {{end}}
     DATA
-    template(data: data, destination: "secrets/#{name}.env", env: true)
+  end
+
+  def preloaded_vault_aws_creds(name, path)
+    template(data: _vault_aws_creds(path, false), destination: "secrets/#{name}.env", env: true)
   end
 
   def vault_aws_creds(name, path)
-    data = <<~DATA
+    template(data: _vault_aws_creds(path, true), destination: "secrets/#{name}.env")
+  end
+
+  def _vault_consul_creds(path, export)
+    prefix = export ? "export " : ""
+    <<~DATA
       {{with secret "#{path}"}}
-      export AWS_ACCESS_KEY_ID={{.Data.access_key}}
-      export AWS_SECRET_ACCESS_KEY={{.Data.secret_key}}
-      {{if .Data.security_token}}
-      export AWS_SESSION_TOKEN={{.Data.security_token}}
-      {{end}}
+      #{prefix}CONSUL_HTTP_TOKEN={{.Data.token}}
       {{end}}
     DATA
-    template(data: data, destination: "secrets/#{name}.env")
   end
 
   def preloaded_vault_consul_creds(name, path)
-    data = <<DATA
-{{with secret "#{path}"}}
-CONSUL_HTTP_TOKEN={{.Data.token}}
-{{end}}
-DATA
-    template(data: data, destination: "secrets/#{name}.env", env: true)
+    template(data: _vault_consul_creds(path, false), destination: "secrets/#{name}.env", env: true)
   end
 
   def vault_consul_creds(name, path)
-    data = <<DATA
-{{with secret "#{path}"}}
-export CONSUL_HTTP_TOKEN={{.Data.token}}
-{{end}}
-DATA
-    template(data: data, destination: "secrets/#{name}.env")
+    template(data: _vault_consul_creds(path, true), destination: "secrets/#{name}.env")
   end
 end

data/lib/nomadsl/version.rb

@@ -1,3 +1,3 @@
 module Nomadsl
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nomadsl
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - David Adams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-09 00:00:00.000000000 Z
+date: 2019-04-22 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: daveadams@gmail.com
@@ -43,8 +43,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby DSL for generating Nomad job specification files