kitchen-oci 1.25.0 → 1.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db93079acea4739f9970e3a00627fe554719df5effc9e3b78d45287ea14fa730
-  data.tar.gz: 7dcc0d262fe162aa8db4cd351ff588a965f7560e01d9eccb5b7a6d901098faeb
+  metadata.gz: 1d223f52ef9973e25f1185d4646a7d1728f5eb0b760bcbe85c8b5cbe150f47bd
+  data.tar.gz: fbe86e8e26c0cb4cae838bc58e277e7e3c4c06e2850ad73b6b5ff9be46f30f00
 SHA512:
-  metadata.gz: 79774b7b41ea8e9ee93c70f708fd2ff4e2f64efda2037e6237445cabff246a42ea6250d548d3bea9d8e843aaded434eebc55bccae219675169e455d4f73ea314
-  data.tar.gz: 65907206e93b70b092a6a4154e5f1a3ce8490412950e41759856eb032940eed1fcf4227089db4bc4682711634276864af78eff5016915db2593f8c63793a86bc
+  metadata.gz: 39140520616c5ee302c3ba7766437598bb93ba2199aa1ea9cfe3e5525e972daacb7aacd40e95b39a9a72be9dad333d5f22c8b8cbb812d14f800e360527ce72d1
+  data.tar.gz: 86bbbecc3e66a2ec67607d889570d5c55ce88c45579903741d8021679b1cba1e83f9c00a3da974e3e68fd86ecb9c9457d1b9fdc913198b37a911f364565fe77c

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

@@ -26,15 +26,16 @@ module Kitchen
         require_relative "models/iscsi"
         require_relative "models/paravirtual"
 
-        def initialize(config, state, oci, api, action = :create)
+        def initialize(opts = {})
           super()
-          @config = config
-          @state = state
-          @oci = oci
-          @api = api
+          @config = opts[:config]
+          @state = opts[:state]
+          @oci = opts[:oci]
+          @api = opts[:api]
+          @logger = opts[:logger]
           @volume_state = {}
           @volume_attachment_state = {}
-          oci.compartment if action == :create
+          oci.compartment if opts[:action] == :create
         end
 
         #
@@ -65,6 +66,13 @@ module Kitchen
         #
         attr_accessor :api
 
+        #
+        # The instance of Kitchen::Logger in use by the active Kitchen::Instance
+        #
+        # @return [Kitchen::Logger]
+        #
+        attr_accessor :logger
+
         # The definition of the state of a volume
         #
         # @return [Hash]
@@ -78,44 +86,44 @@ module Kitchen
         attr_accessor :volume_attachment_state
 
         def create_volume(volume)
-          info("Creating <#{volume[:name]}>...")
+          logger.info("Creating <#{volume[:name]}>...")
           result = api.blockstorage.create_volume(volume_details(volume))
           response = volume_response(result.data.id)
-          info("Finished creating <#{volume[:name]}>.")
+          logger.info("Finished creating <#{volume[:name]}>.")
           [response, final_state(response)]
         end
 
         def create_clone_volume(volume)
           clone_volume_name = clone_volume_display_name(volume[:volume_id])
-          info("Creating <#{clone_volume_name}>...")
+          logger.info("Creating <#{clone_volume_name}>...")
           result = api.blockstorage.create_volume(volume_clone_details(volume, clone_volume_name))
           response = volume_response(result.data.id)
-          info("Finished creating <#{clone_volume_name}>.")
+          logger.info("Finished creating <#{clone_volume_name}>.")
           [response, final_state(response)]
         end
 
         def attach_volume(volume_details, server_id, volume_config)
-          info("Attaching <#{volume_details.display_name}>...")
+          logger.info("Attaching <#{volume_details.display_name}>...")
           attach_volume = api.compute.attach_volume(attachment_details(volume_details, server_id, volume_config))
           response = attachment_response(attach_volume.data.id)
-          info("Finished attaching <#{volume_details.display_name}>.")
+          logger.info("Finished attaching <#{volume_details.display_name}>.")
           final_state(response)
         end
 
         def delete_volume(volume)
