seijaku 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 638106c6524b04b68139b67af16ff6b1f66d74fa82b05d15be1b2c26f42e5684
-  data.tar.gz: 40b3f7a10c0575df85225a04ebc040c5d6d09521ebc789148a6f888319e9ec31
+  metadata.gz: 0b351498f055e85f7e20edc44374616118d0162b479104d18f20b271138a9271
+  data.tar.gz: '08c117438ac1e83a15fef55c6973e27fd15ef1d2fbc03a7027774deee4904720'
 SHA512:
-  metadata.gz: 4387d2f340c6d3552f6ad91529ae5600e94ce1fd02e49556fef4e8bd1a125b4a078d5fcaca099a5ca766116db8481e08e1889214b92d8422bac1f14ed01ba646
-  data.tar.gz: 2bd4543e36d3ae4abbeaf8317995c2a689be7fd1ae0409f1b3ed34842ac58779802577399116608242979153d92f271df7db663aa999baa694ae1fbc3dd56c42
+  metadata.gz: 23d86d8bad1a17e32a8b52faebe48873369c7eabf8988fbeec15e854d2e4b834aa8d29dab583dbfb121f18de545289bb1f4ab7484cd7bea787c0aba04cfcd33d
+  data.tar.gz: '0532610288a45a4e8391f71da9caa73d2ac22f2a02af7a99af4629fdaa9b3efe60a2fdcf7696337030822e2a24d8d1f832855b447f88292e9d92e4774f843134'

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-## [Unreleased]
+## Seijaku
+
+Please mind Seijaku is still under heavy development.
+
+## [0.3.0] - 2023-12-14
+
+- scheduler has been added to run reccurent payloads
+- fixed a bug related to SSHExecutor set as default executor
 
 ## [0.2.0] - 2023-12-12
 

data/bin/seijaku

@@ -41,7 +41,8 @@ module App
 
   if options[:payload]
     payload_file = YAML.safe_load(
-      File.read(options[:payload])
+      File.read(options[:payload]),
+      symbolize_names: true
     )
 
     logger.info "Starting Seijaku. Payload: #{payload_file["name"]}"

data/lib/seijaku/executors/ssh.rb

@@ -6,12 +6,19 @@ require "net/ssh/proxy/jump"
 module Seijaku
   # SSHExecutor connects to SSH host and runs command
   class SSHExecutor
-    def initialize(raw, variables, task, ssh_hosts)
-      @command = ["sh", "-c", "'#{raw}'"]
+    def initialize(raw, variables, task, ssh_hosts, ssh_settings)
       @hosts = ssh_hosts
-      @variables = variables
+      @variables = variables.map do |key, value|
+        "#{key}='#{value}'"
+      end.join(" ")
+
+      @command = ["#{@variables};", "#{raw}"]
       @task = task
       @ssh_hosts = ssh_hosts
+      @ssh_settings = ssh_settings.transform_keys(&:to_sym)
+      if @ssh_settings[:verify_host_key].eql?("never")
+        @ssh_settings[:verify_host_key] = :never
+      end
 
       raise SSHExecutorError, "no ssh host defined in payload", [] if ssh_hosts.nil?
     end
@@ -20,12 +27,15 @@ module Seijaku
       machine = @ssh_hosts.hosts[@task.host]
       result = { command: @command.join(" "), stdout: nil, stderr: nil }
       status = {}
-      options = machine.bastion ? { proxy: bastion_setup } : {}
-      ssh = Net::SSH.start(machine.host, machine.user, port: machine.port, **options)
+      options = machine.bastion ? { proxy: bastion_setup, **@ssh_settings } : @ssh_settings
+
+      ssh = Net::SSH.start(machine.host, machine.user, {port: machine.port, **@ssh_settings})
+
       ssh.exec!(@command.join(" "), status: status) do |_ch, stream, data|
         result[:stdout] = data.chomp if stream == :stdout
         result[:stderr] = data.chomp unless stream == :stdout
       end
+
       ssh.close
 
       result[:exit_status] = status[:exit_code]

data/lib/seijaku/payload.rb

@@ -7,11 +7,12 @@ module Seijaku
     attr_reader :name
 
     def initialize(payload, logger)
-      @name = payload.fetch("name")
-      @variables = get_variables(payload.fetch("variables"))
-      @ssh_hosts = SSHGroup.new(payload.fetch("ssh", []))
-      @tasks = payload.fetch("tasks").map do |task|
-        Task.new(task, @variables, logger, @ssh_hosts)
+      @name = payload.fetch(:name)
+      @variables = get_variables(payload.fetch(:variables))
+      @ssh_hosts = SSHGroup.new(payload.fetch(:ssh, []))
+      @ssh_settings = payload.fetch(:ssh_settings, {})
+      @tasks = payload.fetch(:tasks).map do |task|
+        Task.new(task, @variables, logger, @ssh_hosts, @ssh_settings)
       end
     end
 

data/lib/seijaku/ssh/group.rb

@@ -8,7 +8,7 @@ module Seijaku
     def initialize(ssh_group)
       @hosts = {}
       ssh_group.each do |host|
-        @hosts[host["host"]] = Host.new(host)
+        @hosts[host[:host]] = Host.new(host)
       end
     end
   end

data/lib/seijaku/ssh/host.rb

@@ -6,10 +6,10 @@ module Seijaku
     attr_reader :host, :port, :user, :bastion
 
     def initialize(host)
-      @host = host.fetch("host", "localhost")
-      @port = host.fetch("port", 22)
-      @bastion = host.fetch("bastion", nil)
-      @user = host.fetch("user", "root")
+      @host = host.fetch(:host, "localhost")
+      @port = host.fetch(:port, 22)
+      @bastion = host.fetch(:bastion, nil)
+      @user = host.fetch(:user, "root")
     end
   end
 end

data/lib/seijaku/step.rb

@@ -6,17 +6,18 @@ module Seijaku
   class Step
     attr_reader :command, :pipeline
 
-    def initialize(step, variables, pipeline, logger, task, ssh_hosts = nil)
-      @sh = step.fetch("sh", nil)
-      @bash = step.fetch("bash", nil)
-      @ssh = step.fetch("ssh", nil)
-      @soft_fail = step.fetch("soft_fail", false)
-      @output = step.fetch("output", false)
+    def initialize(step, variables, pipeline, logger, task, ssh_hosts = nil, ssh_settings = {})
+      @sh = step.fetch(:sh, nil)
+      @bash = step.fetch(:bash, nil)
+      @ssh = step.fetch(:ssh, nil)
+      @soft_fail = step.fetch(:soft_fail, false)
+      @output = step.fetch(:output, false)
       @variables = variables
       @pipeline = pipeline
       @logger = logger
       @task = task
       @ssh_hosts = ssh_hosts
+      @ssh_settings = ssh_settings
 
       @command = (@sh || @bash) || @ssh
     end
@@ -24,7 +25,7 @@ module Seijaku
     def execute!
       result = SHExecutor.new(@sh, @variables).run! if @sh
       result = BashExecutor.new(@bash, @variables).run! if @bash
-      result = SSHExecutor.new(@ssh, @variables, @task, @ssh_hosts).run! if @ssh
+      result = SSHExecutor.new(@ssh, @variables, @task, @ssh_hosts, @ssh_settings).run!
 
       if result[:exit_status] != 0
         logger_output(result)

data/lib/seijaku/task.rb

@@ -5,12 +5,12 @@ module Seijaku
   class Task
     attr_reader :host
 
-    def initialize(task, variables, logger, ssh_hosts = nil)
-      @name = task.fetch("name", nil)
-      @host = task.fetch("host", nil)
-      @steps = task.fetch("steps", []).map { |step| Step.new(step, variables, :steps, logger, self, ssh_hosts) }
-      @pre_steps = task.fetch("pre", []).map { |step| Step.new(step, variables, :pre, logger, self, ssh_hosts) }
-      @post_steps = task.fetch("post", []).map { |step| Step.new(step, variables, :post, logger, self, ssh_hosts) }
+    def initialize(task, variables, logger, ssh_hosts = nil, ssh_settings = {})
+      @name = task.fetch(:name, nil)
+      @host = task.fetch(:host, nil)
+      @steps = task.fetch(:steps, []).map { |step| Step.new(step, variables, :steps, logger, self, ssh_hosts, ssh_settings) }
+      @pre_steps = task.fetch(:pre, []).map { |step| Step.new(step, variables, :pre, logger, self, ssh_hosts, ssh_settings) }
+      @post_steps = task.fetch(:post, []).map { |step| Step.new(step, variables, :post, logger, self, ssh_hosts, ssh_settings) }
       @logger = logger
 
       raise TaskError, "no name set in task", [] if @name.nil?

data/lib/seijaku/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Seijaku
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/sig/seijaku.rbs

@@ -1,4 +1,15 @@
 module Seijaku
   VERSION: String
   # See the writing guide of rbs: https://github.com/ruby/rbs#guides
+  class Error < StandardError
+  end
+
+  class TaskError < Error
+  end
+
+  class VariableError < Error
+  end
+
+  class SSHExecutorError < Error
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seijaku
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Kohlrabbit
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-14 00:00:00.000000000 Z
+date: 2024-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf