kitchen-oci 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28a500ab2c3ac91b3fc827a78bfcb8c50cf1f1a2
-  data.tar.gz: 97a476e7eeb9d8fb1c9fcc43ddbe9471b88915f3
+  metadata.gz: 19053062ba01105a50890aa5d147ac200c5c639d
+  data.tar.gz: b9bf3f786c59eff07986fa1f205aaa4cb289c6c8
 SHA512:
-  metadata.gz: 6cbb83bc027ff4d4f66f5a48184749b7bdd08342a2a42adc3ca6e87f084501f7c1101011aa76310630eaee53c4fb7c0d2a2021bb8ec669dcac8e0483c2334278
-  data.tar.gz: dfc1c9221d4d5f93af40d28805472c420cdadd81cfd6c6fb8412ec06edb067f6e34f65f1309c6f099bb7cfe72bd0451bc293e93ea2f90de9f28108138fefff90
+  metadata.gz: 51b060030ad9f2b53fde61fd7a4b053a3385f564bf349b6d6049df661a833ed088d14494c307da7322b57535f53128a4ab51bff175f7486865171162c2ec7960
+  data.tar.gz: 64b34c22ac500b3d7d7dca3fcc715a0b3e20fba1a680e04eee78289f4b25f558cf27da9e68f3aec8a6193fc17d593d5e9e0b4c455aef1c86220db1a581505ec7

data/.gitignore

@@ -1,3 +1,4 @@
+*.swp
 *.gem
 *.rbc
 .bundle

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/README.md

@@ -7,26 +7,38 @@ WARNING: This is alpha quality.  Use at your own risk!
 ## Prerequisites
 
 You need an ssh keypair defined for your current user.  By default the driver
-expects to find the public key in ~/.ssh/id_rsa.pub, but this can be
+expects to find the public key in ~/.ssh/id\_rsa.pub, but this can be
 overridden in .kitchen.yml.
 
-You need to create suitable configuration for OCI in ~/.oci/config but this
+You need to create suitable configuration for OCI in ~/.oci/config and this
 can be created using the CLI:
 ```
 oci setup config
 ```
 
 Ensure that you have a suitable compartment defined, an external subnet, and
-security rules that allow incoming SSH and outgoing HTTP (to allow Kitchen to
-pull the Chef binaries).
+security rules that allow incoming SSH and outgoing HTTP to allow Kitchen to
+pull the Chef binaries.
 
 ## Building the gem
 
-Ensure you have the ChefDK installed.
+```
+rake build
+```
+
+## Installing the gem
+
+You must install the gem into whatever Ruby is used to run knife.  On a
+workstation this will likely be the ChefDK environment.  To switch to
+ChefDK if you haven't already:
 
 ```
 eval "$(chef shell-init bash)"
-rake build
+```
+
+Then install the package you built earlier:
+
+```
 gem install pkg/kitchen-oci-<VERSION>.gem
 ```
 
@@ -40,6 +52,8 @@ Adjust below template as required.  The following configuration is mandatory:
    - shape
    - subnet\_id
 
+Note: The availability domain should be the full AD name including the tenancy specific prefix.  For example: "AaBb:US-ASHBURN-AD-1".  Look in the OCI console to get your tenancy specific string.
+
 These settings are optional:
 
    - oci\_config\_file, by default this is ~/.oci/config
@@ -62,15 +76,22 @@ verifier:
 platforms:
   - name: ubuntu-16.04
     driver:
-      availability_domain: "ad1"
+      # These are mandatory
       compartment_id: "ocid1.compartment.oc1..xxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+      availability_domain: "XyAb:US-ASHBURN-AD-1"
       image_id: "ocid1.image.oc1.phx.xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
       shape: "VM.Standard1.2"
       subnet_id: "ocid1.subnet.oc1.phx.xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+
+      # These are optional
+      use_private_ip: false
+      oci_config_file: "~/.oci/config"
+      oci_profile_name: "DEFAULT"
+      ssh_keypath: "~/.ssh/id_rsa.pub"
       post_create_script: >-
         touch /tmp/example.txt;
     transport:
-      username: "opc"
+      username: "ubuntu"
 
 suites:
   - name: default

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'cane/rake_task'
 require 'tailor/rake_task'

data/kitchen-oci.gemspec

@@ -1,4 +1,6 @@
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'kitchen/driver/oci_version'
 

data/lib/kitchen/driver/oci.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Stephen Pearson (<stevieweavie@gmail.com>)
 #
@@ -23,13 +25,14 @@ module Kitchen
     # Oracle OCI driver for Kitchen.
     #
     # @author Stephen Pearson <stevieweavie@gmail.com>
-    class Oci < Kitchen::Driver::Base
+    class Oci < Kitchen::Driver::Base # rubocop:disable Metrics/ClassLength
       required_config :compartment_id
       required_config :availability_domain
       required_config :image_id
       required_config :shape
       required_config :subnet_id
 
+      default_config :use_private_ip, false
       default_config :oci_config_file, nil
       default_config :oci_profile_name, nil
       default_keypath = File.expand_path(File.join(%w[~ .ssh id_rsa.pub]))
@@ -41,7 +44,7 @@ module Kitchen
 
         instance_id = launch_instance(config)
         state[:server_id] = instance_id
-        state[:hostname] = public_ip(config, instance_id)
+        state[:hostname] = instance_ip(config, instance_id)
 
         instance.transport.connection(state).wait_until_ready
 
@@ -97,13 +100,24 @@ module Kitchen
         instance_id
       end
 
-      def public_ip(config, instance_id)
-        vnics = comp_api(config).list_vnic_attachments(
+      def vnic_attachments(config, instance_id)
+        att = comp_api(config).list_vnic_attachments(
           config[:compartment_id],
           instance_id: instance_id
-        )
-        vnic_id = vnics.data.first.vnic_id
-        net_api(config).get_vnic(vnic_id).data.public_ip
+        ).data
+        raise 'Could not find any VNIC attachments' unless att.any?
+        att
+      end
+
+      def vnics(config, instance_id)
+        vnic_attachments(config, instance_id).map do |att|
+          net_api(config).get_vnic(att.vnic_id).data
+        end
+      end
+
+      def instance_ip(config, instance_id)
+        vnic = vnics(config, instance_id).select(&:is_primary).first
+        config[:use_private_ip] ? vnic.private_ip : vnic.public_ip
       end
 
       def pubkey(config)

data/lib/kitchen/driver/oci_version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Author:: Stephen Pearson (<stevieweavie@gmail.com>)
 #
@@ -18,6 +20,6 @@
 module Kitchen
   module Driver
     # Version string for Oracle OCI Kitchen driver
-    OCI_VERSION = '1.0.0'.freeze
+    OCI_VERSION = '1.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-oci
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Stephen Pearson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oci