kontena-plugin-packet 0.2.6 → 0.2.7.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ad1fb71e03dea023766c8cfdab6b25c99f89050
-  data.tar.gz: de48c4136195379e8a5bc094ea82a8a12a9af892
+  metadata.gz: 56396a2bbd0d2d2f968939be04c0800272f70a2f
+  data.tar.gz: d0fc65bf26b7dbea0e36a31b958c71e90f85de61
 SHA512:
-  metadata.gz: 8e3d7a57a42d6c0b66a95c52c66e47a7afc4b1d838f90c244ee6d75259e022a11cb4ecca9e6c20d005d09b58a0de469d94a6f5455d29756d3571a259cc63b4fe
-  data.tar.gz: 61112a7899b4a70ce9210a36f227fb39a1e5bc3a3befcf6bc3db04c79129f35830c68a110d338701829ae5931998d6daf21af614ca7abae6bb9add3359fd4a39
+  metadata.gz: 823613749101cfeeac9b5661e98066fb792217629f77dc8cdeb32efe4f063b1116b07776c7ded11f427c5663ee44ae40780c8edbc3a26920124b7b1087159a00
+  data.tar.gz: a321d9ad007d404d9ce0099f476d0c1e52add917abed5bf84bc9e897384d8dbdedcee94dc44eff15b028e7a795a4beac41dd38272dd0672659dfde5b8dfa611b

data/lib/kontena/machine/packet/master_provisioner.rb

@@ -22,7 +22,7 @@ module Kontena
           abort('Operating system coreos_stable does not exist in Packet') unless os = find_os('coreos_stable')
           abort('Device type does not exist in Packet') unless plan = find_plan(opts[:plan])
 
-          check_or_create_ssh_key(File.expand_path(opts[:ssh_key])) if opts[:ssh_key]
+          check_or_create_ssh_key(opts[:ssh_key]) if opts[:ssh_key]
 
           if opts[:ssl_cert]
             abort('Invalid ssl cert') unless File.exists?(File.expand_path(opts[:ssl_cert]))

data/lib/kontena/machine/packet/packet_common.rb

@@ -22,11 +22,9 @@ module Kontena
           label.empty? ? "kontena-ssh-key-#{rand(1..9)}" : label
         end
 
-        # @param [String] keyfile_path Path to ssh keyfile
-        def check_or_create_ssh_key(keyfile_path)
-          abort('Ssh key file not found') unless File.exist?(keyfile_path)
-          abort('Ssh key file not readable') unless File.readable?(keyfile_path)
-          ssh_key = File.read(keyfile_path).strip
+        # @param [String] ssh_key SSH public key
+        def check_or_create_ssh_key(ssh_key)
+          return nil if ssh_key.nil?
           create_ssh_key(ssh_key) unless ssh_key_exist?(ssh_key)
         end
 

data/lib/kontena/plugin/packet/master/create_command.rb

@@ -2,6 +2,7 @@ require 'kontena/plugin/packet/token_option'
 require 'kontena/plugin/packet/project_option'
 require 'kontena/plugin/packet/type_option'
 require 'kontena/plugin/packet/facility_option'
+require 'kontena/plugin/packet/ssh_key_option'
 
 module Kontena::Plugin::Packet::Master
   class CreateCommand < Kontena::Command
@@ -10,11 +11,11 @@ module Kontena::Plugin::Packet::Master
     include Kontena::Plugin::Packet::ProjectOption
     include Kontena::Plugin::Packet::TypeOption
     include Kontena::Plugin::Packet::FacilityOption
+    include Kontena::Plugin::Packet::SshKeyOption
 
     option "--name", "[NAME]", "Set master name"
     option "--ssl-cert", "PATH", "SSL certificate file (optional)"
     option "--billing", "BILLING", "Billing cycle", default: 'hourly'
-    option "--ssh-key", "PATH", "Path to ssh public key", default: File.join(Dir.home, '.ssh', 'id_rsa.pub')
     option "--vault-secret", "VAULT_SECRET", "Secret key for Vault (optional)"
     option "--vault-iv", "VAULT_IV", "Initialization vector for Vault (optional)"
     option "--mongodb-uri", "URI", "External MongoDB uri (optional)"

data/lib/kontena/plugin/packet/nodes/create_command.rb

@@ -2,6 +2,7 @@ require 'kontena/plugin/packet/token_option'
 require 'kontena/plugin/packet/project_option'
 require 'kontena/plugin/packet/type_option'
 require 'kontena/plugin/packet/facility_option'
+require 'kontena/plugin/packet/ssh_key_option'
 
 module Kontena::Plugin::Packet::Nodes
   class CreateCommand < Kontena::Command
@@ -11,11 +12,11 @@ module Kontena::Plugin::Packet::Nodes
     include Kontena::Plugin::Packet::ProjectOption
     include Kontena::Plugin::Packet::TypeOption
     include Kontena::Plugin::Packet::FacilityOption
+    include Kontena::Plugin::Packet::SshKeyOption
 
     parameter "[NAME]", "Node name"
 
     option "--billing", "BILLING", "Billing cycle", default: 'hourly'
-    option "--ssh-key", "PATH", "Path to ssh public key", default: File.join(Dir.home, '.ssh', 'id_rsa.pub')
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
 
     def execute

data/lib/kontena/plugin/packet/ssh_key_option.rb

@@ -0,0 +1,36 @@
+module Kontena::Plugin::Packet
+  module SshKeyOption
+
+    DEFAULT_PATH = File.join(Dir.home, '.ssh', 'id_rsa.pub')
+
+    def self.included(base)
+      base.option "--ssh-key", "PATH", "Path to ssh public key", attribute_name: :ssh_key_path, default: DEFAULT_PATH
+      base.class_eval do
+        def ssh_key
+          if ssh_key_path
+            begin
+              return File.read(ssh_key_path).strip
+            rescue => ex
+              unless ssh_key_path == DEFAULT_PATH
+                raise ex
+              end
+            end
+          end
+
+          require 'packet'
+          client = Packet::Client.new(self.token || (self.respond_to?(:default_token) && self.default_token))
+
+          keys = client.list_ssh_keys
+
+          if keys.empty?
+            prompt.ask('SSH public key: (enter an ssh key in OpenSSH format "ssh-xxx xxxxx key_name")') do |q|
+              q.validate /^ssh-rsa \S+ \S+$/
+            end
+          else
+            keys.first.key
+          end
+        end
+      end
+    end
+  end
+end

data/lib/kontena/plugin/packet.rb

@@ -1,7 +1,7 @@
 module Kontena
   module Plugin
     module Packet
-      VERSION = "0.2.6"
+      VERSION = "0.2.7.rc1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-packet
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7.rc1
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-08 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -98,6 +98,7 @@ files:
 - lib/kontena/plugin/packet/nodes/restart_command.rb
 - lib/kontena/plugin/packet/nodes/terminate_command.rb
 - lib/kontena/plugin/packet/project_option.rb
+- lib/kontena/plugin/packet/ssh_key_option.rb
 - lib/kontena/plugin/packet/token_option.rb
 - lib/kontena/plugin/packet/type_option.rb
 - lib/kontena/plugin/packet_command.rb
@@ -117,9 +118,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5