kitchen-vra 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e4cfc4ac71a96821a3b283979f4f02a37c2ea71
-  data.tar.gz: 1d1029f7792c46a8c4cbe8e19d45418dc6969617
+  metadata.gz: dc5351db8abc9e1ebed8cd6d250cd6eed5294ac3
+  data.tar.gz: dadebc21274f1612b11325524295e60e23c6c64d
 SHA512:
-  metadata.gz: ce5a986c98e748a248d9053f989b6480620d5307e2211636ac59dfc4ca861d221cc8b0f71c421575e5baefd0626b0228751fa6308ed2ce5b6c04e7a892672456
-  data.tar.gz: 96caae81ee6b15e35d26e28e44915d2176964bc46d253aa7f2e8dc2f04e007674f32175af23205cb1e0fec155677c9a98a553179239e7f3509f7ce61affe63fe
+  metadata.gz: 1fe82016e8c6bb3042772a7b3dd42ee4d824a6ac06ca43a0e85bb9b4ddd47b6886a22d7372b5ef5e7997e99d2a975130d145fb6d6d35c7eadb87537696dc3178
+  data.tar.gz: 081cd1c7f6aee2fa0f9577323efb79de324f9e9a2328a15cdeb20336a52f00106b0d96995d21270ec8dd83819f346509f77b4fddc0114b312f7e669ed67c4635

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [2.4.0] (https://github.com/chef-partners/kitchen-vra/tree/v2.4.0) (2018-01-04)
+[Full Changelog](https://github.com/chef-partners/kitchen-vra/compare/v2.3.0...2.4.0)
+
+**Enhanced/Fixed:**
+
+- Enhance vRA Kitchen driver to accept Catalog name as an input.
+- Ability of vRA Kitchen driver to accept credentials from environment variable even if they are not being mentioned in the `.kitchen.yml` file 
+- Ability of vRA kitchen driver to prompt for credentials if it’s not able retrieve from `.kitchen.yml` or from environment variable.
+- An option to not save credentials based on the usage of an existing flag.
+- Fixed a bug in the encryption/decryption logic.
+
+
 ## [2.3.0](https://github.com/chef-partners/kitchen-vra/tree/2.3.0) (2017-07-14)
 [Full Changelog](https://github.com/chef-partners/kitchen-vra/compare/v2.2.0...2.3.0)
 
@@ -82,4 +94,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/README.md

@@ -36,7 +36,22 @@ driver:
   verify_ssl: true
 ```
 
-Then configure your platforms. A catalog_id is required for each platform:
+If you want username and password to be prompted, remove usename and password in your .kitchen.yml as shown below:
+
+```yaml
+driver:
+  name: vra
+  tenant: mytenant
+  base_url: https://vra.corp.local
+  verify_ssl: true
+```
+If you don't want to explicitly specify username and password in the kitchen.yml, you have an option to set it in the environment variable as 
+
+    $ export VRA_USER_NAME='myuser@corp.local'
+    $ export VRA_USER_PASSWORD='mypassword'
+
+Then configure your platforms. Either a catalog_id or a catalog_name is required for each platform. If both catalog_id and catalog_name are mentioned in .kitchen.yml then catalog_name would be used to derive the catalog_id and this catalog_id would override the catalog_id being passed in .kitchen.yml. In the below example as can be seen we are using catalog_id for centos6 driver while catalog_name for the centos7 driver just to demonstrate that we can use either of the two.
+
 
 ```yaml
 platforms:
@@ -45,9 +60,11 @@ platforms:
       catalog_id: e9db1084-d1c6-4c1f-8e3c-eb8f3dc574f9
   - name: centos7
     driver:
-      catalog_id: c4211950-ab07-42b1-ba80-8f5d3f2c8251
+      catalog_name: my_catalog_name
 ```
 
+
+
 Other options that you can set include:
 
  * **lease_days**: number of days to request for a lease, if your catalog item / blueprint requires it
@@ -72,6 +89,7 @@ driver:
 platforms:
   - name: small
     driver:
+      catalog_name: my_catalog_name_small
       catalog_id: 8a189191-fea6-43eb-981e-ee0fa40f8f57
       extra_parameters:
         provider-mycustompropname:
@@ -82,6 +100,7 @@ platforms:
           value: Non-Prod
   - name: large
     driver:
+      catalog_name: my_catalog_name_large
       catalog_id: 1d7c6122-18fa-4ed6-bd13-8a33b6c6ed50
       cpus: 2
       extra_parameters:

data/lib/kitchen/driver/vra.rb

@@ -31,11 +31,12 @@ module Kitchen
       kitchen_driver_api_version 2
       plugin_version Kitchen::Driver::VRA_VERSION
 
-      default_config :username, ''
-      default_config :password, ''
+      default_config :username, nil
+      default_config :password, nil
       required_config :base_url
       required_config :tenant
-      required_config :catalog_id
+      default_config :catalog_id, nil
+      default_config :catalog_name, nil
 
       default_config :subtenant, nil
       default_config :verify_ssl, true
@@ -65,21 +66,26 @@ module Kitchen
       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
+        config[:username] = config[:username] || ENV['VRA_USER_NAME']
+        config[:password] = config[:password] || ENV['VRA_USER_PASSWORD']
+        c_load if config[:username].nil? && config[:password].nil?
+
+        config[:username] = ask('Enter Username: ') if config[:username].nil? || force_change
+        config[:password] = ask('Enter password: ') { |q| q.echo = '*' } if config[:password].nil? || force_change
+        c_save if config[:cache_credentials]
       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
+        iv_user = cipher.random_iv
+        cipher.iv = iv_user
         username = cipher.update(config[:username]) + cipher.final
+        iv_pwd = cipher.random_iv
+        cipher.iv = iv_pwd
         password = cipher.update(config[:password]) + cipher.final
-        output = "#{Base64.encode64(iv).strip!}:#{Base64.encode64(username).strip!}:#{Base64.encode64(password).strip!}"
+        output = "#{Base64.encode64(iv_user).strip!}:#{Base64.encode64(username).strip!}:#{Base64.encode64(iv_pwd).strip!}:#{Base64.encode64(password).strip!}"
         file = File.open('.kitchen/cached_vra', 'w')
         file.write(output)
         file.close
@@ -90,14 +96,16 @@ module Kitchen
       def c_load
         if File.exist? '.kitchen/cached_vra'
           encrypted = File.read('.kitchen/cached_vra')
-          iv = Base64.decode64(encrypted.split(':')[0] + '\n')
+          iv_user = Base64.decode64(encrypted.split(':')[0] + '\n')
           username = Base64.decode64(encrypted.split(':')[1] + "\n")
-          password = Base64.decode64(encrypted.split(':')[2] + "\n")
+          iv_pwd = Base64.decode64(encrypted.split(':')[2] + "\n")
+          password = Base64.decode64(encrypted.split(':')[3] + "\n")
           cipher = OpenSSL::Cipher::Cipher.new('aes-256-cbc')
           cipher.decrypt
           cipher.key = Digest::SHA1.hexdigest(config[:base_url])
-          cipher.iv = iv
+          cipher.iv = iv_user
           config[:username] = cipher.update(username) + cipher.final
+          cipher.iv = iv_pwd
           config[:password] = cipher.update(password) + cipher.final
         end
       rescue
@@ -191,9 +199,23 @@ module Kitchen
         info("Destroy request #{destroy_request.id} submitted.")
         wait_for_request(destroy_request)
         info('Destroy request complete.')
+        
+        File.delete('.kitchen/cached_vra') if File.exist?('.kitchen/cached_vra')
+        info('Removed cached file')
       end
 
       def catalog_request
+        if config[:catalog_name] != nil
+           info('Fetching Catalog ID by Catalog Name')
+           response =  vra_client.catalog.fetch_catalog_items(config[:catalog_name])
+           parsed_json = JSON.parse(response.body)
+           begin
+             config[:catalog_id] = parsed_json['content'][0]['catalogItemId']
+           rescue
+             puts "Unable to retrieve Catalog ID from Catalog Name: #{config[:catalog_name]}"
+           end
+        end
+
         catalog_request = vra_client.catalog.request(config[:catalog_id])
 
         catalog_request.cpus          = config[:cpus]
@@ -211,7 +233,7 @@ module Kitchen
       end
 
       def vra_client
-        check_config false if config[:cache_credentials]
+        check_config config[:cache_credentials]
         @client ||= ::Vra::Client.new(
           base_url:   config[:base_url],
           username:   config[:username],

data/lib/kitchen/driver/vra_version.rb

@@ -19,6 +19,6 @@
 
 module Kitchen
   module Driver
-    VRA_VERSION = '2.3.0'
+    VRA_VERSION = '2.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vra
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Chef Partner Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen