vmware-vra 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adc7871ce36fca6a61e634ea47bd4453e12d0c57fd2a53b30d67b327f819a7e5
-  data.tar.gz: 8f9ad1fc148858c9f686c53f0818a3ad8af418eaa8dac845e2b36833b60274cf
+  metadata.gz: 3e28bed631cab067e13738576e243460e12e5b4ab8421f984faf1261c5b70691
+  data.tar.gz: 1be855a3503c4a15386c885accdd75a8f5fc5fc13eb84abc82c91cfe08250b6a
 SHA512:
-  metadata.gz: e007662f641db9438846aecb6bd5f2063cb55c961b1131b85433185cb86b8031b0e6978441c35bd7d55d67daf02667ee58ca8c025f58872569d5ed84c8ba9c91
-  data.tar.gz: 0343c931007f55fbbbe1fce15b516674a1ae46f74630d1d7a2b529d2c7068386e5b1a087447b58ac9ca68de06b1112a773acf406fe97de93a85af6cf57e62654
+  metadata.gz: 300797ca6f9997718a76e9c86fd1ba9f898463a94ebc95dd8e626799e77bdd6e0cd0bec7a4290f5246c31dbebbed338c84941fc132fc71763b1d7bedd10c2b1d
+  data.tar.gz: 3d8e098691e4edadafa5b5c9b6768b267ad92ff5736aed899c31ed0f62969714f743f2f8cd2b96f6a23cab6fa83609810cdfd71860c7aaaf980bd8a60d25f7c9

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## [2.7.1](https://github.com/chef-partners/vmware-vra-gem/tree/v2.7.1) (2019-05-28)
+[Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.7.0...v2.7.1)
+
+**Closed issues:**
+
+- Some Extra Parameters are not passing through to VRA [\#75](https://github.com/chef-partners/vmware-vra-gem/issues/75)
+
+**Merged pull requests:**
+
+- Add support for boolean vRA parameters, fix deep merge, add tracing [\#76](https://github.com/chef-partners/vmware-vra-gem/pull/76) ([stuartpreston](https://github.com/stuartpreston))
+
 ## [2.7.0](https://github.com/chef-partners/vmware-vra-gem/tree/v2.7.0) (2019-05-10)
 [Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.6.1...v2.7.0)
 

data/README.md

@@ -296,6 +296,20 @@ vra = Vra::Client.new(username: 'devmgr@corp.local', password: 'mypassword', ten
 client.page_size = 100
 ```
 
+### Debugging
+
+To aid diagnosis of deep API issues, set the following environment variable to enable logging of all API requests. Note that this will include requests to retrieve the bearer token.
+
+MacOS/Linux:
+```ruby
+export VRA_HTTP_TRACE=1
+```
+
+Windows:
+```powershell
+$env:VRA_HTTP_TRACE=1
+```
+
 ## License and Authors
 
 Author:: Chef Partner Engineering (<partnereng@chef.io>)

data/lib/vra/catalog_request.rb

@@ -18,6 +18,13 @@
 #
 require "vra/catalog_item"
 
+class ::Hash
+  def deep_merge(second)
+    merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+    merge(second, &merger)
+  end
+end
+
 module Vra
   class CatalogRequest
     attr_reader :catalog_id, :catalog_item, :client, :custom_fields
@@ -96,7 +103,7 @@ module Vra
       hash_payload["requestedFor"] = @requested_for
       hash_payload["data"]["_leaseDays"] = @lease_days
       hash_payload["description"] = @notes
-      hash_payload["data"][blueprint_name]["data"].merge!(parameters["data"]) unless parameters.empty?
+      hash_payload["data"] = hash_payload["data"].deep_merge(parameters["data"]) unless parameters.empty?
       hash_payload.to_json
     end
 

data/lib/vra/http.rb

@@ -8,6 +8,11 @@ module Vra
       request = Request.new(params)
       response = request.call
       response = response.forward(request).call until response.final?
+      if ENV["VRA_HTTP_TRACE"]
+        puts "#{request.params[:method].upcase} #{request.params[:url]}" unless request.params.nil?
+        puts ">>>>> #{JSON.parse(request.params[:payload]).to_json}" unless request.params[:payload].nil?
+        puts "<<<<< #{JSON.parse(response.body).to_json}" unless response.body.nil?
+      end
       raise error(response) unless response.success?
       response
     end

data/lib/vra/request_parameters.rb

@@ -156,6 +156,8 @@ module Vra
         @value.to_i
       when "string"
         @value
+      when "boolean"
+        @value.to_s == "true"
       else
         @value
       end

data/lib/vra/version.rb

@@ -18,5 +18,5 @@
 #
 
 module Vra
-  VERSION = "2.7.0"
+  VERSION = "2.7.1"
 end

data/spec/catalog_request_spec.rb

@@ -136,15 +136,18 @@ describe Vra::CatalogRequest do
       it "properly handles additional parameters" do
         request.set_parameter("param1", "string", "my string")
         request.set_parameter("param2", "integer", "2468")
+        request.set_parameter("param3", "boolean", "true")
 
         template = File.read("spec/fixtures/resource/catalog_request.json")
         payload = JSON.parse(request.merge_payload(template))
-        param1 = payload["data"]["my_blueprint"]["data"]["param1"]
-        param2 = payload["data"]["my_blueprint"]["data"]["param2"]
+        param1 = payload["data"]["param1"]
+        param2 = payload["data"]["param2"]
+        param3 = payload["data"]["param3"]
         expect(param1).to be_a(String)
         expect(param2).to be_a(Integer)
         expect(param1).to eq "my string"
         expect(param2).to eq 2468
+        expect(param3).to be_truthy
       end
 
       it "properly handles additional nested parameters" do
@@ -153,8 +156,8 @@ describe Vra::CatalogRequest do
 
         template = File.read("spec/fixtures/resource/catalog_request.json")
         payload = JSON.parse(request.merge_payload(template))
-        param1 = payload["data"]["my_blueprint"]["data"]["BP1"]["data"]["param1"]
-        param2 = payload["data"]["my_blueprint"]["data"]["BP1"]["data"]["BP2"]["data"]["param2"]
+        param1 = payload["data"]["BP1"]["data"]["param1"]
+        param2 = payload["data"]["BP1"]["data"]["BP2"]["data"]["param2"]
         expect(param1).to be_a(String)
         expect(param2).to be_a(Integer)
         expect(param1).to eq "my string"
@@ -183,8 +186,8 @@ describe Vra::CatalogRequest do
 
         template = File.read("spec/fixtures/resource/catalog_request.json")
         payload = JSON.parse(request.merge_payload(template))
-        param1 = payload["data"]["my_blueprint"]["data"]["BP1"]["data"]["param1"]
-        param2 = payload["data"]["my_blueprint"]["data"]["BP1"]["data"]["BP2"]["data"]["param2"]
+        param1 = payload["data"]["BP1"]["data"]["param1"]
+        param2 = payload["data"]["BP1"]["data"]["BP2"]["data"]["param2"]
 
         expect(param1).to be_a(String)
         expect(param2).to be_a(Integer)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmware-vra
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Adam Leff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2019-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-yajl