vmware-vra 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e28bed631cab067e13738576e243460e12e5b4ab8421f984faf1261c5b70691
-  data.tar.gz: 1be855a3503c4a15386c885accdd75a8f5fc5fc13eb84abc82c91cfe08250b6a
+  metadata.gz: 748935ab6ce2c1922e5ffded2a7d2567709308e4c62bfe81d15d22b71a186508
+  data.tar.gz: 95b4943dc8f6015055e4a7c142115a8f555072c79244c4a62fed2e0e1862c8ac
 SHA512:
-  metadata.gz: 300797ca6f9997718a76e9c86fd1ba9f898463a94ebc95dd8e626799e77bdd6e0cd0bec7a4290f5246c31dbebbed338c84941fc132fc71763b1d7bedd10c2b1d
-  data.tar.gz: 3d8e098691e4edadafa5b5c9b6768b267ad92ff5736aed899c31ed0f62969714f743f2f8cd2b96f6a23cab6fa83609810cdfd71860c7aaaf980bd8a60d25f7c9
+  metadata.gz: 4b244e271a780513e497356114eff2ca721cf7fe2665d1fe6cbb10a500284b7702b53679a3c3aa19bd18727f6064ee6f2cb17fe38e5685e29716667b4d3cf25f
+  data.tar.gz: 8f1bd967dc41e4ed9363ae6404c402bdbb4524689d05d86a37c56e1d86f31efa374018108c5ebeef582972d15151391a25c7856621f0eeca33331c84b3846c3c

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## [2.7.2](https://github.com/chef-partners/vmware-vra-gem/tree/v2.7.2) (2020-09-09)
+[Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.7.1...v2.7.2)
+
+- Added an extra option to handle shirt size parameter
+- Masking user credentials(password) in debug mode
+
 ## [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)
 
@@ -298,4 +304,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

@@ -162,6 +162,7 @@ request_options = {
 # create the request
 catalog_request = vra.catalog.request(blueprint, request_options)
 ```
+In the above option instead of cpus and memory, shirt_size can be used as well if the blueprint has shirt size option enabled. e.g. of shirt size can be like value.small, value.medium etc, 
 
 Now, submit your request!  The client will return a new "Request" object you can use to query for status.
 

data/Rakefile

@@ -20,4 +20,4 @@ rescue LoadError
   puts "github_changelog_generator is not available. gem install github_changelog_generator to generate changelogs"
 end
 
-task default: [ :spec, :rubocop ]
+task default: %i{spec rubocop}

data/lib/vra/catalog.rb

@@ -27,12 +27,12 @@ module Vra
 
     def all_items
       client.http_get_paginated_array!("/catalog-service/api/consumer/catalogItems")
-            .map! { |x| Vra::CatalogItem.new(client, data: x) }
+        .map! { |x| Vra::CatalogItem.new(client, data: x) }
     end
 
     def entitled_items
       client.http_get_paginated_array!("/catalog-service/api/consumer/entitledCatalogItems")
-            .map! { |x| Vra::CatalogItem.new(client, data: x["catalogItem"]) }
+        .map! { |x| Vra::CatalogItem.new(client, data: x["catalogItem"]) }
     end
 
     def request(*args)

data/lib/vra/catalog_item.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require "vra/catalog"
 
 module Vra
@@ -107,7 +107,7 @@ module Vra
         data = JSON.parse(contents)
         pretty_contents = JSON.pretty_generate(data)
         File.write(filename, pretty_contents)
-        return filename
+        filename
       rescue Vra::Exception::HTTPError => e
         raise e
       end

data/lib/vra/catalog_request.rb

@@ -29,13 +29,14 @@ module Vra
   class CatalogRequest
     attr_reader :catalog_id, :catalog_item, :client, :custom_fields
     attr_writer :subtenant_id, :template_payload
-    attr_accessor :cpus, :memory, :requested_for, :lease_days, :notes
+    attr_accessor :cpus, :memory, :shirt_size, :requested_for, :lease_days, :notes
 
     def initialize(client, catalog_id, opts = {})
       @client            = client
       @catalog_id        = catalog_id
       @cpus              = opts[:cpus]
       @memory            = opts[:memory]
+      @shirt_size        = opts[:shirt_size]
       @requested_for     = opts[:requested_for]
       @lease_days        = opts[:lease_days]
       @notes             = opts[:notes]
@@ -55,6 +56,7 @@ module Vra
       opts = {}
       opts[:cpus] = blueprint_data["data"]["cpu"]
       opts[:memory] = blueprint_data["data"]["memory"]
+      opts[:shirt_size] = blueprint_data["data"]["size"]
       opts[:requested_for] = hash_payload["requestedFor"]
       opts[:lease_days] = blueprint_data.fetch("leaseDays", nil) || hash_payload["data"].fetch("_lease_days", 1)
       opts[:description] = hash_payload["description"]
@@ -86,11 +88,11 @@ module Vra
 
     def validate_params!
       missing_params = []
-      [ :catalog_id, :cpus, :memory, :requested_for, :subtenant_id ].each do |param|
+      %i{catalog_id cpus memory requested_for subtenant_id }.each do |param|
         missing_params << param.to_s if send(param).nil?
       end
 
-      raise ArgumentError, "Unable to submit request, required param(s) missing => #{missing_params.join(', ')}" unless missing_params.empty?
+      raise ArgumentError, "Unable to submit request, required param(s) missing => #{missing_params.join(", ")}" unless missing_params.empty?
     end
 
     # @return [String] - the current catalog template payload merged with the settings applied from this request
@@ -100,6 +102,7 @@ module Vra
       blueprint_name = hash_payload["data"].select { |_k, v| v.is_a?(Hash) }.keys.first
       hash_payload["data"][blueprint_name]["data"]["cpu"] = @cpus
       hash_payload["data"][blueprint_name]["data"]["memory"] = @memory
+      hash_payload["data"][blueprint_name]["data"]["size"] = @shirt_size
       hash_payload["requestedFor"] = @requested_for
       hash_payload["data"]["_leaseDays"] = @lease_days
       hash_payload["description"] = @notes
@@ -123,7 +126,7 @@ module Vra
       begin
         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(', ')}"
+        raise Vra::Exception::RequestError, "Unable to submit request: #{e.errors.join(", ")}"
       rescue
         raise
       end

data/lib/vra/client.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require "passwordmasker"
 require "vra/http"
 
@@ -154,6 +154,7 @@ module Vra
         items += response["content"]
 
         break if page >= response["metadata"]["totalPages"]
+
         page += 1
       end
 

data/lib/vra/exceptions.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 
 module Vra
   module Exception

data/lib/vra/http.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-require "net/http"
-require "openssl"
+require "net/http" unless defined?(Net::HTTP)
+require "openssl" unless defined?(OpenSSL)
 
 module Vra
   module Http
@@ -10,10 +10,11 @@ module Vra
       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(request.params[:payload]).to_json.gsub(/\"password\":\"(.+)\",/, '"password":"********",' )}" 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
 
@@ -29,7 +30,7 @@ module Vra
       end
 
       def redirectable?
-        [:get, :head].include?(params[:method])
+        %i{get head}.include?(params[:method])
       end
 
       def redirect_to(location)
@@ -75,6 +76,7 @@ module Vra
 
       def verify_ssl?
         return true if params[:verify_ssl].nil?
+
         params[:verify_ssl]
       end
     end
@@ -89,6 +91,7 @@ module Vra
       def forward(request)
         if redirect?
           raise Http.error(self) unless request.redirectable?
+
           request.redirect_to(location)
         elsif see_other?
           request.see_other(location)

data/lib/vra/request.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 
 module Vra
   class Request

data/lib/vra/resource.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 
 module Vra
   class Resource
@@ -50,6 +50,7 @@ module Vra
     def self.by_name(client, name)
       raise ArgumentError.new("name cannot be nil") if name.nil?
       raise ArgumentError.new("client cannot be nil") if client.nil?
+
       Resources.all(client).find { |r| r.name.downcase =~ /#{name.downcase}/ }
     end
 

data/lib/vra/version.rb

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

data/spec/catalog_item_spec.rb

@@ -166,20 +166,20 @@ describe Vra::CatalogItem do
 
       it "#dump_template" do
         expect(client).to receive(:http_get).with("/catalog-service/api/consumer/entitledCatalogItems/#{catalog_id}/requests/template")
-                              .and_return(response)
+          .and_return(response)
         described_class.dump_template(client, catalog_id )
       end
 
       it "#write_template" do
         allow(client).to receive(:http_get).with("/catalog-service/api/consumer/entitledCatalogItems/#{catalog_id}/requests/template")
-                             .and_return(response)
+          .and_return(response)
         expect(File).to receive(:write).with("9e98042e-5443-4082-afd5-ab5a32939bbc.json", JSON.pretty_generate(catalog_item_payload))
         expect(described_class.write_template(client, catalog_id)).to eq("9e98042e-5443-4082-afd5-ab5a32939bbc.json")
       end
 
       it "#write_template with custom filename" do
         allow(client).to receive(:http_get).with("/catalog-service/api/consumer/entitledCatalogItems/#{catalog_id}/requests/template")
-                             .and_return(response)
+          .and_return(response)
         expect(File).to receive(:write).with("somefile.json", JSON.pretty_generate(catalog_item_payload))
         expect(described_class.write_template(client, catalog_id, "somefile.json")).to eq("somefile.json")
       end
@@ -243,13 +243,13 @@ describe Vra::CatalogItem do
 
         before(:each) do
           allow(client).to receive(:http_get_paginated_array!).with("/catalog-service/api/consumer/entitledCatalogItems")
-                                .and_return([ entitled_catalog_item, entitled_catalog_item2 ])
+            .and_return([ entitled_catalog_item, entitled_catalog_item2 ])
           allow(client).to receive(:http_get)
-                               .with("/catalog-service/api/consumer/entitledCatalogItems/d29efd6b-3cd6-4f8d-b1d8-da4ddd4e52b1/requests/template")
-                               .and_return(response)
+            .with("/catalog-service/api/consumer/entitledCatalogItems/d29efd6b-3cd6-4f8d-b1d8-da4ddd4e52b1/requests/template")
+            .and_return(response)
           allow(client).to receive(:http_get)
-                               .with("/catalog-service/api/consumer/entitledCatalogItems/3232323e-5443-4082-afd5-ab5a32939bbc/requests/template")
-                               .and_return(response)
+            .with("/catalog-service/api/consumer/entitledCatalogItems/3232323e-5443-4082-afd5-ab5a32939bbc/requests/template")
+            .and_return(response)
           allow(File).to receive(:write).with("vra_templates/d29efd6b-3cd6-4f8d-b1d8-da4ddd4e52b1.json", JSON.pretty_generate(catalog_item_payload))
           allow(File).to receive(:write).with("vra_templates/3232323e-5443-4082-afd5-ab5a32939bbc.json", JSON.pretty_generate(catalog_item_payload))
           allow(File).to receive(:write).with("vra_templates/windowsserver2012.json", JSON.pretty_generate(catalog_item_payload))
@@ -271,7 +271,7 @@ describe Vra::CatalogItem do
 
         it "#dump_templates with id" do
           expect(described_class.dump_templates(client, "vra_templates", true))
-              .to eq(["vra_templates/d29efd6b-3cd6-4f8d-b1d8-da4ddd4e52b1.json",
+            .to eq(["vra_templates/d29efd6b-3cd6-4f8d-b1d8-da4ddd4e52b1.json",
                       "vra_templates/3232323e-5443-4082-afd5-ab5a32939bbc.json"])
 
         end

data/spec/catalog_request_spec.rb

@@ -206,12 +206,12 @@ describe Vra::CatalogRequest do
         allow(client).to receive(:authorize!).and_return(true)
         allow(client).to receive(:http_post).with("/catalog-service/api/consumer/requests", "{}").and_return(response)
         allow(client).to receive(:http_get).with("/catalog-service/api/consumer/entitledCatalogItems/catalog-12345/requests/template")
-                             .and_return(request_template_response)
+          .and_return(request_template_response)
       end
 
       it "calls http_get template" do
         expect(client).to receive(:http_get).with("/catalog-service/api/consumer/entitledCatalogItems/catalog-12345/requests/template")
-                              .and_return(request_template_response)
+          .and_return(request_template_response)
         allow(client).to receive(:http_post).with("/catalog-service/api/consumer/entitledCatalogItems/catalog-12345/requests", request.merged_payload).and_return(response)
         request.submit
       end

data/spec/client_spec.rb

@@ -226,7 +226,7 @@ describe Vra::Client do
                                                   url: full_url,
                                                   headers: headers,
                                                   verify_ssl: verify_ssl)
-                               .and_return(response)
+        .and_return(response)
 
       client_without_ssl.http_head(path)
     end
@@ -399,7 +399,7 @@ describe Vra::Client do
 
         unverified_client.http_post("/path", "payload")
 
-        [:head, :get].each do |method|
+        %i{head get}.each do |method|
           unverified_client.http_fetch(method, "/test", true)
         end
       end

data/spec/http_spec.rb

@@ -117,7 +117,7 @@ describe Vra::Http do
 
     context "when redirected" do
       [301, 302, 307].each do |status|
-        [:get, :head].each do |method|
+        %i{get head}.each do |method|
           it "follows #{status} redirected #{method.to_s.upcase} requests" do
             stub_request(method, "http://test.local")
               .to_return(status: [status, "redirect"],
@@ -140,7 +140,7 @@ describe Vra::Http do
         end
       end
 
-      [:head, :post].each do |method|
+      %i{head post}.each do |method|
         it "converts #{method.to_s.upcase} to GET on 303 redirect" do
           stub_request(method, "http://test.local")
             .to_return(status: [303, "See Other"],

data/spec/resources_spec.rb

@@ -31,8 +31,8 @@ describe Vra::Resources do
 
   it "#all" do
     allow(client).to receive(:http_get_paginated_array!)
-    .with("/catalog-service/api/consumer/resources")
-    .and_return([ { "id" => "1" }, { "id" => "2" } ])
+      .with("/catalog-service/api/consumer/resources")
+      .and_return([ { "id" => "1" }, { "id" => "2" } ])
 
     items = resources.all_resources
 

data/vmware-vra.gemspec

@@ -1,6 +1,5 @@
-# coding: utf-8
 # frozen_string_literal: true
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "vra/version"
 
@@ -22,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ffi-yajl",       "~> 2.2"
   spec.add_dependency "passwordmasker", "~> 1.2"
 
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler", ">= 1.7"
   spec.add_development_dependency "chefstyle"
   spec.add_development_dependency "github_changelog_generator"
   spec.add_development_dependency "pry",     "~> 0.10"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmware-vra
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Adam Leff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-28 00:00:00.000000000 Z
+date: 2020-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
@@ -43,14 +43,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
@@ -207,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Client gem for interacting with VMware vRealize Automation.