vmware-vra 2.6.0 → 2.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +12 -2
- data/lib/vra/catalog_request.rb +1 -19
- data/lib/vra/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c5dcc8f5abbb59b980895b3970c86f73e49fe379
|
|
4
|
+
data.tar.gz: 78746f7b4706f0ae7adcce6cffcd8a2f5fd178c2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 26479fc2672a80ddf7b83f9b5bafedbe803304b1f580ffcd7603512f08a8e936d7b14933c36be801a010728441c0502cc55d7822c9591eb5b5c9bc9b6cfa294a
|
|
7
|
+
data.tar.gz: ccd9fdf91aa926facc9bb8d8819fa73a653217b349ea79da6bc490917df1958a9ab5346d8f48c0090a4c764ba84303297997a6a8b2ddc1e604503963a3fafbaa
|
data/CHANGELOG.md
CHANGED
|
@@ -1,7 +1,17 @@
|
|
|
1
1
|
# Change Log
|
|
2
2
|
|
|
3
|
-
## [
|
|
3
|
+
## [2.6.1](https://github.com/chef-partners/vmware-vra-gem/tree/2.6.1) (2018-07-31)
|
|
4
|
+
[Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.6.0...2.6.1)
|
|
4
5
|
|
|
6
|
+
**Closed issues:**
|
|
7
|
+
|
|
8
|
+
- Vra::Resource\#ip\_addresses non-deterministically returns an empty array in error [\#65](https://github.com/chef-partners/vmware-vra-gem/issues/65)
|
|
9
|
+
|
|
10
|
+
**Merged pull requests:**
|
|
11
|
+
|
|
12
|
+
- Removed the deep merge [\#68](https://github.com/chef-partners/vmware-vra-gem/pull/68) ([jjasghar](https://github.com/jjasghar))
|
|
13
|
+
|
|
14
|
+
## [v2.6.0](https://github.com/chef-partners/vmware-vra-gem/tree/v2.6.0) (2018-03-01)
|
|
5
15
|
[Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.5.2...v2.6.0)
|
|
6
16
|
|
|
7
17
|
**Closed issues:**
|
|
@@ -266,4 +276,4 @@
|
|
|
266
276
|
|
|
267
277
|
|
|
268
278
|
|
|
269
|
-
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
|
|
279
|
+
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
|
data/lib/vra/catalog_request.rb
CHANGED
|
@@ -96,7 +96,6 @@ module Vra
|
|
|
96
96
|
hash_payload["requestedFor"] = @requested_for
|
|
97
97
|
hash_payload["data"]["_leaseDays"] = @lease_days
|
|
98
98
|
hash_payload["description"] = @notes
|
|
99
|
-
JSON.pretty_generate(deep_merge(hash_payload, parameters))
|
|
100
99
|
end
|
|
101
100
|
|
|
102
101
|
# @return [String] - the current catalog template payload merged with the settings applied from this request
|
|
@@ -114,7 +113,7 @@ module Vra
|
|
|
114
113
|
validate_params!
|
|
115
114
|
|
|
116
115
|
begin
|
|
117
|
-
post_response = client.http_post("/catalog-service/api/consumer/entitledCatalogItems/#{@catalog_id}/requests",
|
|
116
|
+
post_response = client.http_post("/catalog-service/api/consumer/entitledCatalogItems/#{@catalog_id}/requests", template_payload)
|
|
118
117
|
rescue Vra::Exception::HTTPError => e
|
|
119
118
|
raise Vra::Exception::RequestError, "Unable to submit request: #{e.errors.join(', ')}"
|
|
120
119
|
rescue
|
|
@@ -123,22 +122,5 @@ module Vra
|
|
|
123
122
|
request_id = JSON.parse(post_response.body)["id"]
|
|
124
123
|
Vra::Request.new(client, request_id)
|
|
125
124
|
end
|
|
126
|
-
|
|
127
|
-
def deep_merge(first, second)
|
|
128
|
-
merger = proc do |key, v1, v2|
|
|
129
|
-
if Hash === v1 && Hash === v2
|
|
130
|
-
v1.merge(v2, &merger)
|
|
131
|
-
elsif Array === v1 && Array === v2
|
|
132
|
-
v1 | v2
|
|
133
|
-
elsif [:undefined, nil, :nil].include?(v2)
|
|
134
|
-
v1
|
|
135
|
-
else
|
|
136
|
-
v2
|
|
137
|
-
end
|
|
138
|
-
end
|
|
139
|
-
first.merge(second.to_h, &merger)
|
|
140
|
-
end
|
|
141
|
-
|
|
142
|
-
private :deep_merge
|
|
143
125
|
end
|
|
144
126
|
end
|
data/lib/vra/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: vmware-vra
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.6.
|
|
4
|
+
version: 2.6.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Adam Leff
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2018-
|
|
12
|
+
date: 2018-07-31 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: ffi-yajl
|