kitchen-vra 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d970c0fc31cd5c31e9a8f58730685566ddd6966e
-  data.tar.gz: 37afb04eae13147372daab1b369384b488eb8501
+  metadata.gz: b6cc3c25b21a83eac8d374f6a9210d7ceefc7043
+  data.tar.gz: b17fd352f4cd7f095d87dcecd24f391e58abb1fd
 SHA512:
-  metadata.gz: f3e138de6690364ba22d75ec989a64e50c7544dc6c62333369c55c61f0adc8928679761a770c06c85a72e9dc68a6b2a967cd37c1af9777b49be01c721548efa4
-  data.tar.gz: e5d69ab680453bbcdff3ceb63f8cb9c06dde78b851afb3a87549dd153781d1377980d230dc14671366f2a6e9ae0f74a42c2e1ecd62c25e8fedf1b7ba2606c997
+  metadata.gz: e6b8a50b00f03eda8fcc38dad7355dcaa87b3728d0b4876b5f324ce52c3b484c8a568d7055fa67751894a32dade67896cbe4ebe659d24f95d8bc9ba27cc15831
+  data.tar.gz: 1a7fc733c6d13253d0a93affa3ba6fdacd262011704eed4467d9f6fb2b89dfc397999b73cf292a60d413e9461d9f7ea985b1d7e92ce015c6e011a7c7c5df6f61

data/README.md

@@ -97,7 +97,7 @@ platforms:
 
 Author:: Chef Partner Engineering (<partnereng@chef.io>)
 
-Copyright:: Copyright (c) 2015 Chef Software, Inc.
+Copyright:: Copyright (c) 2015-2017 Chef Software, Inc.
 
 License:: Apache License, Version 2.0
 

data/kitchen-vra.gemspec

@@ -20,7 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'test-kitchen'
   spec.add_dependency 'vmware-vra', '~> 2'
-
+  spec.add_dependency 'highline'
+  spec.add_dependency 'rack', '~> 1.6' unless RUBY_VERSION.index('2.0.').nil?
+  spec.add_dependency 'ffi-yajl', '~> 2.2.3' unless RUBY_VERSION.index('2.0.').nil?
   spec.add_development_dependency 'bundler',   '~> 1.7'
   spec.add_development_dependency 'rake',      '~> 10.0'
   spec.add_development_dependency 'rspec',     '~> 3.2'

data/lib/kitchen/driver/vra.rb

@@ -17,6 +17,10 @@
 #
 
 require 'kitchen'
+require 'highline/import'
+require 'openssl'
+require 'base64'
+require 'digest/sha1'
 require 'vra'
 require_relative 'vra_version'
 
@@ -26,8 +30,8 @@ module Kitchen
       kitchen_driver_api_version 2
       plugin_version Kitchen::Driver::VRA_VERSION
 
-      required_config :username
-      required_config :password
+      default_config :username, ''
+      default_config :password, ''
       required_config :base_url
       required_config :tenant
       required_config :catalog_id
@@ -44,6 +48,7 @@ module Kitchen
       end
       default_config :lease_days, nil
       default_config :notes, nil
+      default_config :cache_credentials, false
       default_config :extra_parameters, {}
       default_config :private_key_path do
         %w(id_rsa id_dsa).map do |key|
@@ -58,6 +63,46 @@ module Kitchen
         'vRA'
       end
 
+      def check_config(force_change = false)
+        c_load
+        config[:username] = ask('Enter Username: ') if config[:username].eql?('') || force_change
+        config[:password] = ask('Enter password: ') { |q| q.echo = '*' } if config[:password].eql?('') || force_change
+        c_save
+      end
+
+      def c_save
+        cipher = OpenSSL::Cipher::Cipher.new('aes-256-cbc')
+        cipher.encrypt
+        cipher.key = Digest::SHA1.hexdigest(config[:base_url])
+        iv = cipher.random_iv
+        cipher.iv = iv
+        username = cipher.update(config[:username]) + cipher.final
+        password = cipher.update(config[:password]) + cipher.final
+        output = "#{Base64.encode64(iv).strip!}:#{Base64.encode64(username).strip!}:#{Base64.encode64(password).strip!}"
+        file = File.open('.kitchen/cached_vra', 'w')
+        file.write(output)
+        file.close
+      rescue
+        puts 'Unable to save credentials'
+      end
+
+      def c_load
+        if File.exist? '.kitchen/cached_vra'
+          encrypted = File.read('.kitchen/cached_vra')
+          iv = Base64.decode64(encrypted.split(':')[0] + '\n')
+          username = Base64.decode64(encrypted.split(':')[1] + "\n")
+          password = Base64.decode64(encrypted.split(':')[2] + "\n")
+          cipher = OpenSSL::Cipher::Cipher.new('aes-256-cbc')
+          cipher.decrypt
+          cipher.key = Digest::SHA1.hexdigest(config[:base_url])
+          cipher.iv = iv
+          config[:username] = cipher.update(username) + cipher.final
+          config[:password] = cipher.update(password) + cipher.final
+        end
+      rescue
+        puts 'Failed to load cached credentials'
+      end
+
       def create(state)
         return if state[:resource_id]
 
@@ -95,7 +140,7 @@ module Kitchen
 
         servers = submitted_request.resources.select(&:vm?)
         raise 'The vRA request created more than one server. The catalog blueprint should only return one.' if servers.size > 1
-        raise 'the vRA request did not create any servers.' if servers.empty?
+        raise 'the vRA request did not create any servers.' if servers.size.zero?
 
         servers.first
       end
@@ -165,6 +210,7 @@ module Kitchen
       end
 
       def vra_client
+        check_config false if config[:cache_credentials]
         @client ||= ::Vra::Client.new(
           base_url:   config[:base_url],
           username:   config[:username],
@@ -172,9 +218,13 @@ module Kitchen
           tenant:     config[:tenant],
           verify_ssl: config[:verify_ssl]
         )
+      rescue => _e
+        check_config true
       end
 
       def wait_for_request(request)
+        # config = check_config config
+
         last_status = ''
         wait_time   = config[:request_timeout]
         sleep_time  = config[:request_refresh_rate]

data/lib/kitchen/driver/vra_version.rb

@@ -18,6 +18,6 @@
 
 module Kitchen
   module Driver
-    VRA_VERSION = '2.1.0'.freeze
+    VRA_VERSION = '2.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vra
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Chef Partner Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement