canzea 0.1.123 → 0.1.124

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ad2a2463592942ab8c6dd33adfc62b6aa3479ca
-  data.tar.gz: 40708c34f547b1f2f6781865f9f0963f33dcfc7d
+  metadata.gz: 791e4b6da51ce87c852ae8fc80b3f9c0fece25e6
+  data.tar.gz: 3b441945f2f8fb950b67c1a025cdc8f8e9379ac8
 SHA512:
-  metadata.gz: 06616c429e2c789109412bb6988320c2a83f4857be5e90d45d60dab12c2b3b19b5bfb949c9ff08af6a7394185752ddf801dbfe4d27924d1fc4f8475a69a38170
-  data.tar.gz: 8aab8ad6a276794bc43c0864357beb69e2565f99cf4cd5f156ad94c592df627ea4d55e80bbb0009438e6032218bc7e3959c76b776da12d44eb57d4fc67eae626
+  metadata.gz: 7e8d2b677c3e75b8e665b35f563a27e5eefb873f0337403ef5cb88163725914bfa426ed85a98eb5ef58f8528d2abebfd8bdd278a499cb908458f0248f30e75ce
+  data.tar.gz: ea0c84d56601978158f8aa92c336fa25fd9c1e8d783bd2be999c665272a6cc001c14fdc06d18587d3f6de6686380591b278c9b766aa722f0069314d69c1cbf62

data/lib/canzea.rb

@@ -147,7 +147,11 @@ module Canzea
             end
             if (util == "prepare-plan")
                 ac = PreparePlan.new
-                ac.do opts[:blueprint], opts[:segment], opts[:step], test, opts[:privateKey], opts[:serverBase], opts[:serverNumber]
+                ac.do opts[:blueprint], opts[:segment], opts[:step], opts[:task], test, opts[:privateKey], opts[:serverBase], opts[:serverNumber]
+            end
+            if (util == "prepare-patch")
+                ac = PreparePlan.new
+                ac.doPatch opts.fetch(:args, '{}'), test, opts[:privateKey], opts[:serverBase], opts[:serverNumber]
             end
             if (util == "apply-config")
                 gitRoot = opts.fetch(:gitRoot, Canzea::config[:git_repo])

data/lib/canzea/version.rb

@@ -1,3 +1,3 @@
 module Canzea
-  VERSION = "0.1.123"
+  VERSION = "0.1.124"
 end

data/lib/commands/prepare-plan.rb

@@ -1,8 +1,10 @@
 require 'json'
+require 'base64'
 require 'commands/add-env'
 require 'plan-step-class'
 require 'yaml'
 require 'canzea/config'
+require 'commands/remote-run'
 
 class PreparePlan
     def initialize ()
@@ -10,8 +12,21 @@ class PreparePlan
         @basePath = "#{Pathname.new(Canzea::config[:catalog_location]).realpath}"
     end
 
+    def doPatch (params, test, privateKey, serverBase, serverNumber)
+
+        publicIp = File.read("#{Canzea::config[:pwd]}/vps-#{serverBase}-#{serverNumber}.json")
+        publicIp.strip!
+
+        patches = Base64.decode64(params['patches'])
+        params['patches'] = JSON.parse(patches)
+
+        params['patches'].each do | patch |
+            RemoteRun.new.doCommand publicIp, privateKey, patch.command
+        end
+    end
+
     # Read the blueprint instructions and prepare plan for a particular segment
-    def do (blueprint, segment, step, test, privateKey, serverBase, serverNumber)
+    def do (blueprint, segment, step, task, test, privateKey, serverBase, serverNumber)
         planStep = PlanStep.new
 
         log "Processing configure.json for #{segment} in #{blueprint} from #{@basePath}"
@@ -30,10 +45,17 @@ class PreparePlan
                     log "[#{index.to_s.rjust(2, "0")}] #{item} SKIPPING"
                 else
                     log "[#{index.to_s.rjust(2, "0")}] #{item}"
+                    publicIp = File.read("#{Canzea::config[:pwd]}/vps-#{serverBase}-#{serverNumber}.json")
+                    publicIp.strip!
                     if (test == false)
-                        publicIp = File.read("#{Canzea::config[:pwd]}/vps-#{serverBase}-#{serverNumber}.json")
-                        RemoteRun.new.do publicIp, privateKey, parts[1], parts[2], index.to_s.rjust(2, "0")
+                        if (task == nil)
+                            RemoteRun.new.do publicIp, privateKey, parts[1], parts[2], index.to_s.rjust(2, "0")
+                        else
+                            RemoteRun.new.doTask publicIp, privateKey, parts[1], parts[2], task, index.to_s.rjust(2, "0")
+                        end
                         # Keep track of what we have done; parsing the response and looking at the JSON
+                    else
+                        RemoteRun.new.test publicIp, privateKey, parts[1], parts[2], index.to_s.rjust(2, "0")
                     end
                 end
                 index = index + 1

data/lib/commands/remote-run.rb

@@ -4,8 +4,23 @@ require "pathname"
 require "ssh-base-cmd-class"
 
 class RemoteRun
+    def doTask(publicIp, privateKey, role, solution, task, ref="")
+      remote = RemoteCall.new
+      remote.exec publicIp, privateKey, "canzea --lifecycle=install --role=#{role} --task=#{task} --solution=#{solution}", ref
+    end
+
     def do(publicIp, privateKey, role, solution, ref="")
       remote = RemoteCall.new
       remote.exec publicIp, privateKey, "canzea --lifecycle=install --role=#{role} --solution=#{solution}", ref
     end
+
+    def doCommand(publicIp, privateKey, command, ref="")
+      remote = RemoteCall.new
+      remote.exec publicIp, privateKey, command, ref
+    end
+
+    def test(publicIp, privateKey, role, solution, ref="")
+      remote = RemoteCall.new
+      remote.exec publicIp, privateKey, "canzea --lifecycle=install --role=#{role} --solution=#{solution} --test", ref
+    end
 end

data/lib/ssh-base-cmd-class.rb

@@ -26,6 +26,7 @@ class RemoteCall
                     channel.env("VAULT_TOKEN", ENV['VAULT_TOKEN'])
                     channel.env("CONSUL_URL", ENV['CONSUL_URL'])
                     channel.env("WORK_DIR", ENV['WORK_DIR'])
+                    channel.env("ES_REF", ref)
                     channel.exec(cmd) do |ch, success|
                         abort "could not execute command" unless success
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canzea
 version: !ruby/object:Gem::Version
-  version: 0.1.123
+  version: 0.1.124
 platform: ruby
 authors:
 - Canzea Technologies
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-03 00:00:00.000000000 Z
+date: 2017-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler