vagrant-aws-winrm 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc3c8fbde2eadf199a443ec57748fdcff1c7410c
-  data.tar.gz: 29178f62a5540a986cdc659be66d4f709c8292ec
+  metadata.gz: 94129784b1207e77f8953f782490d451e1d386ca
+  data.tar.gz: a3a947928d0df2b3d92601e2254026313b783133
 SHA512:
-  metadata.gz: 3a883f3681fab1017803411e0eee55faffb582d959f6e617d3cf6fae4efd9398e4061c87f60f023fd9d9ed57aa2ce25883efed8eb075c106655b696e8e999843
-  data.tar.gz: 46bc8c5828c0807df2ca076ebd5a9152d3aaf5b08e10b9cae2ddf60f4c908a414a4449050db3a34f415f2ab07e61375786358f7f91d77cdd277c006a1c71f78e
+  metadata.gz: 0e4d447b79d254df19429bd12a39922224e7944e39c8b1f7d5c51e8423959abb6d5ae15545be5b99aacd154d58f1c82bde45fb621ce83433ec67a6a508989bc6
+  data.tar.gz: d74d04b3ddc683c17c45da68a6fd87fed4afa5e736d0db1bc2d0ff012c8278c038315bc799c9fbf9df4aa6adbb5bf15569a106761660700398075d1a3fa22e38

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

@@ -1,63 +1,60 @@
+require "vagrant-aws"
 require "log4r"
-require "aws-sdk"
 
 module VagrantPlugins
   module AWS
     module WinRM
       class Capability
-        def self.winrm_info(machine)
-          logger = Log4r::Logger.new("vagrant_aws_winrm::capability::winrm_info")
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_aws_winrm::capability::winrm_info")
+        end
 
+        def self.winrm_info(machine)
           if machine.config.winrm.password == :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 
-            session_token     = machine.provider_config.session_token
-            credentials       = ::Aws::Credentials.new(access_key_id, secret_access_key, session_token)
-            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      
-
-            logger.info("Getting password data from AWS...")
-            logger.info(" -- Region: #{region}")
-            logger.info(" -- Endpoint: #{endpoint}") if endpoint
-            logger.info(" -- Instance ID: #{machine.id}")
-
-            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|
-              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
-
-              break
-            end            
+            # Call the VagrantPlugins::AWS::Action::ConnectAWS
+            # middleware so we can get acces to the Fog connection
+            machine.env.action_runner.run(
+              Vagrant::Action::Builder.new.tap do |b|
+                b.use VagrantPlugins::AWS::Action::ConnectAWS
+                b.use self
+              end, {
+                machine: machine,
+                ui: machine.ui,
+              }
+            )
           end
-
           return {}
         end
+
+        def call(env)
+          machine = env[:machine]
+          aws     = env[:aws_compute]
+
+          response            = aws.get_password_data({ instance_id: machine.id })
+          password_data       = response.body['passwordData']
+          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|
+            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
+
+            break
+          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.3"
+        VERSION = "0.0.4"
     end    
   end
 end

data/vagrant-aws-winrm.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "aws-sdk", "~> 2"
+  spec.add_dependency "vagrant-aws", "~> 0.6.0"
 
   #spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-aws-winrm
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Rafael Goodman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: vagrant-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement