kitchen-oci 1.11.2 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f75760b2f60bf730fd95a92c2168cbf2323b92527dba60dd68dd12c4fa3856f
-  data.tar.gz: cd36c7e116e0bad6b37b51b0d37193c4a660dc3d29c5e3bd2365753c52ce59aa
+  metadata.gz: 11ed05e70686843c964b5c60daa05f4c51401c744a2888b4720835e4ae5995ed
+  data.tar.gz: d5a53b2b2c15be6f8bf2c85b4fbdf96fc8491c7c7bcb14a499861663d9748384
 SHA512:
-  metadata.gz: 4831c6af3af0244569f6197392e2ab07a570e31be2a950b3e2c4fe36d502892c426839cab79b27e88013102229fcbf13733b809577d85f81be1841cdc9c184b6
-  data.tar.gz: 547b9d645e83164eb3a12df3e3cb0ea06aeec8c8c715f8b58b9be7c185002e91031e1185ba4d1fdf7c505d1cef15de0a51dfb1c1a6959010a908ebc4d22e4838
+  metadata.gz: 599edf15843fd3307cfa19ff36a256739fa39d3e692a7851fb047570e9e1dd4697ab4b6805479c99932bddd198a165718807316d60921265e3d53d07d7206ba7
+  data.tar.gz: c053a1aca424b140bfee1c7e30ffb40f5420c296e4820cd5321033d3b9e00a75103454adbb73780f2479a12ccde4fff4de94c9d26ab779b1b5feb91e069ab633

data/CHANGELOG.md

@@ -1,4 +1,9 @@
 
+## 1.12.0
+- Added support for Flex and Preemptible instances
+- Set dependency on oci gem to 2.14.0
+- Further reduction of characters known to cause winrm password issues
+
 ## 1.11.2
 - Set dependency on oci gem to 2.10.0
 

data/README.md

@@ -84,6 +84,11 @@ These settings are optional:
    - `hostname_prefix`, Prefix for the generated hostnames (note that OCI doesn't like underscores)
    - `freeform_tags`, Hash containing tag name(s) and values(s)
    - `use_instance_principals`, Boolean flag indicated whether Instance Principals should be used as credentials (see below)
+   - `preemptible_instance`, Boolean flag to indicate if the compute instance should be preemptible, default is `false`.
+   - `shape_config`, Hash of shape config parameters required when using Flex shapes.
+     - `ocpus`, number of CPUs requested
+     - `memory_in_gbs`, the amount of memory requested
+     - `baseline_ocpu_utilization`, the minimum CPU utilization, default `BASELINE_1_1`
 
 Optional settings for WinRM support in Windows:
 
@@ -226,6 +231,35 @@ transport:
 
 See also the section above on Instance Principals if you plan to use a proxy in conjunction with a proxy.  The proxy needs to be avoided when accessing the metadata address.
 
+## Preemptible Instances
+
+This will allow you to create a [preemptible instance](https://docs.oracle.com/en-us/iaas/Content/Compute/Concepts/preemptible.htm).  Preemptible instances behave the same as regular compute instances, but the capacity is reclaimed when it's needed elsewhere, and the instances are terminated. If your workloads are fault-tolerant and can withstand interruptions, then preemptible instances can reduce your costs.
+
+```yml
+---
+driver:
+  name: oci
+  ...
+  preemptible_instance: true
+  ...
+```
+
+## Flex Shape Instances
+
+This will allow you to launch a flexible shape instance.  A flexible shape lets you customize the number of CPUs and memory available when launching or resizing the VM.  Note that there are smaller number of shapes available and the image ocid must also be compatible.  Please consult [OCI documentation](https://docs.oracle.com/en-us/iaas/Content/Compute/References/computeshapes.htm#flexible) to ensure the proper combination of shape and image ocid.
+
+```yml
+---
+driver:
+  name: oci
+  ...
+  shape_config:
+    ocpus: 2
+    memory_in_gbs: 8
+    baseline_ocpu_utilization: BASELINE_1_1
+  ...
+```
+
 ## Windows Support
 
 When launching Oracle provided Windows images, it may be helpful to allow kitchen-oci to inject powershell to configure WinRM and to set a randomized password that does not need to be changed on first login.  If the `setup_winrm` parameter is set to true then the following steps will happen:

data/kitchen-oci.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'oci', '~> 2.10.0'
+  spec.add_dependency 'oci', '~> 2.14.0'
   spec.add_dependency 'test-kitchen'
 
   spec.add_development_dependency 'bundler'

data/lib/kitchen/driver/oci.rb

@@ -59,6 +59,8 @@ module Kitchen
       default_config :winrm_user, 'opc'
       default_config :winrm_password, nil
       default_config :use_instance_principals, false
+      default_config :preemptible_instance, false
+      default_config :shape_config, {}
 
       # dbaas config items
       default_config :dbaas, {}
@@ -237,7 +239,7 @@ module Kitchen
 
       def random_password
         if instance_type == 'compute'
-          special_chars = %w[! " & ( ) * + , - . /]
+          special_chars = %w[@ - ( ) .]
         elsif instance_type == 'dbaas'
           special_chars = %w[# _ -]
         end
@@ -284,7 +286,7 @@ module Kitchen
         request
       end
 
-      def compute_launch_details
+      def compute_launch_details # rubocop:disable Metrics/MethodLength
         OCI::Core::Models::LaunchInstanceDetails.new.tap do |l|
           hostname = generate_hostname
           l.availability_domain = config[:availability_domain]
@@ -294,6 +296,8 @@ module Kitchen
           l.shape = config[:shape]
           l.create_vnic_details = create_vnic_details(hostname)
           l.freeform_tags = process_freeform_tags(config[:freeform_tags])
+          l.preemptible_instance_config = preemptible_instance_config if config[:preemptible_instance]
+          l.shape_config = shape_config unless config[:shape_config].empty?
         end
       end
 
@@ -304,6 +308,23 @@ module Kitchen
         )
       end
 
+      def preemptible_instance_config
+        OCI::Core::Models::PreemptibleInstanceConfigDetails.new(
+          preemption_action:
+            OCI::Core::Models::TerminatePreemptionAction.new(
+              type: 'TERMINATE', preserve_boot_volume: true
+            )
+        )
+      end
+
+      def shape_config
+        OCI::Core::Models::LaunchInstanceShapeConfigDetails.new(
+          ocpus: config[:shape_config][:ocpus],
+          memory_in_gbs: config[:shape_config][:memory_in_gbs],
+          baseline_ocpu_utilization: config[:shape_config][:baseline_ocpu_utilization] || 'BASELINE_1_1'
+        )
+      end
+
       def create_vnic_details(name)
         OCI::Core::Models::CreateVnicDetails.new(
           assign_public_ip: public_ip_allowed?,

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.11.2'
+    OCI_VERSION = '1.12.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-oci
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.12.0
 platform: ruby
 authors:
 - Stephen Pearson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2021-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oci
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement