canzea 0.1.102 → 0.1.103

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29bd9855f7a6dd9f23c198cb2a732cebdaca4264
-  data.tar.gz: b33e2f88988f3602cd3f32e64c58ed1da7fcd347
+  metadata.gz: 7e1e541ffcff2313bd7d542dd540dbf9dfff77cf
+  data.tar.gz: 2a60ef59b7ae314e5121bd8a020f6f1c58336836
 SHA512:
-  metadata.gz: b9044128b42bba0e7f1478e0eae5776408f31fdc98508fde3503c174c22b96245b29dab6b60f33f924f9bbe7cf0539d53b4551d1000c464394788ab6d9bbc9ff
-  data.tar.gz: 953a4db906d3fb1fa7ff1587799d8c4d0c4d229c0aed27c647143f0c79ebbf3c9880e94b3c84ba2736b9411126aaa459b57bcab97f1a6c76f1633c003604c3cc
+  metadata.gz: f01d385671a4945f05f3b56cda1124cc66dbfdde887b22074746fe2cb62eef4cf770bd30b8c9cf2a0d7ea1720a1e3f9a85721b888e94de51b2a77046306bf2b3
+  data.tar.gz: bd824390f64e8dd4870cb4aed4ddd2c1d6454e263646ada8adb49f9bb9cfd4eaf40a61329f24320ebaba134555c8df601f9b135d12dfa6f8267a4a35f607c713

data/lib/audit.rb

@@ -5,6 +5,10 @@ require 'logger'
 
 
 class Audit
+    def initialize (_raw)
+        @raw = _raw;
+    end
+
     def start (id, cmd)
         self.log( id, cmd, "start", "", 0, "")
     end
@@ -24,7 +28,7 @@ class Audit
                 "result" => result
             }
         }
-        puts data.to_json
+        pputs data.to_json
         File.open(Canzea::config[:logging_root] + '/audit.log', 'a') { |file| file.puts(data.to_json) }
     end
 
@@ -59,7 +63,15 @@ class Audit
         data['message'][:context] = context
         summary['message'][:context] = context
 
-        puts summary.to_json
+        pputs summary.to_json
+
         File.open(Canzea::config[:logging_root] + '/audit.log', 'a') { |file| file.puts(data.to_json) }
     end
+
+    def pputs (s)
+        if (@raw == false)
+            puts "#{s}"
+        end
+    end
+
 end

data/lib/canzea/version.rb

@@ -1,3 +1,3 @@
 module Canzea
-  VERSION = "0.1.102"
+  VERSION = "0.1.103"
 end

data/lib/canzea.rb

@@ -48,6 +48,7 @@ module Canzea
       flag nil, :put, 'Put a file onto the remote server'
       flag nil, :encrypt, 'Encrypt'
       flag nil, :decrypt, 'Encrypt'
+      flag nil, :raw, 'Result will be sent back in stdout'
       flag nil, :init, 'Remote init execution'
 #      flag nil, :enable, 'Enable the service'
       flag nil, :test, 'Run as a test'
@@ -111,7 +112,7 @@ module Canzea
         GetCatalog.new.state
 
         if (opts[:util])
-            AddEnv.new.injectEnvironmentVariables()
+            AddEnv.new(opts.fetch(:raw, false)).injectEnvironmentVariables
 
             util = opts[:util]
             if (util == "add-env")
@@ -172,7 +173,7 @@ module Canzea
 
             lifecycle = opts[:lifecycle]
 
-            AddEnv.new.injectEnvironmentVariables()
+            AddEnv.new(opts.fetch(:raw, false)).injectEnvironmentVariables
 
             if lifecycle == 'install'
               puts "-- Running install step #{opts[:role]} #{opts[:solution]}"
@@ -196,8 +197,8 @@ module Canzea
             end
 
             if lifecycle == 'wire'
