avst-cloud 0.1.20 → 0.1.21

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjFkMjViN2E1ZjcyZGQ4MjkxNWQ4OGQwMmE1NTFkYmM0YjRjOGMwNQ==
+    ZjNlODExNDZjNDRmNTg4MzkyYzFmMzBhM2I1Njg4YjdkZTFkODk0Nw==
   data.tar.gz: !binary |-
-    OWE2NWM0MjRjZjY4ZDM3OTZkZDdlYzE1YzZlNTZlZDE4ZGQwMWE0OQ==
+    MTkyMDI2YThlNmUxNjgyODFmNmQ2MGQwZTYyOWE0NmRkMTEzYjdlMw==
 SHA512:
   metadata.gz: !binary |-
-    Mjc4MDg4ZWJlMWE1YTE2ODFkYjExZWYyNmU2OTExZWFkZDYxZmFmYTUyNDBl
-    ZGI5YzM5OGU2YzcyYWE4M2E2OGJkMzMwODU5YWMzZTc1ZGI3ZjE5OTMzMTMw
-    NzM1YmNhMGQzM2Y2ZGU2NDMwZDQyMTNjYTc0YzE2YzQzZWYwMjA=
+    N2ZkMDA3NTE0MjI4ZTliNGFlZDkzYzU2NjI1OGRiZmEyNTBkZDhhODcyN2I4
+    ZDlkZmZlYjM4YThlZmVhOTY4M2M1NGMwY2FjMmM5NGRjM2I1YjhiMjIyMTMx
+    YmJjZmViY2IxYzhiNTY0NzU2ZTQwYzg2MjdiNWQyMDkyMDc5ODA=
   data.tar.gz: !binary |-
-    NDBlZjRkNTllMzdjMzlkZjU0ZTMxN2U5NTcwNTMwYjFkMGVjMTBhMzY5NzYw
-    NjY0ZmJhZDlkYWM3YTM1ZmRmY2RiNWVmMjkxNjQ5YzczZmVhZTA3OTVhMDE3
-    MWY4NDAxZDNlNjEyOWJkOGU1YTEyMzQ3MjA2MThjZWExMzc3NmQ=
+    NmYwNTJlZDQ4MDFlMWEzNGI0ODI2NmNkMjQ1NDUzOTRhNTYwMWZmODE3MzRj
+    ODBhNzQzNWZjMzU2YjM3YmIyOGMwZWEwNTczZGFiY2VhMjI5YzZlMjVmMTk5
+    M2U5MThiNTQ0ZDFhYzlmNTNmNzU2ZTVhNGU3OGJkMTI2YTk3MGM=

data/avst-cloud.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
     spec.name          = "avst-cloud"
-    spec.version       = '0.1.20'
+    spec.version       = '0.1.21'
     spec.authors       = ["Martin Brehovsky", "Jon Bevan", "Matthew Hope"]
     spec.email         = ["mbrehovsky@adaptavist.com", "jbevan@adaptavist.com", "mhope@adaptavist.com"]
     spec.summary       = %q{Automated creation, bootstrapping and provisioning of servers }

data/lib/avst-cloud/azure_rm_connection.rb

@@ -115,7 +115,7 @@ module AvstCloud
                 logger.debug "storage_account_name - #{storage_account_name}"
                 logger.debug "vm_size              - #{vm_size}"
                 logger.debug "user                 - #{user}"
-                logger.debug "password             - #{password}"
+                logger.debug "password             - #{Logging.mask_message(password)}"
                 logger.debug "publisher            - #{publisher}"
                 logger.debug "offer                - #{offer}"
                 logger.debug "sku                  - #{sku}"
@@ -171,7 +171,7 @@ module AvstCloud
                 result_server = AvstCloud::AzureRmServer.new(server, server_name, ip_address, user, password)
                 logger.debug "[DONE]\n\n"
                 logger.debug "The server has been successfully created, to login onto the server:\n"
-                logger.debug "\t ssh #{user}@#{ip_address} with pass #{password} \n"
+                logger.debug "\t ssh #{user}@#{ip_address} with pass #{Logging.mask_message(password)} \n"
                 result_server
             end
         end

data/lib/avst-cloud/logging.rb

@@ -15,22 +15,34 @@
 require 'logger'
 
 module Logging
+
+  def self.logger
+    @logger ||= Logger.new(STDOUT)
+  end
+
+  def self.logger=(logger)
+    @logger = logger
+  end
+
+  def self.show_passwords=(show_passwords)
+    @show_passwords = show_passwords
+  end
+
+  def self.mask_message(message)
+    !@show_passwords ? "*****" : message
+  end
+
+  # Addition
   def self.included(base)
     class << base
       def logger
-        @logger ||= Logger.new($stdout)
-      end
-
-      def logger=(logger)
-        @logger = logger
+        Logging.logger
       end
     end
   end
 
   def logger
-    self.class.logger
-  end
-  def logger=(logger)
-    @logger = logger
+    Logging.logger
   end
+
 end

data/lib/avst-cloud/rackspace_connection.rb

@@ -78,7 +78,7 @@ module AvstCloud
                     logger.debug "You can continute to monitor the build process through the web console at https://mycloud.rackspace.com/\n\n"
                     raise "Timeout while creating Rackspace server #{server_name}"
                 end
-                logger.debug "The #{server.username} password is #{server.password}\n\n"
+                logger.debug "The #{server.username} password is #{Logging.mask_message(server.password)}\n\n"
             end
             result_server.access_user = server.username
             result_server.access_password = server.password
@@ -126,7 +126,7 @@ module AvstCloud
     private
         def connect
             unless @connection
-                logger.debug "Creating new connection to rackspace: #{@provider_user} #{@provider_pass} #{@region}"
+                logger.debug "Creating new connection to rackspace: #{@provider_user} #{Logging.mask_message(@provider_pass)} #{@region}"
                 @connection = Fog::Compute.new({
                     :provider             => 'rackspace',
                     :rackspace_username   => @provider_access_user,

data/lib/avst-cloud/task.rb

@@ -26,7 +26,6 @@ module AvstCloud
     end
 
     class SshTask < AvstCloud::Task
-        include Logging
         def execute(server)
             unless server.ip_address
                 logger.error 'Can not find host'.red
@@ -43,7 +42,7 @@ module AvstCloud
                 raise 'Password not found. Please provide root_password in config. for this server.'
             end
 
-            logger.debug "Using #{server.access_user}@#{server.ip_address} with #{server.access_password} to perform ssh task."
+            logger.debug "Using #{server.access_user}@#{server.ip_address} with #{Logging.mask_message(server.access_password)} to perform ssh task."
             attempts = 1
             success = false
             max_attempts = 50
@@ -71,8 +70,6 @@ module AvstCloud
     end
 
     class SshCommandTask < AvstCloud::SshTask
-        include Logging
-
         def initialize(cmds, debug = false, structured_log = false)
             @cmds = cmds
             @debug = debug
@@ -107,7 +104,6 @@ module AvstCloud
     # for user that performs it
     # In case user does not have sudo no pass, enable it for bootstrapping and provisioning
     class DisableRequireTty < AvstCloud::SshTask
-        include Logging
         def initialize(for_user, pass, enable_passwordless_sudo=false)
             @for_user = for_user
             @user_password = pass
@@ -153,7 +149,6 @@ module AvstCloud
     end
 
     class WaitUntilReady < AvstCloud::SshTask
-        include Logging
 
         def ssh_command(session)
             session.open_channel do |channel|
@@ -180,7 +175,6 @@ module AvstCloud
     end
 
     class CapistranoDeploymentTask < AvstCloud::Task
-        include Logging
 
         def initialize(git, branch, server_tmp_folder = "/tmp/avst_cloud_tmp_#{Time.now.to_i}", reference = nil, custom_provisioning_commands = [], puppet_runner = nil, puppet_runner_prepare = nil, destination_folder = '/var/opt/puppet')
             unless git and (branch or reference)
@@ -214,8 +208,7 @@ module AvstCloud
                 raise 'Password not found. Please provide root_password in config. for this server.'
             end
 
-            logger.debug "Using #{server.access_user}@#{server.ip_address} with #{server.access_password}"
-
+            logger.debug "Using #{server.access_user}@#{server.ip_address} with #{Logging.mask_message(server.access_password)}"
 
             # Initiate capistrano deploy script to download the laters code and provision the server
             require 'capistrano/all'
@@ -264,7 +257,6 @@ module AvstCloud
     end
 
     class ScpTask < AvstCloud::Task
-        include Logging
 
         def initialize(files)
             @files = files
@@ -286,7 +278,7 @@ module AvstCloud
                 raise 'Password not found. Please provide root_password in config. for this server.'
             end
 
-            logger.debug "Using #{server.access_user}@#{server.ip_address} with #{server.access_password}"
+            logger.debug "Using #{server.access_user}@#{server.ip_address} with #{Logging.mask_message(server.access_password)}"
             Net::SCP.start( server.ip_address, server.access_user, :password => server.access_password, :keys => [server.access_password] ) do |scp|
                 @files.each do |local_file, remote_path|
                     upload_file(scp, local_file, remote_path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avst-cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Martin Brehovsky
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler