kitchen-oci 1.18.0 → 1.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04441716ec20ae5cf111a087f07990af96826770804f92a67edaa7335622391a
-  data.tar.gz: 378640fe182082b49904fcef4671c7954bb794a51090c7e29a74ad25128addd0
+  metadata.gz: dc3416b97957d72c5262acfed751b388a1387a5e18b85fc02193bc88c2283c72
+  data.tar.gz: 2946ba6f22ac36f50e6699c8d20acbf628ba19ad0d6f80b042d89f3e269aff20
 SHA512:
-  metadata.gz: 8cddfba0d04e8a8634656694b1158e9ea6e87eed48bb78b1f949d32aa2b2d0e58de38326c802da9ece1de1d5da209eab75c6b7d6e1e6f2c0e7224fa1dc81033a
-  data.tar.gz: 7ed171e81ff8ab9d2559df7b9a4bab80d5d7fee5440ac0816971def8b48e6d4e65eed1b098b2f95cd1d5658e702c8523e053d05998a2929cb41636b846f4d674
+  metadata.gz: 5c260f31d16ba17bfdffb4384b93263d7ffe415e45c65a1f6c7b432ca78aa0cc89f14140988cbe9918c01b2c7b2496b2126d3584bc8792e4a31c954b2a6164e0
+  data.tar.gz: d7ba936db2bc7d265bab692250a595b2b94bfe9f5fe85dd9536e5d6b583bb68454c56d5d8240df5042b27b667d5c94063a4f2f3fa14d6ba4db31769e1904ad4c

data/lib/kitchen/driver/oci/api.rb

@@ -66,13 +66,19 @@ module Kitchen
         def generic_api(klass)
           params = {}
           params[:proxy_settings] = api_proxy if api_proxy
-          params[:signer] = if config[:use_instance_principals]
-                              OCI::Auth::Signers::InstancePrincipalsSecurityTokenSigner.new
-                            elsif config[:use_token_auth]
-                              token_signer
-                            end
+          params[:signer] = signer
           params[:config] = oci_config unless config[:use_instance_principals]
-          klass.new(**params.compact)
+          # this is to accommodate old versions of ruby that do not have a compact method on a Hash
+          params.reject! { |_, v| v.nil? }
+          klass.new(**params)
+        end
+
+        def signer
+          if config[:use_instance_principals]
+            OCI::Auth::Signers::InstancePrincipalsSecurityTokenSigner.new
+          elsif config[:use_token_auth]
+            token_signer
+          end
         end
 
         def token_signer

data/lib/kitchen/driver/oci/config.rb

@@ -65,7 +65,9 @@ module Kitchen
         end
 
         def config_loader(opts = {})
-          OCI::ConfigFileLoader.load_config(**opts.compact)
+          # this is to accommodate old versions of ruby that do not have a compact method on a Hash
+          opts.reject! { |_, v| v.nil? }
+          OCI::ConfigFileLoader.load_config(**opts)
         rescue OCI::ConfigFileLoader::Errors::ConfigFileNotFoundError
           OCI::Config.new
         end

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

@@ -63,7 +63,7 @@ module Kitchen
 
           def image_id_by_name
             image_name = config[:image_name].gsub(" ", "-")
-            image_list = images.select { |i| i.display_name.match?(/#{image_name}/) }
+            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
@@ -73,7 +73,7 @@ module Kitchen
           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}/) }
+            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)

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.18.0"
+    OCI_VERSION = "1.18.1"
   end
 end

metadata

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