vagrant-aws-winrm 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1333301219911be80fe150eebc58ca9322c6eb98
-  data.tar.gz: 15e69ee3a48636152fe998cd6631feb1cca7c442
+  metadata.gz: 733d38beabc57d94aa97a155faea425928836425
+  data.tar.gz: aca4b5492132e3559d6d5f5c7a3fb74804bcc656
 SHA512:
-  metadata.gz: 82ad45a7ce8d39adc9dfb780f4ab5e2e1a63f4e0285ec245232a43b160923e61683983fec085a7c0eadeac74487565eb7b360f7c6c999b8460a69c0af8b60878
-  data.tar.gz: 810b035b50e197d7c7cd248d110a9070bcbfe592922d6e18040c021b280651d7f129911465ec6a3c9ffdb762b8819e8102f9184cbfa819017f4521ca154a55a2
+  metadata.gz: 59dc92c07945d9c14600b0ce05b37493f5a332368cef0968a171c93d724176b29ca3274a7cd80b59a8f8c92094e2cd18abdc793e89a96dd56e6cbcd4ff156f58
+  data.tar.gz: 8c972189f60eec62f95ef1dd81b4802f6047d78f7efa2c83d35ef56ba865cfddd7c07f84f68575dacb468d6ad725c905cd17eadbf2fe691b5bbc36b7075b4e87

data/lib/vagrant-aws-winrm/capability.rb

@@ -1,3 +1,4 @@
+require "log4r"
 require "aws-sdk"
 
 module VagrantPlugins
@@ -5,33 +6,48 @@ module VagrantPlugins
     module WinRM
       class Capability
         def self.winrm_info(machine)
+          logger = Log4r::Logger.new("vagrant_aws_winrm::capability::winrm_info")
+
           if machine.config.winrm.password == :aws
-            machine.ui.info('Getting WinRM password from AWS')
+            machine.ui.info('Getting WinRM password from AWS...')
 
             # AWS connection info
             access_key_id     = machine.provider_config.access_key_id
             secret_access_key = machine.provider_config.secret_access_key 
             credentials       = ::Aws::Credentials.new(access_key_id, secret_access_key)
             region            = machine.provider_config.region
+            region_config     = machine.provider_config.get_region_config(region)
+            endpoint          = region_config.endpoint                        
+
+            options = {
+              region:       region,
+              credentials:  credentials
+            }
+
+            # Account for custom endpoints (e.g. OpenStack)   
+            options[:endpoint] = endpoint if endpoint      
 
-            # Grab the region endpoint explicitly in the event that
-            # a custom endpoint was specified (e.g. OpenStack)            
-            region_config = machine.provider_config.get_region_config(region)
-            endpoint      = region_config.endpoint            
+            logger.info("Getting password data from AWS...")
+            logger.info(" -- Region: #{region}")
+            logger.info(" -- Endpoint: #{endpoint}") if endpoint
+            logger.info(" -- Instance ID: #{machine.id}")
 
-            # Fetch that password data for the instance
-            ec2                 = Aws::EC2::Client.new(region: region, endpoint: endpoint, credentials: credentials)
+            ec2                 = Aws::EC2::Client.new(options)
             password_data       = ec2.get_password_data({ instance_id: machine.id }).password_data
             password_data_bytes = Base64.decode64(password_data)
             
             # Try to decrypt the password data using each one of the private key files
             # set by the user until we hit one that decrypts successfully
             machine.config.ssh.private_key_path.each do |private_key_path|
-              rsa = OpenSSL::PKey::RSA.new File.read(File.expand_path private_key_path)
+              private_key_path = File.expand_path private_key_path
 
+              logger.info("Decrypting password data using #{private_key_path}")
+              rsa = OpenSSL::PKey::RSA.new File.read private_key_path
               begin
                 machine.config.winrm.password = rsa.private_decrypt password_data_bytes
+                logger.info("Successfully decrypted password data using #{private_key_path}")
               rescue OpenSSL::PKey::RSAError
+                logger.warn("Failed to decrypt password data using #{private_key_path}")
                 next
               end
 

data/lib/vagrant-aws-winrm/plugin.rb

@@ -14,9 +14,39 @@ module VagrantPlugins
         DESC
 
         provider_capability(:aws, :winrm_info) do
+          setup_logging
+          
           require_relative 'capability'
           VagrantPlugins::AWS::WinRM::Capability
         end
+
+        def self.setup_logging
+          require "log4r"
+
+          level = nil
+          begin
+            level = Log4r.const_get(ENV["VAGRANT_LOG"].upcase)
+          rescue NameError
+            # This means that the logging constant wasn't found,
+            # which is fine. We just keep `level` as `nil`. But
+            # we tell the user.
+            level = nil
+          end
+
+          # Some constants, such as "true" resolve to booleans, so the
+          # above error checking doesn't catch it. This will check to make
+          # sure that the log level is an integer, as Log4r requires.
+          level = nil if !level.is_a?(Integer)
+
+          # Set the logging level on all "vagrant" namespaced
+          # logs as long as we have a valid level.
+          if level
+            logger = Log4r::Logger.new("vagrant_aws_winrm")
+            logger.outputters = Log4r::Outputter.stderr
+            logger.level = level
+            logger = nil
+          end
+        end        
       end
     end    
   end

data/lib/vagrant-aws-winrm/version.rb

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module AWS
     module WinRM
-        VERSION = "0.0.1"
+        VERSION = "0.0.2"
     end    
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-aws-winrm
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Rafael Goodman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Facilitates using the AWS-EC2-provided Administrator password as the
@@ -46,7 +46,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -66,12 +66,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []