kitchen-oci 1.6.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b2f233d2240dacbdd4963f7f3e71a71c1eea4ff252b08871f96ad740980338a
-  data.tar.gz: 1925454bb9e0565bbbb37011771d67c43c4634b1f86f03bb06a2f6966c9cc562
+  metadata.gz: bef4a4b0aadfd5e5f47b67c4a4807d227cf5f636bacbb1a202579f9bda6fd7fc
+  data.tar.gz: b7cef03d39724831643dbaf5d04ed21222d4cb496ff65da9ac724fafa6e8ee97
 SHA512:
-  metadata.gz: 69de909c99054a2b025c38321e7c44fd53018b887bc4136fc16f7dd8b4878b0cdf6333a65eabb21b0e611b1b04e2e6494521adf7ec960d322edb8b534432a26f
-  data.tar.gz: 3895434f64165cad197524dccbd0706c53777d8a7970c402dfe1ef6d4b2aa15111915d37edf3b95bc82851e3ee4d59131fc554b2a16431358abc360119046de9
+  metadata.gz: 86cb6549515a0f169ff4fbfcc0875688f7c0f374ffcccd366a5ce26b20cfe034e18784d22f70df585e37c675c2c48699c80dcfe2d253da3968fb1efd54dd819e
+  data.tar.gz: a49d0d696d9ba6b7af17c9cba108e77a63c1c3c263083a7346afc87406cf081c6160953886165cc8e29578a4d9c92228e91e7fd95f554e8dad4f9e9406c08151

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+
+## 1.8.0 Freeform tags
+- Added optional parameter `freeform_tags`
+
 ## 1.6.0 WinRM password option
 - Added option to set winrm password, instead of randomly generating one
 
@@ -6,3 +10,4 @@
 - Added cloud-init support.
 - Added support for Windows targets.
   - Can inject powershell script to set a random password and enable WinRM
+

data/README.md

@@ -61,6 +61,8 @@ These settings are optional:
    - post\_create\_script, run a script on compute\_instance after deployment
    - proxy\_url, Connect via the specified proxy URL
    - user\_data, Add user data scripts
+   - hostname\_prefix, Prefix for the generated hostnames (note that OCI doesn't like underscores)
+   - freeform\_tags, Hash containing tag name(s) and values(s)
 
 Optional settings for WinRM support in Windows:
 

data/lib/kitchen/driver/oci.rb

@@ -17,6 +17,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# rubocop:disable Metrics/AbcSize
+
 # This require fixes bug in ChefDK 4.0.60-1 on Linux.
 require 'forwardable'
 
@@ -42,15 +44,29 @@ module Kitchen
       default_config :use_private_ip, false
       default_config :oci_config_file, nil
       default_config :oci_profile_name, nil
+      default_config :hostname_prefix, nil
       default_keypath = File.expand_path(File.join(%w[~ .ssh id_rsa.pub]))
       default_config :ssh_keypath, default_keypath
       default_config :post_create_script, nil
       default_config :proxy_url, nil
       default_config :user_data, []
+      default_config :freeform_tags, {}
       default_config :setup_winrm, false
       default_config :winrm_user, 'opc'
       default_config :winrm_password, nil
 
+      def process_freeform_tags(freeform_tags)
+        prov = instance.provisioner.instance_variable_get(:@config)
+        tags = %w[run_list policyfile]
+        tags.each do |tag|
+          unless prov[tag.to_sym].nil? || prov[tag.to_sym].empty?
+            freeform_tags[tag] = prov[tag.to_sym].join(',')
+          end
+        end
+        freeform_tags[:kitchen] = true
+        freeform_tags
+      end
+
       def process_windows_options(state)
         state[:username] = config[:winrm_user] if config[:setup_winrm]
         if config[:setup_winrm] == true &&
@@ -61,7 +77,7 @@ module Kitchen
         state
       end
 
-      def create(state) # rubocop:disable Metrics/AbcSize
+      def create(state)
         return if state[:server_id]
 
         state = process_windows_options(state)
@@ -221,7 +237,7 @@ module Kitchen
         content.split("\n")
       end
 
-      def mime_parts(boundary) # rubocop:disable Metrics/AbcSize
+      def mime_parts(boundary)
         msg = []
         config[:user_data].each do |m|
           msg << "--#{boundary}"
@@ -255,16 +271,22 @@ module Kitchen
         }
       end
 
+      def generate_hostname
+        prefix = config[:hostname_prefix]
+        [prefix, random_hostname(instance.name)].compact.join('-')
+      end
+
       def base_oci_launch_details
-        request = OCI::Core::Models::LaunchInstanceDetails.new
-        hostname = random_hostname(instance.name)
-        request.availability_domain = config[:availability_domain]
-        request.compartment_id = config[:compartment_id]
-        request.display_name = hostname
-        request.source_details = instance_source_details
-        request.shape = config[:shape]
-        request.create_vnic_details = create_vnic_details(hostname)
-        request
+        OCI::Core::Models::LaunchInstanceDetails.new.tap do |l|
+          hostname = generate_hostname
+          l.availability_domain = config[:availability_domain]
+          l.compartment_id = config[:compartment_id]
+          l.display_name = hostname
+          l.source_details = instance_source_details
+          l.shape = config[:shape]
+          l.create_vnic_details = create_vnic_details(hostname)
+          l.freeform_tags = process_freeform_tags(config[:freeform_tags])
+        end
       end
 
       def compute_instance_request(state)
@@ -284,7 +306,7 @@ module Kitchen
         "#{prefix}-#{random_string(6)}"
       end
 
-      def random_password # rubocop:disable Metrics/AbcSize
+      def random_password
         (Array.new(5) { %w[! " # & ( ) * + , - . /].sample } +
          Array.new(5) { ('a'..'z').to_a.sample } +
          Array.new(5) { ('A'..'Z').to_a.sample } +
@@ -297,3 +319,5 @@ module Kitchen
     end
   end
 end
+
+# rubocop:enable Metrics/AbcSize

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.6.1'
+    OCI_VERSION = '1.8.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-oci
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Stephen Pearson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-24 00:00:00.000000000 Z
+date: 2019-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oci
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver for Oracle OCI