kitchen-oci 1.14.0 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0cea9f46ffa83a8b4e5f7eed890889aa6265631e5cfbea839169f31e0dccaa7
-  data.tar.gz: 213c557476fce406d144335deba42318dd0a4fbb8820b4754b37acf1f4460bf0
+  metadata.gz: 3e3fbf95593303d5f9538c59a7f07eb03dd1871b05b12ca0a82e5d2ed9b529b4
+  data.tar.gz: d0c4e60f05ebaf18293ce93bad6f6a52d5d9657de9a0d34b4bb1d61ddaf3d57e
 SHA512:
-  metadata.gz: 23272af5f39d286faf4affcd9b1966d5b67a531fe300614a9fe982d443af8fcac016aa511b6f953f790c425a75b6582eb1dbc010c3ce9fa3195cacdfba2506f6
-  data.tar.gz: a8b5c341ee9762d0d246e192a443dbe98f13e28b24c58b7674d80484b792d348e8dfdb0644252246a823832987201b6a7aa966809b5a8d5b2d5744db6189d8e0
+  metadata.gz: dac56f0b424e0b74ca273de0242d5f0883c95eee61c4e086a7cfa66c9382b9b933f5eb907099c83860f1a44c64c10277a0a656e56c755658a44b548b824c2875
+  data.tar.gz: 19adf812199ecbba332985656ffbcc67252107f3f3d1ae2d9fbd1401a9c05e00342bf3d0ba2285f76388ba3075b111de0cb54dab43b94de8424c9ff3359aa04c

data/lib/kitchen/driver/oci.rb

@@ -67,6 +67,7 @@ module Kitchen
       default_config :use_token_auth, false
       default_config :preemptible_instance, false
       default_config :shape_config, {}
+      default_config :custom_metadata, {}
 
       # dbaas config items
       default_config :dbaas, {}
@@ -347,6 +348,10 @@ module Kitchen
         inject_powershell(state) if config[:setup_winrm] == true
 
         metadata = {}
+        md = config[:custom_metadata]
+        md.each do |key, value|
+          metadata.store(key, value)
+        end
         metadata.store('ssh_authorized_keys', pubkey)
         data = user_data
         metadata.store('user_data', data) if config[:user_data] && !config[:user_data].empty?
@@ -495,7 +500,7 @@ module Kitchen
         created_vol = []
         config[:volumes].each do |vol_settings|
           # convert to hash because otherwise it's an an OCI API Object and won't load
-          volume_attachment_type = vol_settings[:type].downcase || 'paravirtual'
+          volume_attachment_type = vol_settings[:type] ? vol_settings[:type].downcase : 'paravirtual'
           unless %w[iscsi paravirtual].include?(volume_attachment_type)
             info("invalid volume attachment type: #{volume_attachment_type}")
             next
@@ -514,7 +519,7 @@ module Kitchen
       end
 
       def volume_create(availability_domain, display_name, size_in_gbs, vpus_per_gb)
-        info("Creating volume <#{display_name}>...")
+        info("Creating <#{display_name}>...")
         result = blockstorage_api.create_volume(
           OCI::Core::Models::CreateVolumeDetails.new(
             compartment_id: compartment_id,
@@ -526,28 +531,29 @@ module Kitchen
         )
         get_volume_response = blockstorage_api.get_volume(result.data.id)
                                               .wait_until(:lifecycle_state, OCI::Core::Models::Volume::LIFECYCLE_STATE_AVAILABLE)
-        info("Finished creating volume <#{display_name}>.")
-        state_data = {
-          :id => get_volume_response.data.id
+        info("Finished creating <#{display_name}>.")
+        {
+          id: get_volume_response.data.id,
+          display_name: get_volume_response.data.display_name
         }
       end
 
       def volume_delete(volume_id)
-        info("Deleting volume: <#{volume_id}>...")
+        info("Deleting <#{volume_id}>...")
         blockstorage_api.delete_volume(volume_id)
         blockstorage_api.get_volume(volume_id)
                         .wait_until(:lifecycle_state, OCI::Core::Models::Volume::LIFECYCLE_STATE_TERMINATED)
-        info("Deleted volume: <#{volume_id}>")
+        info("Finished deleting <#{volume_id}>.")
       end
 
       def process_volume_attachments(state)
         attachments = []
         state[:volumes].each do |volume|
-          info("Attaching Volume: #{volume[:displayName]} - #{volume[:attachment_type]}")
+          info("Attaching <#{volume[:display_name]}>...")
           details = volume_create_attachment_details(volume, state[:server_id])
           attachment = volume_attach(details).to_hash
           attachments << attachment
-          info("Attached Volume #{volume[:displayName]} - #{volume[:attachment_type]}")
+          info("Finished attaching <#{volume[:display_name]}>.")
         end
         attachments
       end
@@ -559,7 +565,7 @@ module Kitchen
             volume_id: volume[:id],
             instance_id: instance_id
           )
-        elsif volume[:attachment_type].eq?('paravirtual')
+        elsif volume[:attachment_type].eql?('paravirtual')
           OCI::Core::Models::AttachParavirtualizedVolumeDetails.new(
             display_name: 'paravirtAttachment',
             volume_id: volume[:id],
@@ -574,19 +580,22 @@ module Kitchen
           comp_api.get_volume_attachment(result.data.id)
                   .wait_until(:lifecycle_state, OCI::Core::Models::VolumeAttachment::LIFECYCLE_STATE_ATTACHED)
         state_data = {
-          :id => get_volume_attachment_response.data.id,
-          :iqn_ipv4 => get_volume_attachment_response.data.ipv4,
-          :iqn => get_volume_attachment_response.data.iqn,
-          :port => get_volume_attachment_response.data.port,
+          id: get_volume_attachment_response.data.id
         }
+        if get_volume_attachment_response.data.attachment_type == 'iscsi'
+          state_data.store(:iqn_ipv4, get_volume_attachment_response.data.ipv4)
+          state_data.store(:iqn, get_volume_attachment_response.data.iqn)
+          state_data.store(:port, get_volume_attachment_response.data.port)
+        end
+        state_data
       end
 
       def volume_detach(volume_attachment)
-        info("Detaching volume: #{volume_attachment[:id]}")
+        info("Detaching <#{volume_attachment[:id]}>...")
         comp_api.detach_volume(volume_attachment[:id])
         comp_api.get_volume_attachment(volume_attachment[:id])
                 .wait_until(:lifecycle_state, OCI::Core::Models::VolumeAttachment::LIFECYCLE_STATE_DETACHED)
-        info("Detached volume: #{volume_attachment[:id]}")
+        info("Finished detaching <#{volume_attachment[:id]}>.")
       end
 
       #################

data/lib/kitchen/driver/oci_version.rb

@@ -20,6 +20,6 @@
 module Kitchen
   module Driver
     # Version string for Oracle OCI Kitchen driver
-    OCI_VERSION = '1.14.0'
+    OCI_VERSION = '1.15.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-oci
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.1
 platform: ruby
 authors:
 - Stephen Pearson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-20 00:00:00.000000000 Z
+date: 2024-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oci