kitchen-oci 1.19.0 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1d7c6a979b6b660f6276347dac37a38939ce1d5052983d99501afac1a2ddf9f
-  data.tar.gz: b5863f89a61b48ecb90d22aae58d5f0cd841a75ec4c61c61bf84608f3f7938cf
+  metadata.gz: d605c9336d53fbeff2b9b87b00a3c862615d4f46d301ec2fe1deafa43922c39c
+  data.tar.gz: ad8c34ef492edc7b2b6912726cc7978d50ac4a370a624e3640f1fb3931cbbf37
 SHA512:
-  metadata.gz: daad8d4224903f776c41405d6c7d53b021a476b176cfe21887e90f5ba385815b3117383f80ac6bd28969678c272d564e66cb5e0635486d89345149a77397f33b
-  data.tar.gz: c2a6482d468e9b52dd0187c20e7e7569b19a05a99fa2281299f893f5b0fe6468d7ee4e684fdc7a0783b4ffb529117ddc82ac7ef14acc9345bc44f8c050e29936
+  metadata.gz: 27b2cd8c880fd1faff1012abbcaa2a703813841051962c3653c02b2503e07565718a101595dbe1affcba513cd86bd6adcd2a700af97212da9ba420f16cda8921
+  data.tar.gz: 7bc6d52865dd933e2c4fdf896bc11649af610c92e74782821da6bf7cd6525bffabffb0735c9e30261a538d36c82f2c48f5e1e333c356cf1a7712dc6636847d90

data/lib/kitchen/driver/oci/instance/compute.rb

@@ -57,7 +57,9 @@ module Kitchen
             )
           end
 
-          def instance_source_details
+          def instance_source_via_image
+            return if config[:boot_volume_id]
+
             launch_details.source_details = OCI::Core::Models::InstanceSourceViaImageDetails.new(
               sourceType: "image",
               imageId: image_id,
@@ -65,6 +67,15 @@ module Kitchen
             )
           end
 
+          def instance_source_via_boot_volume
+            return unless config[:boot_volume_id]
+
+            launch_details.source_details = OCI::Core::Models::InstanceSourceViaBootVolumeDetails.new(
+              boot_volume_id: clone_boot_volume,
+              sourceType: "bootVolume"
+            )
+          end
+
           def instance_metadata
             launch_details.metadata = metadata
           end

data/lib/kitchen/driver/oci/instance/database.rb

@@ -22,6 +22,12 @@ module Kitchen
       class Instance
         # setter methods that populate the details of OCI::Database::Models::CreateDatabaseDetails
         module DatabaseDetails
+          def database_software_image
+            return unless config[:dbaas][:db_software_image_id]
+
+            database_details.database_software_image_id = config[:dbaas][:db_software_image_id]
+          end
+
           def character_set
             database_details.character_set = config[:dbaas][:character_set] ||= "AL32UTF8"
           end

data/lib/kitchen/driver/oci/instance/db_home.rb

@@ -35,6 +35,12 @@ module Kitchen
           def db_home_display_name
             db_home_details.display_name = ["dbhome", random_number(10)].compact.join
           end
+
+          def db_home_software_image
+            return unless config[:dbaas][:db_software_image_id]
+
+            db_home_details.database_software_image_id = config[:dbaas][:db_software_image_id]
+          end
         end
       end
     end

data/lib/kitchen/driver/oci/instance/dbaas.rb

@@ -29,7 +29,6 @@ module Kitchen
           include DbHomeDetails
           #
           # TODO: add support for the #domain property
-          #       add support for #database_software_image_id property
           #
           def db_home
             launch_details.db_home = db_home_details

data/lib/kitchen/driver/oci/models/compute.rb

@@ -93,6 +93,28 @@ module Kitchen
             image_list.flatten
           end
 
+          def clone_boot_volume
+            info("Cloning boot volume...")
+            cbv = api.blockstorage.create_boot_volume(clone_boot_volume_details)
+            api.blockstorage.get_boot_volume(cbv.data.id).wait_until(:lifecycle_state, OCI::Core::Models::BootVolume::LIFECYCLE_STATE_AVAILABLE)
+            info("Finished cloning boot volume.")
+            cbv.data.id
+          end
+
+          def clone_boot_volume_details
+            OCI::Core::Models::CreateBootVolumeDetails.new(
+              source_details: OCI::Core::Models::BootVolumeSourceFromBootVolumeDetails.new(
+                id: config[:boot_volume_id]
+              ),
+              display_name: boot_volume_display_name,
+              compartment_id: oci.compartment
+            )
+          end
+
+          def boot_volume_display_name
+            "#{api.blockstorage.get_boot_volume(config[:boot_volume_id]).data.display_name} (Clone)"
+          end
+
           def instance_ip(instance_id)
             vnic = vnics(instance_id).select(&:is_primary).first
             if public_ip_allowed?
@@ -114,7 +136,7 @@ module Kitchen
           end
 
           def hostname
-            [config[:hostname_prefix], random_string(6)].compact.join("-")
+            %W{#{config[:hostname_prefix]} #{config[:instance_name]} #{random_string(6)}}.uniq.compact.join("-")
           end
 
           def create_vnic_details(name)

data/lib/kitchen/driver/oci.rb

@@ -52,10 +52,14 @@ module Kitchen
       default_config :compartment_name, nil
       default_config :instance_type, "compute"
       default_config :image_id, nil
+      default_config :boot_volume_id, nil
       default_config :image_name, nil
       default_config :hostname_prefix do |hnp|
         hnp.instance.name
       end
+      default_config :instance_name do |inst|
+        inst.instance.name
+      end
       default_keypath = File.expand_path(File.join(%w{~ .ssh id_rsa.pub}))
       default_config :ssh_keypath, default_keypath
       default_config :post_create_script, nil

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.19.0"
+    OCI_VERSION = "1.20.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-oci
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.20.0
 platform: ruby
 authors:
 - Stephen Pearson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-16 00:00:00.000000000 Z
+date: 2024-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oci