kitchen-oci 1.17.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4447f287a8b33c9959c977d4fd50ce99c0f977dcb72438e266b3f936b5ef3a43
-  data.tar.gz: 6a8520b6c8d837a71065044ed1e570efa3b303965670d4ce4fcc61de5a4807b6
+  metadata.gz: 04441716ec20ae5cf111a087f07990af96826770804f92a67edaa7335622391a
+  data.tar.gz: 378640fe182082b49904fcef4671c7954bb794a51090c7e29a74ad25128addd0
 SHA512:
-  metadata.gz: a9476e56b93733a640744a3ed8c1f0f4b7dd043000035a5d8d86d8e57cefb302c804c034dc2f1f666ad1175b2ffadb609664f1be4be3886b4d8aabc1ac38cff5
-  data.tar.gz: a3c7e8522bf457603f7376387247bec8fdfb9f7d266c630771c5e612577954318cd2873397795d1a440ad2f4c11601cc57bd6a0d5c200eeee71464f50805ee49
+  metadata.gz: 8cddfba0d04e8a8634656694b1158e9ea6e87eed48bb78b1f949d32aa2b2d0e58de38326c802da9ece1de1d5da209eab75c6b7d6e1e6f2c0e7224fa1dc81033a
+  data.tar.gz: 7ed171e81ff8ab9d2559df7b9a4bab80d5d7fee5440ac0816971def8b48e6d4e65eed1b098b2f95cd1d5658e702c8523e053d05998a2929cb41636b846f4d674

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

@@ -49,10 +49,18 @@ module Kitchen
             )
           end
 
+          def agent_config
+            launch_details.agent_config = OCI::Core::Models::LaunchInstanceAgentConfigDetails.new(
+              are_all_plugins_disabled: config[:all_plugins_disabled],
+              is_management_disabled: config[:management_disabled],
+              is_monitoring_disabled: config[:monitoring_disabled]
+            )
+          end
+
           def instance_source_details
             launch_details.source_details = OCI::Core::Models::InstanceSourceViaImageDetails.new(
               sourceType: "image",
-              imageId: config[:image_id],
+              imageId: image_id,
               bootVolumeSizeInGBs: config[:boot_volume_size_in_gbs]
             )
           end

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

@@ -44,7 +44,7 @@ module Kitchen
           end
 
           def pdb_name
-            database_details.pdb_name = config[:dbaas][:pdb_name] ||= "pdb001"
+            database_details.pdb_name = config[:dbaas][:pdb_name]
           end
 
           def db_backup_config

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

@@ -53,6 +53,41 @@ module Kitchen
 
           private
 
+          def image_id
+            return config[:image_id] if config[:image_id]
+
+            raise "must specify either image_id or image_name" unless config[:image_name]
+
+            image_id_by_name
+          end
+
+          def image_id_by_name
+            image_name = config[:image_name].gsub(" ", "-")
+            image_list = images.select { |i| i.display_name.match?(/#{image_name}/) }
+            raise "unable to find image_id" if image_list.empty?
+
+            image_list = filter_image_list(image_list, image_name) if image_list.count > 1
+            raise "unable to find image_id" if image_list.empty?
+
+            latest_image_id(image_list)
+          end
+
+          def filter_image_list(image_list, image_name)
+            image_list.select { |i| i.display_name.match?(/#{image_name}-[0-9]{4}\.[0-9]{2}\.[0-9]{2}/) }
+          end
+
+          def latest_image_id(image_list)
+            image_list.sort_by! { |o| ((DateTime.parse(Time.now.utc.to_s) - o.time_created) * 24 * 60 * 60).to_i }.first.id
+          end
+
+          def images(image_list = [], page = nil)
+            current_images = api.compute.list_images(oci.compartment, page: page)
+            next_page = current_images.next_page
+            image_list << current_images.data
+            images(image_list, next_page) unless next_page.nil?
+            image_list.flatten
+          end
+
           def instance_ip(instance_id)
             vnic = vnics(instance_id).select(&:is_primary).first
             if public_ip_allowed?

data/lib/kitchen/driver/oci.rb

@@ -51,7 +51,8 @@ module Kitchen
       default_config :compartment_id, nil
       default_config :compartment_name, nil
       default_config :instance_type, "compute"
-      default_config :image_id
+      default_config :image_id, nil
+      default_config :image_name, nil
       default_config :hostname_prefix do |hnp|
         hnp.instance.name
       end
@@ -67,6 +68,9 @@ module Kitchen
       default_config :use_token_auth, false
       default_config :shape_config, {}
       default_config :nsg_ids, []
+      default_config :all_plugins_disabled, false
+      default_config :management_disabled, false
+      default_config :monitoring_disabled, false
 
       # compute only configs
       default_config :setup_winrm, false

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.17.0"
+    OCI_VERSION = "1.18.0"
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-oci
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.18.0
 platform: ruby
 authors:
 - Stephen Pearson
+- Justin Steele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-02 00:00:00.000000000 Z
+date: 2024-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oci
@@ -111,6 +112,7 @@ dependencies:
 description: A Test Kitchen Driver for Oracle OCI
 email:
 - stephen.pearson@oracle.com
+- justin.steele@oracle.com
 executables: []
 extensions: []
 extra_rdoc_files: []