-          info("Deleting <#{volume[:display_name]}>...")
+          logger.info("Deleting <#{volume[:display_name]}>...")
           api.blockstorage.delete_volume(volume[:id])
           api.blockstorage.get_volume(volume[:id])
             .wait_until(:lifecycle_state, OCI::Core::Models::Volume::LIFECYCLE_STATE_TERMINATED)
-          info("Finished deleting <#{volume[:display_name]}>.")
+          logger.info("Finished deleting <#{volume[:display_name]}>.")
         end
 
         def detatch_volume(volume_attachment)
-          info("Detaching <#{attachment_name(volume_attachment)}>...")
+          logger.info("Detaching <#{attachment_name(volume_attachment)}>...")
           api.compute.detach_volume(volume_attachment[:id])
           api.compute.get_volume_attachment(volume_attachment[:id])
             .wait_until(:lifecycle_state, OCI::Core::Models::VolumeAttachment::LIFECYCLE_STATE_DETACHED)
-          info("Finished detaching <#{attachment_name(volume_attachment)}>.")
+          logger.info("Finished detaching <#{attachment_name(volume_attachment)}>.")
         end
 
         def final_state(response)

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

@@ -61,7 +61,7 @@ module Kitchen
 
           def pubkey
             result = []
-            result << File.readlines(config[:ssh_keypath]).first.chomp
+            result << read_public_key
             launch_details.ssh_public_keys = result
           end
 

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

@@ -30,12 +30,13 @@ module Kitchen
 
         include CommonLaunchDetails
 
-        def initialize(config, state, oci, api, action)
+        def initialize(opts = {})
           super()
-          @config = config
-          @state = state
-          @oci = oci
-          @api = api
+          @config = opts[:config]
+          @state = opts[:state]
+          @oci = opts[:oci]
+          @api = opts[:api]
+          @logger = opts[:logger]
         end
 
         #
@@ -66,6 +67,13 @@ module Kitchen
         #
         attr_accessor :api
 
+        #
+        # The instance of Kitchen::Logger in use by the active Kitchen::Instance
+        #
+        # @return [Kitchen::Logger]
+        #
+        attr_accessor :logger
+
         def final_state(state, instance_id)
           state.store(:server_id, instance_id)
           state.store(:hostname, instance_ip(instance_id))
@@ -88,6 +96,43 @@ module Kitchen
           !subnet.prohibit_public_ip_on_vnic
         end
 
+        def public_key_file
+          if config[:ssh_keygen]
+            "#{config[:kitchen_root]}/.kitchen/.ssh/#{config[:instance_name]}_rsa.pub"
+          else
+            config[:ssh_keypath]
+          end
+        end
+
+        def private_key_file
+          public_key_file.gsub(".pub", "")
+        end
+
+        def gen_key_pair
+          FileUtils.mkdir_p("#{config[:kitchen_root]}/.kitchen/.ssh")
+          rsa_key = OpenSSL::PKey::RSA.new(4096)
+          write_private_key(rsa_key)
+          write_public_key(rsa_key)
+          state.store(:ssh_key, private_key_file)
+        end
+
+        def write_private_key(rsa_key)
+          File.open(private_key_file, "wb") { |k| k.write(rsa_key.to_pem) }
+          File.chmod(0600, private_key_file)
+        end
+
+        def write_public_key(rsa_key)
+          File.open(public_key_file, "wb") { |k| k.write("ssh-rsa #{encode_private_key(rsa_key)} #{config[:instance_name]}") }
+          File.chmod(0600, public_key_file)
+        end
+
+        def encode_private_key(rsa_key)
+          prefix = "#{[7].pack("N")}ssh-rsa"
+          exponent = rsa_key.e.to_s(0)
+          modulus = rsa_key.n.to_s(0)
+          ["#{prefix}#{exponent}#{modulus}"].pack("m0")
+        end
+
         def random_password(special_chars)
           (Array.new(5) { special_chars.sample } +
             Array.new(5) { ("a".."z").to_a.sample } +

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

@@ -26,7 +26,7 @@ module Kitchen
         class Compute < Instance # rubocop:disable Metrics/ClassLength
           include ComputeLaunchDetails
 
-          def initialize(config, state, oci, api, action)
+          def initialize(opts = {})
             super
             @launch_details = OCI::Core::Models::LaunchInstanceDetails.new
           end
@@ -102,10 +102,10 @@ module Kitchen
           end
 
           def clone_boot_volume
-            info("Cloning boot volume...")
+            logger.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.")
+            logger.info("Finished cloning boot volume.")
             cbv.data.id
           end
 
@@ -159,15 +159,19 @@ module Kitchen
           end
 
           def pubkey
-            File.readlines(config[:ssh_keypath]).first.chomp
+            if config[:ssh_keygen]
+              logger.info("Generating public/private rsa key pair")
+              gen_key_pair
+            end
+            File.readlines(public_key_file).first.chomp
           end
 
           def metadata
             md = {}
             inject_powershell
             config[:custom_metadata]&.each { |k, v| md.store(k, v) }
-            md.store("ssh_authorized_keys", pubkey)
-            md.store("user_data", user_data) if config[:user_data] && !config[:user_data].empty?
+            md.store("ssh_authorized_keys", pubkey) unless config[:setup_winrm]
+            md.store("user_data", user_data) if user_data?
             md
           end
 
@@ -182,6 +186,10 @@ module Kitchen
             config[:setup_winrm] && config[:password].nil? && state[:password].nil?
           end
 
+          def user_data?
+            config[:user_data] && !config[:user_data].empty?
+          end
+
           def winrm_ps1
             filename = File.join(__dir__, %w{.. .. .. .. .. tpl setup_winrm.ps1.erb})
             tpl = ERB.new(File.read(filename))

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

@@ -26,7 +26,7 @@ module Kitchen
         class Dbaas < Instance # rubocop:disable Metrics/ClassLength
           include DbaasLaunchDetails
 
-          def initialize(config, state, oci, api, action)
+          def initialize(opts = {})
             super
             @launch_details = OCI::Database::Models::LaunchDbSystemDetails.new
             @database_details = OCI::Database::Models::CreateDatabaseDetails.new
@@ -97,6 +97,14 @@ module Kitchen
           def long_hostname_suffix
             [random_string(25 - hostname_prefix.length), random_string(3)].compact.join("-")
           end
+
+          def read_public_key
+            if config[:ssh_keygen]
+              logger.info("Generating public/private rsa key pair")
+              gen_key_pair
+            end
+            File.readlines(public_key_file).first.chomp
+          end
         end
       end
     end

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

@@ -23,7 +23,7 @@ module Kitchen
       module Models
         # iscsi volume attachment model
         class Iscsi < Blockstorage
-          def initialize(config, state, oci, api)
+          def initialize(opts = {})
             super
             @attachment_type = "iscsi"
           end

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

@@ -23,7 +23,7 @@ module Kitchen
       module Models
         # paravirtual attachment model
         class Paravirtual < Blockstorage
-          def initialize(config, state, oci, api)
+          def initialize(opts = {})
             super
             @attachment_type = "paravirtual"
           end

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

@@ -26,11 +26,11 @@ module Kitchen
         require_relative "blockstorage"
 
         def instance_class(config, state, oci, api, action)
-          Oci::Models.const_get(config[:instance_type].capitalize).new(config, state, oci, api, action)
+          Oci::Models.const_get(config[:instance_type].capitalize).new(config: config, state: state, oci: oci, api: api, action: action, logger: instance.logger)
         end
 
         def volume_class(type, config, state, oci, api)
-          Oci::Models.const_get(volume_attachment_type(type)).new(config, state, oci, api)
+          Oci::Models.const_get(volume_attachment_type(type)).new(config: config, state: state, oci: oci, api: api, logger: instance.logger)
         end
 
         private

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+#
+# Author:: Justin Steele (<justin.steele@oracle.com>)
+#
+# Copyright (C) 2024, Stephen Pearson
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Kitchen
+  module Driver
+    class Oci
+      # mixin for working with volumes and attachments
+      module Volumes
+        def create_and_attach_volumes(config, state, oci, api)
+          return if config[:volumes].empty?
+
+          volume_state = process_volumes(config, state, oci, api)
+          state.merge!(volume_state)
+        end
+
+        def process_volumes(config, state, oci, api)
+          volume_state = { volumes: [], volume_attachments: [] }
+          config[:volumes].each do |volume|
+            vol = volume_class(volume[:type], config, state, oci, api)
+            volume_details, vol_state = create_volume(vol, volume)
+            attach_state = vol.attach_volume(volume_details, state[:server_id], volume)
+            volume_state[:volumes] << vol_state
+            volume_state[:volume_attachments] << attach_state
+          end
+          volume_state
+        end
+
+        def create_volume(vol, volume)
+          if volume.key?(:volume_id)
+            vol.create_clone_volume(volume)
+          else
+            vol.create_volume(volume)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/kitchen/driver/oci.rb

@@ -35,9 +35,10 @@ module Kitchen
     class Oci < Kitchen::Driver::Base # rubocop:disable Metrics/ClassLength
       require_relative "oci_version"
       require_relative "oci/models"
+      require_relative "oci/volumes"
 
       plugin_version Kitchen::Driver::OCI_VERSION
-      kitchen_driver_api_version 1
+      kitchen_driver_api_version 2
 
       # required config items
       required_config :availability_domain
@@ -63,6 +64,7 @@ module Kitchen
       default_config :display_name, nil
       default_keypath = File.expand_path(File.join(%w{~ .ssh id_rsa.pub}))
       default_config :ssh_keypath, default_keypath
+      default_config :ssh_keygen, false
       default_config :post_create_script, nil
       default_config :proxy_url, nil
       default_config :user_data, nil
@@ -114,6 +116,7 @@ module Kitchen
       end
 
       include Kitchen::Driver::Oci::Models
+      include Kitchen::Driver::Oci::Volumes
 
       def create(state)
         return if state[:server_id]
@@ -151,33 +154,6 @@ module Kitchen
         instance.transport.connection(state).wait_until_ready
       end
 
-      def create_and_attach_volumes(config, state, oci, api)
-        return if config[:volumes].empty?
-
-        volume_state = process_volumes(config, state, oci, api)
-        state.merge!(volume_state)
-      end
-
-      def process_volumes(config, state, oci, api)
-        volume_state = { volumes: [], volume_attachments: [] }
-        config[:volumes].each do |volume|
-          vol = volume_class(volume[:type], config, state, oci, api)
-          volume_details, vol_state = create_volume(vol, volume)
-          attach_state = vol.attach_volume(volume_details, state[:server_id], volume)
-          volume_state[:volumes] << vol_state
-          volume_state[:volume_attachments] << attach_state
-        end
-        volume_state
-      end
-
-      def create_volume(vol, volume)
-        if volume.key?(:volume_id)
-          vol.create_clone_volume(volume)
-        else
-          vol.create_volume(volume)
-        end
-      end
-
       def process_post_script(state)
         return if config[:post_create_script].nil?
 
@@ -197,7 +173,7 @@ module Kitchen
       def detatch_and_delete_volumes(state, oci, api)
         return unless state[:volumes]
 
-        bls = Blockstorage.new(config, state, oci, api, :destroy)
+        bls = Blockstorage.new(config: config, state: state, oci: oci, api: api, action: :destroy, logger: instance.logger)
         state[:volume_attachments].each { |att| bls.detatch_volume(att) }
         state[:volumes].each { |vol| bls.delete_volume(vol) }
       end
@@ -205,6 +181,10 @@ module Kitchen
       def terminate(state, inst)
         instance.transport.connection(state).close
         inst.terminate
+        if state[:ssh_key]
+          FileUtils.rm_f(state[:ssh_key])
+          FileUtils.rm_f("#{state[:ssh_key]}.pub")
+        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.25.0"
+    OCI_VERSION = "1.26.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-oci
 version: !ruby/object:Gem::Version
-  version: 1.25.0
+  version: 1.26.0
 platform: ruby
 authors:
 - Stephen Pearson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-24 00:00:00.000000000 Z
+date: 2025-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oci
@@ -133,6 +133,7 @@ files:
 - lib/kitchen/driver/oci/models/dbaas.rb
 - lib/kitchen/driver/oci/models/iscsi.rb
 - lib/kitchen/driver/oci/models/paravirtual.rb
+- lib/kitchen/driver/oci/volumes.rb
 - lib/kitchen/driver/oci_version.rb
 - tpl/setup_winrm.ps1.erb
 homepage: https://github.com/stephenpearson/kitchen-oci