knife-oci 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59081952975a5ed82060447d1f172d47aa62095a
-  data.tar.gz: 62d68779e1ff5d745c428d941e60c7ff3455b9d4
+  metadata.gz: f461931833d1c8eaf21ee448e8402f49eb4c10c7
+  data.tar.gz: 8d6715c84720b950ed4661b484895fd3cfa89216
 SHA512:
-  metadata.gz: 2fb72b40c8c75d8f842eadf9f065a5251655eb3a88e91836cc8410e7280c611ed3e3ed31796556b8aabb16efbe187b2bcf063c2fad2ef235b7af21a8f223e4c2
-  data.tar.gz: 83a4e16965ddf3436f239a5218f57926d3e400a4b96d0449ffb504f7fb6e7b47789d73f4dc851dd6169c5aa4b5a6d2c42fa0a4535e1db2e5a835a37c5aebe543
+  metadata.gz: 36c6507626cbd2e23b32c805d7cf4babb281ea2a03dbdd2ab6ae1c86de603f8d133e9cd2c6c5aff00342630947e2d57a7ca5dbcdfe65d52a6873f165251a0cf9
+  data.tar.gz: 47a873568be4eaf52b67c1c563906c450e3300c1341b527e84875f506540eb25e5d2a49969089775967c5a5ed9032dbf226829e6aa759eca7e8b5a84415a8a88

data/lib/chef/knife/oci_helper.rb

@@ -173,36 +173,6 @@ class Chef
       else
         return response
       end
-
-      def show_value(key, value, color = :cyan)
-        ui.msg "#{ui.color(key, color)}: #{value}" if value && !value.to_s.empty?
-      end
-
-      # rubocop:disable Metrics/CyclomaticComplexity
-      def display_server_info(config, instance, vnics)
-        show_value('Display Name', instance.display_name)
-        show_value('Instance ID', instance.id)
-        show_value('Lifecycle State', instance.lifecycle_state)
-        show_value('Availability Domain', instance.availability_domain)
-        show_value('Compartment Name', instance.compartment_name) if instance.respond_to? :compartment_name
-        show_value('Compartment ID', instance.compartment_id)
-        show_value('Region', instance.region)
-        show_value('Image Name', instance.image_name) if instance.respond_to? :image_name
-        show_value('Image ID', instance.image_id)
-        show_value('Shape', instance.shape)
-        show_value('VCN Name', instance.vcn_name) if instance.respond_to? :vcn_name
-        show_value('VCN ID', instance.vcn_id) if instance.respond_to? :vcn_id
-        show_value('Launched', instance.launchtime) if instance.respond_to? :launchtime
-        vnics.each_index do |index|
-          prefix = vnics[index].is_primary ? 'Primary' : 'Secondary'
-          show_value("#{prefix} Public IP Address", vnics[index].public_ip)
-          show_value("#{prefix} Private IP Address", vnics[index].private_ip)
-          show_value("#{prefix} Hostname", vnics[index].hostname_label)
-          show_value("#{prefix} FQDN", vnics[index].fqdn) if vnics[index].respond_to? :fqdn
-          show_value("#{prefix} Subnet Name", vnics[index].subnet_name) if vnics[index].respond_to? :subnet_name
-        end
-        show_value('Node Name', config[:chef_node_name])
-      end
     end
   end
 end

data/lib/chef/knife/oci_helper_show.rb

@@ -0,0 +1,108 @@
+# Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+
+require 'chef/knife'
+require 'knife-oci/version'
+
+# Methods to extend the instance model
+module ServerDetails
+  attr_accessor :compartment_name
+  attr_accessor :image_name
+  attr_accessor :launchtime
+  attr_accessor :vcn_id
+  attr_accessor :vcn_name
+end
+
+# Methods to extend the vnic model
+module VnicDetails
+  attr_accessor :fqdn
+  attr_accessor :subnet_name
+  attr_accessor :vcn_id
+end
+
+class Chef
+  class Knife
+    # Utility routines to fill out data for 'server show' functionality
+    module OciHelperShow
+      def lookup_compartment_name(compartment_id)
+        compartment = identity_client.get_compartment(compartment_id, {})
+      rescue OCI::Errors::ServiceError => service_error
+        raise unless service_error.service_code == 'NotAuthorizedOrNotFound'
+      else
+        compartment.data.name
+      end
+
+      def lookup_image_name(image_id)
+        image = compute_client.get_image(image_id, {})
+      rescue OCI::Errors::ServiceError => service_error
+        raise unless service_error.service_code == 'NotAuthorizedOrNotFound'
+      else
+        image.data.display_name
+      end
+
+      def lookup_vcn_name(vcn_id)
+        vcn = network_client.get_vcn(vcn_id, {})
+      rescue OCI::Errors::ServiceError => service_error
+        raise unless service_error.service_code == 'NotAuthorizedOrNotFound'
+      else
+        vcn.data.display_name
+      end
+
+      def add_server_details(server, vcn_id)
+        server.extend ServerDetails
+
+        server.launchtime = server.time_created.strftime('%a, %e %b %Y %T %Z')
+        server.compartment_name = lookup_compartment_name(server.compartment_id)
+        server.image_name = lookup_image_name(server.image_id)
+        server.vcn_id = vcn_id
+        server.vcn_name = lookup_vcn_name(vcn_id)
+      end
+
+      def add_vnic_details(vnic)
+        vnic.extend VnicDetails
+
+        begin
+          subnet = network_client.get_subnet(vnic.subnet_id, {})
+        rescue OCI::Errors::ServiceError => service_error
+          raise unless service_error.service_code == 'NotAuthorizedOrNotFound'
+        else
+          vnic.fqdn = vnic.hostname_label + '.' + subnet.data.subnet_domain_name if
+            subnet.data && subnet.data.subnet_domain_name && vnic.hostname_label
+          vnic.subnet_name = subnet.data.display_name if
+            subnet.data && subnet.data.display_name
+          # piggyback the vcn_id from here, so we can avoid a few network calls
+          vnic.vcn_id = subnet.data.vcn_id
+        end
+      end
+
+      def show_value(key, value, color = :cyan)
+        ui.msg "#{ui.color(key, color)}: #{value}" if value && !value.to_s.empty?
+      end
+
+      # rubocop:disable Metrics/CyclomaticComplexity
+      def display_server_info(config, instance, vnics)
+        show_value('Display Name', instance.display_name)
+        show_value('Instance ID', instance.id)
+        show_value('Lifecycle State', instance.lifecycle_state)
+        show_value('Availability Domain', instance.availability_domain)
+        show_value('Compartment Name', instance.compartment_name) if instance.respond_to? :compartment_name
+        show_value('Compartment ID', instance.compartment_id)
+        show_value('Region', instance.region)
+        show_value('Image Name', instance.image_name) if instance.respond_to? :image_name
+        show_value('Image ID', instance.image_id)
+        show_value('Shape', instance.shape)
+        show_value('VCN Name', instance.vcn_name) if instance.respond_to? :vcn_name
+        show_value('VCN ID', instance.vcn_id) if instance.respond_to? :vcn_id
+        show_value('Launched', instance.launchtime) if instance.respond_to? :launchtime
+        vnics.each_index do |index|
+          prefix = vnics[index].is_primary ? 'Primary' : 'Secondary'
+          show_value("#{prefix} Public IP Address", vnics[index].public_ip)
+          show_value("#{prefix} Private IP Address", vnics[index].private_ip)
+          show_value("#{prefix} Hostname", vnics[index].hostname_label)
+          show_value("#{prefix} FQDN", vnics[index].fqdn) if vnics[index].respond_to? :fqdn
+          show_value("#{prefix} Subnet Name", vnics[index].subnet_name) if vnics[index].respond_to? :subnet_name
+        end
+        show_value('Node Name', config[:chef_node_name])
+      end
+    end
+  end
+end

data/lib/chef/knife/oci_server_create.rb

@@ -2,6 +2,7 @@
 
 require 'chef/knife'
 require 'chef/knife/oci_helper'
+require 'chef/knife/oci_helper_show'
 require 'chef/knife/oci_common_options'
 
 class Chef
@@ -11,13 +12,14 @@ class Chef
       banner 'knife oci server create (options)'
 
       include OciHelper
+      include OciHelperShow
       include OciCommonOptions
 
       # Port for SSH - might want to parameterize this in the future.
       SSH_PORT = 22
 
       WAIT_FOR_SSH_INTERVAL_SECONDS = 2
-      DEFAULT_WAIT_FOR_SSH_MAX_SECONDS = 180
+      DEFAULT_WAIT_FOR_SSH_MAX_SECONDS = 300
       DEFAULT_WAIT_TO_STABILIZE_SECONDS = 40
 
       deps do
@@ -26,14 +28,6 @@ class Chef
         Chef::Knife::Bootstrap.load_deps
       end
 
-      option :oci_config_file,
-             long: '--oci-config-file FILE',
-             description: 'The path to the OCI config file. Default: ~/.oci/config'
-
-      option :oci_profile,
-             long: '--oci-profile PROFILE',
-             description: 'The profile to load from the OCI config file. Default: DEFAULT'
-
       option :availability_domain,
              long: '--availability-domain AD',
              description: 'The Availability Domain of the instance. (required)'
@@ -135,21 +129,10 @@ class Chef
         instance = response.data
 
         ui.msg "Launched instance '#{instance.display_name}' [#{instance.id}]"
-        show_value('Display Name', instance.display_name)
-        show_value('Instance ID', instance.id)
-        show_value('Availability Domain', instance.availability_domain)
-        show_value('Compartment ID', instance.compartment_id)
-        show_value('Region', instance.region)
-        show_value('Image ID', instance.image_id)
-        show_value('Shape', instance.shape)
-
         instance = wait_for_instance_running(instance.id)
-
         ui.msg "Instance '#{instance.display_name}' is now running."
 
         vnic = get_vnic(instance.id, instance.compartment_id)
-        show_value('Public IP Address', vnic.public_ip)
-        show_value('Private IP Address', vnic.private_ip)
 
         unless wait_for_ssh(vnic.public_ip, SSH_PORT, WAIT_FOR_SSH_INTERVAL_SECONDS, config[:wait_for_ssh_max])
           error_and_exit 'Timed out while waiting for SSH access.'
@@ -167,6 +150,9 @@ class Chef
         ui.msg "Created and bootstrapped node '#{config[:chef_node_name]}'."
         ui.msg "\n"
 
+        add_vnic_details(vnic)
+        add_server_details(instance, vnic.vcn_id)
+
         display_server_info(config, instance, [vnic])
       end
 

data/lib/chef/knife/oci_server_delete.rb

@@ -31,7 +31,7 @@ class Chef
 
       option :purge,
              long: '--purge',
-             description: 'Remove the corresponding node from the Chef Server. The instance display name will be used as the node name, unless --node-name is specified.'
+             description: 'Remove the corresponding node and client from the Chef Server. The instance display name will be used as the node name, unless --node-name is specified.'
 
       option :chef_node_name,
              short: '-N NAME',
@@ -62,6 +62,7 @@ class Chef
 
         terminate_instance(config[:instance_id])
         delete_chef_node(chef_node) if config[:purge]
+        delete_chef_client(node_name) if config[:purge]
 
         wait_for_instance_terminated(config[:instance_id], wait_for) if wait_for
       end
@@ -82,6 +83,13 @@ class Chef
         ui.msg "Deleted Chef node '#{node.name}'"
       end
 
+      def delete_chef_client(client_name)
+        object = Chef::ApiClient.load(client_name)
+        return unless object && !object.validator
+        object.destroy
+        ui.msg "Deleted Chef client '#{client_name}'"
+      end
+
       def wait_for_instance_terminated(instance_id, wait_for)
         print ui.color('Waiting for instance to terminate...', :magenta)
         begin

data/lib/chef/knife/oci_server_show.rb

@@ -3,31 +3,16 @@
 require 'chef/knife'
 require 'chef/knife/oci_common_options'
 require 'chef/knife/oci_helper'
-
-# Methods to extend the instance model
-module ServerDetails
-  attr_accessor :compartment_name
-  attr_accessor :image_name
-  attr_accessor :launchtime
-  attr_accessor :vcn_id
-  attr_accessor :vcn_name
-end
-
-# Methods to extend the vnic model
-module VnicDetails
-  attr_accessor :fqdn
-  attr_accessor :subnet_name
-  attr_accessor :vcn_id
-end
+require 'chef/knife/oci_helper_show'
 
 class Chef
   class Knife
-    # List OCI instances. Note that this lists all instances in a
-    # compartment, not just those that are set up as Chef nodes.
+    # List details of a particular OCI instance.
     class OciServerShow < Knife
       banner 'knife oci server show (options)'
 
       include OciHelper
+      include OciHelperShow
       include OciCommonOptions
 
       deps do
@@ -35,60 +20,9 @@ class Chef
       end
 
       option :instance_id,
-             long: '--instance_id LIMIT',
+             long: '--instance_id INSTANCE',
              description: 'The OCID of the server to display. (required)'
 
-      def lookup_compartment_name(compartment_id)
-        compartment = identity_client.get_compartment(compartment_id, {})
-      rescue OCI::Errors::ServiceError => service_error
-        raise unless service_error.service_code == 'NotAuthorizedOrNotFound'
-      else
-        compartment.data.name
-      end
-
-      def lookup_image_name(image_id)
-        image = compute_client.get_image(image_id, {})
-      rescue OCI::Errors::ServiceError => service_error
-        raise unless service_error.service_code == 'NotAuthorizedOrNotFound'
-      else
-        image.data.display_name
-      end
-
-      def lookup_vcn_name(vcn_id)
-        vcn = network_client.get_vcn(vcn_id, {})
-      rescue OCI::Errors::ServiceError => service_error
-        raise unless service_error.service_code == 'NotAuthorizedOrNotFound'
-      else
-        vcn.data.display_name
-      end
-
-      def add_server_details(server, vcn_id)
-        server.extend ServerDetails
-
-        server.launchtime = server.time_created.strftime('%a, %e %b %Y %T %Z')
-        server.compartment_name = lookup_compartment_name(server.compartment_id)
-        server.image_name = lookup_image_name(server.image_id)
-        server.vcn_id = vcn_id
-        server.vcn_name = lookup_vcn_name(vcn_id)
-      end
-
-      def add_vnic_details(vnic)
-        vnic.extend VnicDetails
-
-        begin
-          subnet = network_client.get_subnet(vnic.subnet_id, {})
-        rescue OCI::Errors::ServiceError => service_error
-          raise unless service_error.service_code == 'NotAuthorizedOrNotFound'
-        else
-          vnic.fqdn = vnic.hostname_label + '.' + subnet.data.subnet_domain_name if
-            subnet.data && subnet.data.subnet_domain_name && vnic.hostname_label
-          vnic.subnet_name = subnet.data.display_name if
-            subnet.data && subnet.data.display_name
-          # piggyback the vcn_id from here, so we can avoid a few network calls
-          vnic.vcn_id = subnet.data.vcn_id
-        end
-      end
-
       def run
         validate_required_params(%i[instance_id], config)
         vnic_array = []
@@ -103,10 +37,10 @@ class Chef
             raise unless service_error.service_code == 'NotAuthorizedOrNotFound'
           else
             add_vnic_details(vnic_info.data)
-            # for now, only display information for primary vnic
             if vnic_info.data.is_primary == true
+              vnic_array.unshift(vnic_info.data) # make primary interface first in the array
+            else
               vnic_array.push(vnic_info.data)
-              break
             end
           end
         end

data/lib/knife-oci/version.rb

@@ -2,6 +2,6 @@
 
 module Knife
   module OCI
-    VERSION = '2.0.0'.freeze
+    VERSION = '2.0.1'.freeze
   end
 end

metadata

@@ -1,33 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: knife-oci
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Oracle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oci
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
 description: ''
@@ -38,19 +38,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- "./lib/chef/knife/oci_ad_list.rb"
-- "./lib/chef/knife/oci_common_options.rb"
-- "./lib/chef/knife/oci_compartment_list.rb"
-- "./lib/chef/knife/oci_helper.rb"
-- "./lib/chef/knife/oci_image_list.rb"
-- "./lib/chef/knife/oci_server_create.rb"
-- "./lib/chef/knife/oci_server_delete.rb"
-- "./lib/chef/knife/oci_server_list.rb"
-- "./lib/chef/knife/oci_server_show.rb"
-- "./lib/chef/knife/oci_shape_list.rb"
-- "./lib/chef/knife/oci_subnet_list.rb"
-- "./lib/chef/knife/oci_vcn_list.rb"
-- "./lib/knife-oci/version.rb"
+- ./lib/chef/knife/oci_ad_list.rb
+- ./lib/chef/knife/oci_common_options.rb
+- ./lib/chef/knife/oci_compartment_list.rb
+- ./lib/chef/knife/oci_helper.rb
+- ./lib/chef/knife/oci_helper_show.rb
+- ./lib/chef/knife/oci_image_list.rb
+- ./lib/chef/knife/oci_server_create.rb
+- ./lib/chef/knife/oci_server_delete.rb
+- ./lib/chef/knife/oci_server_list.rb
+- ./lib/chef/knife/oci_server_show.rb
+- ./lib/chef/knife/oci_shape_list.rb
+- ./lib/chef/knife/oci_subnet_list.rb
+- ./lib/chef/knife/oci_vcn_list.rb
+- ./lib/knife-oci/version.rb
 - LICENSE.txt
 homepage: https://github.com/oracle/knife-oci
 licenses:
@@ -63,17 +64,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Chef Knife Plugin for Oracle Cloud Infrastructure