kitchen-vra 3.2.1 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 763ef43f1f069167f4745436838b49e370deecc12055da82519b7d5249b08317
-  data.tar.gz: 594985e266bd2389c42efeedb09868f37499e8ee5933980e92989ab7c1e3e845
+  metadata.gz: 91e7615f23a44ae83327415c6648fdc8b3950c56ff18f0aab216ed19a7902a00
+  data.tar.gz: 8266b22c55a1f4d0d63d50b16be20fd6765fcf3cc92f4c3f4730bf70a5ab289f
 SHA512:
-  metadata.gz: 0da0c199033bb8a8e17cca31ae04a6e11a05a49afd9737bb6b70255ed30a4ad1496ef9142cc6ebe447dfed39e8d2c2b7908269aec96e61a19f956ff7d027688f
-  data.tar.gz: 8c9afb831b2e0e97594a69154f325feea7b968dfd9cafcdd619482015db2bcd2179bbba7e9060873fe7a35723878da3ca810bff4402e2c65df94b8eb34dc3dfd
+  metadata.gz: 8c5ae9e75bef239d5c4751100aa5a5c4c30cf135a4ed24831e2ee522d46ce5ce6090e86cf7fb7bd2a13df8968a93d0b2924c9caee7812c2340a75bfa8b6e94d2
+  data.tar.gz: 3772f71069fa0f70095925a1008b728d40d91a27a6248b39e5ec1684d6849b4556cf75ca553e57f681829b01a23ee86084b084f4dde4c2f5d8d245132c1a5d5f

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [v3.3.1](https://github.com/chef-partners/kitchen-vra/tree/v3.3.1)
+
+[Full Changelog](https://github.com/chef-partners/kitchen-vra/compare/v3.3.0...v3.3.1)
+
+- Fixed the issue with catalog lookup using catalog_name config [\#61](https://github.com/chef-partners/kitchen-vra/pull/61) ([ashiqueps](https://github.com/ashiqueps))
+
+## [v3.3.0](https://github.com/chef-partners/kitchen-vra/tree/v3.3.0)
+
+[Full Changelog](https://github.com/chef-partners/kitchen-vra/compare/v3.2.1...v3.3.0)
+
+- Replaced the tenant attribute with the domain attribute [\#59](https://github.com/chef-partners/kitchen-vra/pull/59) ([ashiqueps](https://github.com/ashiqueps))
+
 ## [v3.2.1](https://github.com/chef-partners/kitchen-vra/tree/v3.2.1)
 
 [Full Changelog](https://github.com/chef-partners/kitchen-vra/compare/v3.2.0...v3.2.1)

data/kitchen-vra.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.7"
 
   spec.add_dependency "test-kitchen"
-  spec.add_dependency "vmware-vra", ">= 3.1.0" # 3.0 required for vRA 8.x
+  spec.add_dependency "vmware-vra", "~> 3.0", ">= 3.2.0" # 3.0 required for vRA 8.x
   spec.add_dependency "highline"
   spec.add_dependency "rack", ">= 1.6", "< 3.0"
   spec.add_dependency "ffi-yajl", ">= 2.2.3", "< 2.5.0"

data/lib/kitchen/driver/vra.rb

@@ -35,17 +35,16 @@ module Kitchen
       default_config :username, nil
       default_config :password, nil
       required_config :base_url
-      required_config :tenant
+      required_config :domain
       required_config :project_id
       required_config :image_mapping
       required_config :flavor_mapping
 
+      default_config :tenant, nil
       default_config :version, nil
       default_config :catalog_id, nil
       default_config :catalog_name, nil
 
-      default_config :subtenant_id, nil
-      default_config :subtenant_name, nil
       default_config :verify_ssl, true
       default_config :request_timeout, 600
       default_config :request_refresh_rate, 2
@@ -64,6 +63,10 @@ module Kitchen
       default_config :use_dns, false
       default_config :dns_suffix, nil
 
+      deprecate_config_for :tenant, Util.outdent!("
+        In vRA 8.x, the 'tenant' configuration is no longer relevant for authentication.
+        Please use the 'domain' configuration in its place.".dup)
+
       def name
         "vRA"
       end
@@ -213,15 +216,19 @@ module Kitchen
       def catalog_request # rubocop:disable Metrics/MethodLength
         unless 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)
+          catalog_items = vra_client.catalog.fetch_catalog_items(config[:catalog_name])
           begin
-            config[:catalog_id] = parsed_json["content"][0]["catalogItemId"]
+            config[:catalog_id] = catalog_items[0].id
+            info("Using Catalog with ID: #{catalog_items[0].id}")
           rescue
-            puts "Unable to retrieve Catalog ID from Catalog Name: #{config[:catalog_name]}"
+            error("Unable to retrieve Catalog ID from Catalog Name: #{config[:catalog_name]}")
           end
         end
 
+        if config[:catalog_id].nil?
+          raise Kitchen::InstanceFailure, "Unable to create deployment without a valid catalog"
+        end
+
         deployment_params = {
           image_mapping: config[:image_mapping],
           flavor_mapping: config[:flavor_mapping],
@@ -232,18 +239,6 @@ module Kitchen
 
         catalog_request = vra_client.catalog.request(config[:catalog_id], deployment_params)
 
-        unless config[:subtenant_name].nil?
-          info("Fetching Subtenant ID by Subtenant Name")
-          response = vra_client.fetch_subtenant_items(config[:tenant], config[:subtenant_name])
-          parsed_json = JSON.parse(response.body)
-          begin
-            config[:subtenant_id] = parsed_json["content"][0]["id"]
-          rescue
-            puts "Unable to retrieve Subtenant ID from Subtenant Name: #{config[:subtenant_name]}"
-          end
-        end
-        catalog_request.subtenant_id = config[:subtenant_id] unless config[:subtenant_id].nil?
-
         config[:extra_parameters].each do |key, value_data|
           catalog_request.set_parameters(key, value_data)
         end
@@ -257,7 +252,7 @@ module Kitchen
           base_url:   config[:base_url],
           username:   config[:username],
           password:   config[:password],
-          tenant:     config[:tenant],
+          domain:     config[:domain],
           verify_ssl: config[:verify_ssl]
         )
       rescue => _e

data/lib/kitchen/driver/vra_version.rb

@@ -20,6 +20,6 @@
 
 module Kitchen
   module Driver
-    VRA_VERSION = "3.2.1"
+    VRA_VERSION = "3.3.1"
   end
 end

data/spec/vra_spec.rb

@@ -36,14 +36,14 @@ describe Kitchen::Driver::Vra do
       base_url:        "https://vra.corp.local",
       username:        "myuser",
       password:        "mypassword",
-      tenant:          "mytenant",
+      domain:          "mytenant.corp.com",
       project_id:      "6ba69375-79d5-42c3-a099-7d32739f71a7",
       image_mapping:   "VRA-nc-lnx-ce8.4-Docker",
       flavor_mapping:  "Small",
       verify_ssl:      true,
-      subtenant_id:    "160b473a-0ec9-473d-8156-28dd96c0b6b7",
       use_dns:         false,
       deployment_name: "test-instance",
+      catalog_id:      "1536b95d-68fe-3c68-9417-46ed24bee3ef",
     }
   end
 
@@ -399,7 +399,7 @@ describe Kitchen::Driver::Vra do
       allow(driver).to receive(:vra_client).and_return(vra_client)
       allow(vra_client).to receive(:catalog).and_return(catalog)
       allow(catalog).to receive(:request).and_return(catalog_request)
-      %i{subtenant_id= set_parameter}.each do |method|
+      %i{catalog_id= set_parameter}.each do |method|
         allow(catalog_request).to receive(method)
       end
     end
@@ -415,16 +415,17 @@ describe Kitchen::Driver::Vra do
           base_url:        "https://vra.corp.local",
           username:        "myuser",
           password:        "mypassword",
-          tenant:          "mytenant",
+          domain:          "domain.corp.com",
           verify_ssl:      true,
           project_id:      "6ba69375-79d5-42c3-a099-7d32739f71a7",
           image_mapping:   "VRA-nc-lnx-ce8.4-Docker",
           flavor_mapping:  "Small",
+          catalog_id:      "2kabc423-af89-56fc-990a-82fab34ed12",
         }
       end
 
       it "does not attempt to set params on the catalog_request" do
-        expect(catalog_request).not_to receive(:subtenant_id=)
+        expect(catalog_request).not_to receive(:set_parameters)
         driver.catalog_request
       end
     end
@@ -435,11 +436,12 @@ describe Kitchen::Driver::Vra do
           base_url:         "https://vra.corp.local",
           username:         "myuser",
           password:         "mypassword",
-          tenant:           "mytenant",
+          domain:           "mydomain.corp.com",
           verify_ssl:       true,
           project_id:       "6ba69375-79d5-42c3-a099-7d32739f71a7",
           image_mapping:    "VRA-nc-lnx-ce8.4-Docker",
           flavor_mapping:   "Small",
+          catalog_id:      "2kabc423-af89-56fc-990a-82fab34ed12",
           extra_parameters: { "key1" => { type: "string", value: "value1" },
                               "key2" => { type: "integer", value: 123 } },
         }
@@ -458,7 +460,7 @@ describe Kitchen::Driver::Vra do
       expect(Vra::Client).to receive(:new).with(base_url:   config[:base_url],
                                                 username:   config[:username],
                                                 password:   config[:password],
-                                                tenant:     config[:tenant],
+                                                domain:     config[:domain],
                                                 verify_ssl: config[:verify_ssl])
       driver.vra_client
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vra
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.1
 platform: ruby
 authors:
 - Chef Commmunity Tools Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-02 00:00:00.000000000 Z
+date: 2023-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -28,16 +28,22 @@ dependencies:
   name: vmware-vra
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement