kitchen-oci 1.28.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56fb93970dffa638ea0fe9d0f731618cdef737f6174edf7e138fda037217dcbb
-  data.tar.gz: 66ee4bef763c835c93077ae53527bf83ddaa65ec4493098830bb92caa515ab29
+  metadata.gz: 9946d2409c6ed9c114777132492015f7875cfe6e13edb0714042b9201ee5ea17
+  data.tar.gz: 6783581acf13d597aee3ec3adcdb7110582107c84e8e755df6144cfcf81c7244
 SHA512:
-  metadata.gz: d0c9ed658be5c469223f4d5a6a4aeba1fbc9a77f09f0972cc6d1b2c9394a7fc19da039b45799dbfbfaf2ddd8125e2766ceb89c66b3572a144a53c0fec2a66e91
-  data.tar.gz: aac64963fb6ef43b1d2768e21d44cea2b84ac60d42c6ee260bdfeb31ebdc0b295f358d823a7c943109c562d906218cfa79552225edb48dbdb6289c08524edeb3
+  metadata.gz: 7fe83a9162360ab4e1896c0e8c4cb35d0d6af019fe386ab70562092b458f32b1cb0ab1700367d5fbfc7682045591c56bb08f904e928cc45cf51e8a1b51dfd909
+  data.tar.gz: abaed2993b82c06ada0255fedee6145157f3c6db32a870c6d281fb8386e0f86baed575b933f5a0cd7e05fc3e389a29fead4b2e35acdeab3d62e3f8d26e7b2cf3

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

@@ -81,13 +81,6 @@ module Kitchen
             )
           end
 
-          # Adds the instance options property to the launch details.
-          def instance_options
-            return if config[:instance_options].empty?
-
-            launch_details.instance_options = OCI::Core::Models::InstanceOptions.new(config[:instance_options])
-          end
-
           # Adds the source_details property to the launch_details for an instance that is being created from a boot volume.
           def instance_source_via_boot_volume
             return unless config[:boot_volume_id]

data/lib/kitchen/driver/oci/mixin/actions.rb

@@ -33,6 +33,8 @@ module Kitchen
             state_details = inst.launch
             state.merge!(state_details)
             instance.transport.connection(state).wait_until_ready
+            instance_options(state, inst)
+            are_legacy_imds_endpoints_disbled?(state, inst)
           end
 
           # Executes the post script on the instance.
@@ -68,6 +70,36 @@ module Kitchen
             end
           end
 
+          # Applies instance options.
+          #
+          # @param state [Hash] (see Kitchen::StateFile)
+          # @param inst [Class] the specific class of instance being rebooted.
+          def instance_options(state, inst)
+            return unless instance_options?
+
+            inst.logger.info("Applying the following instance options:")
+            config[:instance_options].each { |o, v| inst.logger.info("- #{o}: #{v}") }
+            inst.api.compute.update_instance(state[:server_id], OCI::Core::Models::UpdateInstanceDetails.new(instance_options: OCI::Core::Models::InstanceOptions.new(config[:instance_options])))
+          end
+
+          # Attempts to disable IMDSv1 even if not explicitly specified in the config. This is in line with current security guidance from OCI.
+          # Acts as a guard for setting instance options.
+          def instance_options?
+            return false unless config[:instance_type] == "compute"
+
+            config[:instance_options].merge!(are_legacy_imds_endpoints_disabled: true) unless config[:instance_options].key?(:are_legacy_imds_endpoints_disabled)
+            # Basically tell me if there's more stuff in there than `are_legacy_imds_endpoints_disabled: false`. If so, then proceed to setting it.
+            config[:instance_options].reject { |o, v| o == :are_legacy_imds_endpoints_disabled && !v }.any?
+          end
+
+          # Checks if legacy metadata is disabled.
+          def are_legacy_imds_endpoints_disbled?(state, inst)
+            return unless config[:instance_type] == "compute"
+
+            imds = inst.api.compute.get_instance(state[:server_id]).data.instance_options.are_legacy_imds_endpoints_disabled
+            inst.logger.warn("Legacy IMDSv1 endpoint is enabled.") unless imds
+          end
+
           # Reboots an instance.
           #
           # @param state [Hash] (see Kitchen::StateFile)

data/lib/kitchen/driver/oci_version.rb

@@ -22,6 +22,6 @@ module Kitchen
     # Version string for Oracle OCI Kitchen driver
     #
     # @author Stephen Pearson (<stephen.pearson@oracle.com>)
-    OCI_VERSION = "1.28.0"
+    OCI_VERSION = "2.0.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-oci
 version: !ruby/object:Gem::Version
-  version: 1.28.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Stephen Pearson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-05-22 00:00:00.000000000 Z
+date: 2025-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oci