vmware-vra 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c5dcc8f5abbb59b980895b3970c86f73e49fe379
-  data.tar.gz: 78746f7b4706f0ae7adcce6cffcd8a2f5fd178c2
+SHA256:
+  metadata.gz: adc7871ce36fca6a61e634ea47bd4453e12d0c57fd2a53b30d67b327f819a7e5
+  data.tar.gz: 8f9ad1fc148858c9f686c53f0818a3ad8af418eaa8dac845e2b36833b60274cf
 SHA512:
-  metadata.gz: 26479fc2672a80ddf7b83f9b5bafedbe803304b1f580ffcd7603512f08a8e936d7b14933c36be801a010728441c0502cc55d7822c9591eb5b5c9bc9b6cfa294a
-  data.tar.gz: ccd9fdf91aa926facc9bb8d8819fa73a653217b349ea79da6bc490917df1958a9ab5346d8f48c0090a4c764ba84303297997a6a8b2ddc1e604503963a3fafbaa
+  metadata.gz: e007662f641db9438846aecb6bd5f2063cb55c961b1131b85433185cb86b8031b0e6978441c35bd7d55d67daf02667ee58ca8c025f58872569d5ed84c8ba9c91
+  data.tar.gz: 0343c931007f55fbbbe1fce15b516674a1ae46f74630d1d7a2b529d2c7068386e5b1a087447b58ac9ca68de06b1112a773acf406fe97de93a85af6cf57e62654

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
-- 2.3.1
+- 2.6.3
 branches:
   only:
   - master

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 # Change Log
 
-## [2.6.1](https://github.com/chef-partners/vmware-vra-gem/tree/2.6.1) (2018-07-31)
+## [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)
+
+**Closed issues:**
+
+- Extra Parameters Not Being Sent to vRA [\#73](https://github.com/chef-partners/vmware-vra-gem/issues/73)
+
+**Merged pull requests:**
+
+- vRA7 multiple fixes for nested, non-nested and merged parameters for a Blueprint [\#74](https://github.com/chef-partners/vmware-vra-gem/pull/74) ([stuartpreston](https://github.com/stuartpreston))
+
+## [2.6.1](https://github.com/chef-partners/vmware-vra-gem/tree/v2.6.1) (2018-07-31)
 [Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.6.0...2.6.1)
 
 **Closed issues:**

data/lib/vra/catalog_request.rb

@@ -21,8 +21,8 @@ require "vra/catalog_item"
 module Vra
   class CatalogRequest
     attr_reader :catalog_id, :catalog_item, :client, :custom_fields
-    attr_writer :subtenant_id
-    attr_accessor :cpus, :memory, :requested_for, :lease_days, :notes, :template_payload
+    attr_writer :subtenant_id, :template_payload
+    attr_accessor :cpus, :memory, :requested_for, :lease_days, :notes
 
     def initialize(client, catalog_id, opts = {})
       @client            = client
@@ -96,6 +96,8 @@ 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.to_json
     end
 
     # @return [String] - the current catalog template payload merged with the settings applied from this request
@@ -111,9 +113,8 @@ module Vra
     # @return [Vra::Request] - submits and returns the request, validating before hand
     def submit
       validate_params!
-
       begin
-        post_response = client.http_post("/catalog-service/api/consumer/entitledCatalogItems/#{@catalog_id}/requests", template_payload)
+        post_response = client.http_post("/catalog-service/api/consumer/entitledCatalogItems/#{@catalog_id}/requests", merged_payload)
       rescue Vra::Exception::HTTPError => e
         raise Vra::Exception::RequestError, "Unable to submit request: #{e.errors.join(', ')}"
       rescue

data/lib/vra/client.rb

@@ -71,7 +71,7 @@ module Vra
       {
         "username" => @username,
         "password" => @password.value,
-        "tenant"   => @tenant,
+        "tenant" => @tenant,
       }
     end
 

data/lib/vra/request_parameters.rb

@@ -51,7 +51,7 @@ module Vra
 
     def set(key, type, value)
       if key.to_s.include? "~"
-        split_key = key.split("~")
+        split_key = key.to_s.split("~")
         parent = nil
         split_key.each_with_index do |item, index|
           if index == 0
@@ -135,7 +135,6 @@ module Vra
 
     def to_vra
       hash = {}
-
       if @children.count > 0
         hash[@key] = {}
 
@@ -148,7 +147,7 @@ module Vra
         hash[@key] = format_value
       end
 
-      hash
+      hash.each_with_object({}) { |(key, value), h| h[key.to_s] = value }
     end
 
     def format_value

data/lib/vra/resource.rb

@@ -178,7 +178,7 @@ module Vra
         resource_views = @client.http_get("/catalog-service/api/consumer/requests/#{request_id}/resourceViews")
 
         JSON.parse(resource_views.body)["content"].each do |content|
-          if content.has_key?("data") &&
+          if content.key?("data") &&
               !(content["data"]["ip_address"].nil? ||
                 content["data"]["ip_address"] == "")
             addrs << content["data"]["ip_address"]

data/lib/vra/version.rb

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

data/spec/catalog_request_spec.rb

@@ -139,9 +139,8 @@ describe Vra::CatalogRequest do
 
         template = File.read("spec/fixtures/resource/catalog_request.json")
         payload = JSON.parse(request.merge_payload(template))
-        param1 = payload["data"]["param1"]
-        param2 = payload["data"]["param2"]
-
+        param1 = payload["data"]["my_blueprint"]["data"]["param1"]
+        param2 = payload["data"]["my_blueprint"]["data"]["param2"]
         expect(param1).to be_a(String)
         expect(param2).to be_a(Integer)
         expect(param1).to eq "my string"
@@ -154,9 +153,8 @@ describe Vra::CatalogRequest do
 
         template = File.read("spec/fixtures/resource/catalog_request.json")
         payload = JSON.parse(request.merge_payload(template))
-        param1 = payload["data"]["BP1"]["data"]["param1"]
-        param2 = payload["data"]["BP1"]["data"]["BP2"]["data"]["param2"]
-
+        param1 = payload["data"]["my_blueprint"]["data"]["BP1"]["data"]["param1"]
+        param2 = payload["data"]["my_blueprint"]["data"]["BP1"]["data"]["BP2"]["data"]["param2"]
         expect(param1).to be_a(String)
         expect(param2).to be_a(Integer)
         expect(param1).to eq "my string"
@@ -185,8 +183,8 @@ describe Vra::CatalogRequest do
 
         template = File.read("spec/fixtures/resource/catalog_request.json")
         payload = JSON.parse(request.merge_payload(template))
-        param1 = payload["data"]["BP1"]["data"]["param1"]
-        param2 = payload["data"]["BP1"]["data"]["BP2"]["data"]["param2"]
+        param1 = payload["data"]["my_blueprint"]["data"]["BP1"]["data"]["param1"]
+        param2 = payload["data"]["my_blueprint"]["data"]["BP1"]["data"]["BP2"]["data"]["param2"]
 
         expect(param1).to be_a(String)
         expect(param2).to be_a(Integer)

data/spec/client_spec.rb

@@ -133,7 +133,7 @@ describe Vra::Client do
     payload = {
       "username" => "user@corp.local",
       "password" => "password",
-      "tenant"   => "tenant",
+      "tenant" => "tenant",
     }.to_json
 
     it "posts to the tokens API endpoint" do

data/spec/resource_spec.rb

@@ -327,7 +327,7 @@ describe Vra::Resource do
         {
           "username" => "user@corp.local",
           "password" => "password",
-          "tenant"   => "tenant",
+          "tenant" => "tenant",
         }.to_json
       end
 
@@ -343,23 +343,23 @@ describe Vra::Resource do
           :post,
           "https://vra.corp.local/identity/api/tokens"
         ).with(
-          :body => authn_payload,
-          :headers => { "Accept" => "application/json", "Content-Type" => "application/json" }
+          body: authn_payload,
+          headers: { "Accept" => "application/json", "Content-Type" => "application/json" }
         ).to_return(
-          :status => 200,
-          :body => '{"id":"12345"}',
-          :headers => {}
+          status: 200,
+          body: '{"id":"12345"}',
+          headers: {}
         )
 
         stub_request(
           :head,
           "https://vra.corp.local/identity/api/tokens/12345"
         ).with(
-          :headers => { "Accept" => "application/json", "Authorization" => "Bearer 12345", "Content-Type" => "application/json" }
+          headers: { "Accept" => "application/json", "Authorization" => "Bearer 12345", "Content-Type" => "application/json" }
         ).to_return(
-          :status => 204,
-          :body => "",
-          :headers => {}
+          status: 204,
+          body: "",
+          headers: {}
         )
 
         stub_request(

data/vmware-vra.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry",     "~> 0.10"
   spec.add_development_dependency "rake",    "~> 10.0"
   spec.add_development_dependency "rspec",   "~> 3.0"
-  spec.add_development_dependency "webmock", "~> 1.21"
+  spec.add_development_dependency "webmock", "~> 3.5"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmware-vra
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Adam Leff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-31 00:00:00.000000000 Z
+date: 2019-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '3.5'
 description: Client gem for interacting with VMware vRealize Automation.
 email:
 - jj@chef.io
@@ -151,7 +151,6 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Jenkinsfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -208,8 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Client gem for interacting with VMware vRealize Automation.

data/Jenkinsfile

@@ -1,31 +0,0 @@
-pipeline {
-  agent {
-    docker {
-      args '-u root'
-      image 'localhost:5000/jjkeysv3'
-    }
-
-  }
-  triggers {
-        pollSCM('H * * * *')
-  }
-  stages {
-    stage('Pull down the ChefDK') {
-      steps {
-        sh '''apt-get update
-apt-get install -y curl sudo git build-essential
-curl -L https://chef.io/chef/install.sh | sudo bash -s -- -P chefdk -c current'''
-      }
-    }
-    stage('Bundle') {
-      steps {
-        sh 'chef exec bundle install'
-      }
-    }
-    stage('Rake') {
-      steps {
-        sh 'chef exec bundle exec rake '
-      }
-    }
-  }
-}