-              puts "-- Running helper #{opts[:solution]} #{opts[:action]}"
-              ps = HelperRun.new
+              # puts "-- Running helper #{opts[:solution]} #{opts[:action]}"
+              ps = HelperRun.new opts.fetch(:raw, false)
               ps.run opts[:solution], opts[:action], opts.fetch(:args, '{}'), opts.fetch(:status,nil)
             end
         end

data/lib/commands/add-env.rb

@@ -3,8 +3,9 @@ require 'logger'
 require 'plan-step-class'
 
 class AddEnv
-    def initialize ()
+    def initialize (_raw = false)
         @log = Logger.new(Canzea::config[:logging_root] + '/plans.log')
+        @raw = _raw
     end
 
     def add (key, value)
@@ -36,21 +37,28 @@ class AddEnv
         extraConfig = Canzea::config[:config_location] + "/env.json"
         @log.info "Looking at for env vars: #{extraConfig}"
         if File.exists?(extraConfig)
-            puts "-- Reading #{extraConfig}"
+            pputs "-- Reading #{extraConfig}"
             file = File.read(extraConfig)
             envs = JSON.parse(file)
             envs['vars'].keys.each { | key |
                 val = envs['vars'][key]
-                puts "--    #{key} == #{val}"
+                pputs "--    #{key} == #{val}"
                 @log.info "Setting: #{key} == #{val}"
                 ENV.store(key, val)
             }
             envs['secrets'].keys.each { | key |
                 val = envs['secrets'][key]
-                puts "--    #{key} == XXXXXX"
+                pputs "--    #{key} == XXXXXX"
                 @log.info "Setting: #{key} == XXXXXXX"
                 ENV.store(key, val)
             }
         end
     end
+
+    def pputs (s)
+        if (@raw == false)
+            puts "#{s}"
+        end
+    end
+
 end

data/lib/helper-run-class.rb

@@ -6,9 +6,10 @@ require "prepare-environment"
 require "trace-runner"
 
 class HelperRun
-    def initialize ()
+    def initialize (_raw)
         @basePath = "#{Pathname.new(Canzea::config[:catalog_location]).realpath}"
         @log = Logger.new(Canzea::config[:logging_root] + '/plans.log')
+        @raw = _raw
     end
 
     def runPlan (plans)
@@ -34,7 +35,7 @@ class HelperRun
 
         parameters = self.enrich(parameters)
 
-        envPush = PrepareEnvironment.new
+        envPush = PrepareEnvironment.new @raw
 
         begin
             envScript = "#{@basePath}/helpers/#{solution}/environment.json"
@@ -43,7 +44,7 @@ class HelperRun
                 envPush.addToEnv "#{envScript}"
             end
 
-            r = RunnerWorker.new
+            r = RunnerWorker.new @raw
 
             ENV['CATALOG_LOCATION'] = "#{@basePath}";
 

data/lib/prepare-environment.rb

@@ -6,6 +6,9 @@ require "registry"
 
 
 class PrepareEnvironment
+    def initialize (_raw)
+        raw = _raw;
+    end
 
     def addToEnv (envFile)
         log = Logger.new(Canzea::config[:logging_root] + '/plans.log')
@@ -19,7 +22,7 @@ class PrepareEnvironment
         if (serviceLookups.has_key?('environment'))
             serviceLookups['environment'].each do |svc|
 
-              puts "-- Setting...#{svc['name']}"
+              pputs "-- Setting...#{svc['name']}"
               log.info("Setting: " + svc['name'])
               ENV.store(svc['name'], svc['value'])
             end
@@ -27,7 +30,7 @@ class PrepareEnvironment
 
         serviceLookups['keyvalues'].each do |svc|
 
-          puts("-- Looking up...#{svc['name']}")
+          pputs("-- Looking up...#{svc['name']}")
 
           uri = URI.parse(ENV["CONSUL_URL"] + '/v1/kv/' + svc['name'])
           http = Net::HTTP.new(uri.host, uri.port)
@@ -65,7 +68,7 @@ class PrepareEnvironment
             ENV.store(key, s)
           else
             log.warn("KEY VALUE NOT FOUND! " + svc['name'])
-            puts "-- KEY VALUE NOT FOUND! " + svc['name']
+            pputs "-- KEY VALUE NOT FOUND! " + svc['name']
             abort()
           end
         end
@@ -73,7 +76,7 @@ class PrepareEnvironment
 
         serviceLookups['services'].each do |svc|
 
-          puts "-- Looking up...#{svc['name']}"
+          pputs "-- Looking up...#{svc['name']}"
 
           uri = URI.parse(ENV["CONSUL_URL"] + '/v1/catalog/service/' + svc['name'])
           http = Net::HTTP.new(uri.host, uri.port)
@@ -117,14 +120,14 @@ class PrepareEnvironment
             }
           else
             log.warn("SERVICE NOT FOUND! " + svc['name'])
-            puts "-- SERVICE NOT FOUND! " + svc['name']
+            pputs "-- SERVICE NOT FOUND! " + svc['name']
             abort()
           end
         end
 
         serviceLookups['secrets'].each do |svc|
 
-          puts "-- Looking up secret...#{svc['name']}"
+          pputs "-- Looking up secret...#{svc['name']}"
 
           uri = URI.parse(ENV["VAULT_URL"] + '/v1/secret/' + svc['name'])
           http = Net::HTTP.new(uri.host, uri.port)
@@ -167,8 +170,8 @@ class PrepareEnvironment
           else
             log.warn( "SECRET NOT FOUND! " + svc['name'])
             log.warn( "ERROR FROM VAULT " + resp.body)
-            puts "-- SECRET NOT FOUND! " + svc['name']
-            puts "-- ERROR FROM VAULT " + resp.body
+            pputs "-- SECRET NOT FOUND! " + svc['name']
+            pputs "-- ERROR FROM VAULT " + resp.body
             abort()
           end
         end
@@ -179,4 +182,11 @@ class PrepareEnvironment
             puts name + " = " + value
         }
     end
+
+    def pputs (s)
+        if (raw == false)
+            puts "-- #{s}"
+        end
+    end
+
 end

data/lib/trace-runner.rb

@@ -20,9 +20,12 @@ def handleIO(stillOpen, ioArray, io, log)
 end
 
 class RunnerWorker
+    def initialize (_raw)
+        @raw = _raw;
+    end
 
-    def run(command, start, lines, statusIndicator = false )
-        audit = Audit.new
+    def run(command, start, lines, statusIndicator = false)
+        audit = Audit.new @raw
 
 	    log = Logger.new(Canzea::config[:logging_root] + '/plans.log')
 
@@ -36,7 +39,7 @@ class RunnerWorker
 
         workingDir = Canzea::config[:pwd]
 
-        puts "-- Executing [#{workingDir}] #{l}"
+        pputs "Executing [#{workingDir}] #{l}"
         Dir.chdir(workingDir){
 
             Open3.popen3(ENV, l) {|stdin, stdout, stderr, wait_thr|
@@ -67,9 +70,9 @@ class RunnerWorker
               log.info("Exit Status = #{exit_status}")
               log.info("Completed in (ms) : #{msecs}")
 
-              puts "-- Exit Status = #{exit_status}"
+              pputs "Exit Status = #{exit_status}"
               output.split(/\n/).each do | line |
-                  puts "-- #{line}"
+                  pputs "#{line}"
               end
 
 
@@ -81,6 +84,10 @@ class RunnerWorker
                   audit.status("#{lines + 1}", l.chomp, exit_status.exitstatus, msecs, output)
               end
 
+              if (@raw)
+                  puts output
+              end
+
               if exit_status.exitstatus != 0
                 abort()
               end
@@ -92,4 +99,10 @@ class RunnerWorker
         return lines
 
     end
+
+    def pputs (s)
+        if (@raw == false)
+            puts "-- #{s}"
+        end
+    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canzea
 version: !ruby/object:Gem::Version
-  version: 0.1.102
+  version: 0.1.103
 platform: ruby
 authors:
 - Canzea Technologies