kitchen-oci 1.18.0 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04441716ec20ae5cf111a087f07990af96826770804f92a67edaa7335622391a
-  data.tar.gz: 378640fe182082b49904fcef4671c7954bb794a51090c7e29a74ad25128addd0
+  metadata.gz: f1d7c6a979b6b660f6276347dac37a38939ce1d5052983d99501afac1a2ddf9f
+  data.tar.gz: b5863f89a61b48ecb90d22aae58d5f0cd841a75ec4c61c61bf84608f3f7938cf
 SHA512:
-  metadata.gz: 8cddfba0d04e8a8634656694b1158e9ea6e87eed48bb78b1f949d32aa2b2d0e58de38326c802da9ece1de1d5da209eab75c6b7d6e1e6f2c0e7224fa1dc81033a
-  data.tar.gz: 7ed171e81ff8ab9d2559df7b9a4bab80d5d7fee5440ac0816971def8b48e6d4e65eed1b098b2f95cd1d5658e702c8523e053d05998a2929cb41636b846f4d674
+  metadata.gz: daad8d4224903f776c41405d6c7d53b021a476b176cfe21887e90f5ba385815b3117383f80ac6bd28969678c272d564e66cb5e0635486d89345149a77397f33b
+  data.tar.gz: c2a6482d468e9b52dd0187c20e7e7569b19a05a99fa2281299f893f5b0fe6468d7ee4e684fdc7a0783b4ffb529117ddc82ac7ef14acc9345bc44f8c050e29936

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

@@ -42,7 +42,7 @@ module Kitchen
             process_windows_options
             response = api.compute.launch_instance(launch_instance_details)
             instance_id = response.data.id
-            api.compute.get_instance(instance_id).wait_until(:lifecycle_state, OCI::Core::Models::Instance::LIFECYCLE_STATE_RUNNING )
+            api.compute.get_instance(instance_id).wait_until(:lifecycle_state, OCI::Core::Models::Instance::LIFECYCLE_STATE_RUNNING)
             final_state(state, instance_id)
           end
 
@@ -51,6 +51,11 @@ module Kitchen
             api.compute.get_instance(state[:server_id]).wait_until(:lifecycle_state, OCI::Core::Models::Instance::LIFECYCLE_STATE_TERMINATING)
           end
 
+          def reboot
+            api.compute.instance_action(state[:server_id], "SOFTRESET")
+            api.compute.get_instance(state[:server_id]).wait_until(:lifecycle_state, OCI::Core::Models::Instance::LIFECYCLE_STATE_RUNNING)
+          end
+
           private
 
           def image_id
@@ -63,7 +68,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 +78,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/models/dbaas.rb

@@ -69,6 +69,12 @@ module Kitchen
                                                                   max_interval_seconds: 900, max_wait_seconds: 21_600)
           end
 
+          def reboot
+            db_node_id = dbaas_node(state[:server_id]).first.id
+            api.dbaas.db_node_action(db_node_id, "SOFTRESET")
+            api.dbaas.get_db_node(db_node_id).wait_until(:lifecycle_state, OCI::Database::Models::DbNode::LIFECYCLE_STATE_AVAILABLE)
+          end
+
           private
 
           def instance_ip(instance_id)

data/lib/kitchen/driver/oci.rb

@@ -71,6 +71,7 @@ module Kitchen
       default_config :all_plugins_disabled, false
       default_config :management_disabled, false
       default_config :monitoring_disabled, false
+      default_config :post_create_reboot, false
 
       # compute only configs
       default_config :setup_winrm, false
@@ -112,21 +113,19 @@ module Kitchen
         validate_config!
         oci, api = auth(__method__)
         inst = instance_class(config, state, oci, api, __method__)
-        state_details = inst.launch
-        state.merge!(state_details)
-        instance.transport.connection(state).wait_until_ready
+        launch(state, inst)
         create_and_attach_volumes(config, state, oci, api)
         process_post_script(state)
+        reboot(state, inst)
       end
 
       def destroy(state)
         return unless state[:server_id]
 
         oci, api = auth(__method__)
-        instance.transport.connection(state).close
-        detatch_and_delete_volumes(state, oci, api) if state[:volumes]
         inst = instance_class(config, state, oci, api, __method__)
-        inst.terminate
+        detatch_and_delete_volumes(state, oci, api)
+        terminate(state, inst)
       end
 
       private
@@ -138,6 +137,12 @@ module Kitchen
         [oci, api]
       end
 
+      def launch(state, inst)
+        state_details = inst.launch
+        state.merge!(state_details)
+        instance.transport.connection(state).wait_until_ready
+      end
+
       def create_and_attach_volumes(config, state, oci, api)
         return if config[:volumes].empty?
 
@@ -152,12 +157,6 @@ module Kitchen
         state.merge!(volume_state)
       end
 
-      def detatch_and_delete_volumes(state, oci, api)
-        bls = Blockstorage.new(config, state, oci, api, :destroy)
-        state[:volume_attachments].each { |att| bls.detatch_volume(att) }
-        state[:volumes].each { |vol| bls.delete_volume(vol) }
-      end
-
       def process_post_script(state)
         return if config[:post_create_script].nil?
 
@@ -165,6 +164,27 @@ module Kitchen
         script = config[:post_create_script]
         instance.transport.connection(state).execute(script)
       end
+
+      def reboot(state, inst)
+        return unless config[:post_create_reboot]
+
+        instance.transport.connection(state).close
+        inst.reboot
+        instance.transport.connection(state).wait_until_ready
+      end
+
+      def detatch_and_delete_volumes(state, oci, api)
+        return unless state[:volumes]
+
+        bls = Blockstorage.new(config, state, oci, api, :destroy)
+        state[:volume_attachments].each { |att| bls.detatch_volume(att) }
+        state[:volumes].each { |vol| bls.delete_volume(vol) }
+      end
+
+      def terminate(state, inst)
+        instance.transport.connection(state).close
+        inst.terminate
+      end
     end
   end
 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.18.0"
+    OCI_VERSION = "1.19.0"
   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.19.0
 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-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oci
@@ -109,7 +109,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A Test Kitchen Driver for Oracle OCI
+description: A Test Kitchen Driver for Oracle Cloud Infrastructure
 email:
 - stephen.pearson@oracle.com
 - justin.steele@oracle.com
@@ -157,5 +157,5 @@ requirements: []
 rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
-summary: A Test Kitchen Driver for Oracle OCI
+summary: A Test Kitchen Driver for Oracle Cloud Infrastructure
 test_files: []