aptible-api 0.9.27 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 405bef35093af9c898e855eb7db32cc8c8dc9f56
-  data.tar.gz: b06c78cf3a837db863594ca488cbc285c794e374
+  metadata.gz: d7d11f79004548577d85638bdac39f9c276dbdef
+  data.tar.gz: 6b62d4586b02bd18066f8268798ee9f0d963d914
 SHA512:
-  metadata.gz: d659a6d82f799cc4c925adca659d94d9a85cb519ea1cb215c1460a83f1b0b0cd8563da4f357bc025df0d799043cacd637db463aa82144c0d6b322dea228515b5
-  data.tar.gz: c2dec80e92e48c6d955fe26fb8ce9005b8fa66ecb3be25e02f20ea1ac1f165a3a16127640e3afb38575975db4d139f4af7eb25bae614726c6b0163a30ddea3ca
+  metadata.gz: 5b0f62df81806e16939bf779ab5524c236c4b46b02a14110d05f8981856dbd3edcd26e8122570f494c6c301f0996f5e7c3cdaeae128219bfa6988e3f780cb5c2
+  data.tar.gz: 7f442ca267be1e134753e5e7646fbca42d437f14e3020f9a39d6b973ac47d573a415a97a12c0e4a316c7d6519113fae10e201edbc36aa45a50a358a7dd28d06a

data/.travis.yml

@@ -1,6 +1,6 @@
 sudo: false
 
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.2.0
+  - "2.0"
+  - "2.1"
+  - "2.2"

data/Rakefile

@@ -1,4 +1,8 @@
 require 'bundler/gem_tasks'
 
-require 'aptible/tasks'
-Aptible::Tasks.load_tasks
+begin
+  require 'aptible/tasks'
+  Aptible::Tasks.load_tasks
+rescue LoadError
+  $stderr.puts 'Skipping Aptible::Tasks initialization...'
+end

data/lib/aptible/api/app.rb

@@ -10,6 +10,7 @@ module Aptible
       has_many :images
       has_many :operations
       has_many :vhosts
+      has_many :ephemeral_sessions
       embeds_many :services
 
       field :id

data/lib/aptible/api/ephemeral_container.rb

@@ -0,0 +1,17 @@
+module Aptible
+  module Api
+    class EphemeralContainer < Resource
+      belongs_to :ephemeral_session
+      belongs_to :log_drain
+
+      field :id
+
+      field :docker_name
+      field :layer
+      field :interactive
+
+      field :created_at, type: Time
+      field :updated_at, type: Time
+    end
+  end
+end

data/lib/aptible/api/ephemeral_session.rb

@@ -0,0 +1,17 @@
+module Aptible
+  module Api
+    class EphemeralSession < Resource
+      belongs_to :app
+      belongs_to :operation
+      has_many :ephemeral_containers
+      has_many :operations
+
+      field :aws_instance_id
+      field :host
+      field :name
+
+      field :created_at, type: Time
+      field :updated_at, type: Time
+    end
+  end
+end

data/lib/aptible/api/operation.rb

@@ -7,6 +7,7 @@ module Aptible
       belongs_to :resource
 
       has_many :ssh_portal_connections
+      has_many :ephemeral_sessions
 
       field :id
       field :type
@@ -23,6 +24,7 @@ module Aptible
       field :disk_size
       field :command
       field :destination_region
+      field :interactive
       field :user_name
       field :user_email
       field :created_at, type: Time
@@ -43,7 +45,7 @@ module Aptible
         status == 'failed'
       end
 
-      def with_ssh_cmd(private_key_file)
+      def with_ssh_cmd(private_key_file, host: nil, port: nil, host_key: nil)
         # We expect that the public key will be found next to the private key,
         # which is also what SSH itself expects. If that's not the case, then
         # we'll just fail. The Aptible CLI will always ensure credentials are
@@ -58,11 +60,13 @@ module Aptible
         certificate = connection.ssh_certificate_body
 
         stack = account.stack
-        host = stack.ssh_portal_host
-        port = stack.ssh_portal_port
-        key = stack.ssh_host_rsa_public_key
+        host ||= stack.ssh_portal_host
+        port ||= stack.ssh_portal_port
+        host_key ||= stack.ssh_host_rsa_public_key
 
-        with_temporary_known_hosts(host, port, key) do |known_hosts_file|
+        with_temporary_known_hosts(
+          host, port, host_key
+        ) do |known_hosts_file|
           with_temporary_id(private_key, public_key, certificate) do |id_file|
             cmd = [
               'ssh',
@@ -85,10 +89,10 @@ module Aptible
 
       private
 
-      def with_temporary_known_hosts(host, port, key)
+      def with_temporary_known_hosts(host, port, host_key)
         Dir.mktmpdir do |dir|
           known_hosts_file = File.join(dir, 'known_hosts')
-          contents = "[#{host}]:#{port} #{key}\n"
+          contents = "[#{host}]:#{port} #{host_key}\n"
           File.open(known_hosts_file, 'w', 0o600) { |f| f.write(contents) }
           yield known_hosts_file
         end

data/lib/aptible/api/resource.rb

@@ -33,3 +33,5 @@ require 'aptible/api/vhost'
 require 'aptible/api/ssh_portal_connection'
 require 'aptible/api/stack'
 require 'aptible/api/database_credential'
+require 'aptible/api/ephemeral_session'
+require 'aptible/api/ephemeral_container'

data/lib/aptible/api/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Api
-    VERSION = '0.9.27'.freeze
+    VERSION = '0.10.0'.freeze
   end
 end

data/spec/aptible/api/operation_spec.rb

@@ -97,6 +97,38 @@ describe Aptible::Api::Operation do
 
         expect(has_yielded).to be_truthy
       end
+
+      it 'allows passing a custom host' do
+        expect(subject).to receive(:create_ssh_portal_connection!)
+          .with(ssh_public_key: 'some public key')
+          .and_return(ssh_portal_connection)
+
+        has_yielded = false
+
+        subject.with_ssh_cmd(
+          private_key_file,
+          host: 'host-foo.com',
+          port: 123,
+          host_key: 'foo key'
+        ) do |cmd, _|
+          _, dest, _, port, = cmd
+
+          expect(dest).to eq('foo-user@host-foo.com')
+          expect(port).to eq('123')
+
+          hosts_param = cmd.find { |p| p.start_with?('UserKnownHostsFile') }
+          expect(cmd[cmd.index(hosts_param) - 1]).to eq('-o')
+          expect(hosts_param).not_to be_nil
+          hosts_file = hosts_param.split('=')[1]
+
+          expect(File.read(hosts_file))
+            .to eq("[host-foo.com]:123 foo key\n")
+
+          has_yielded = true
+        end
+
+        expect(has_yielded).to be_truthy
+      end
     end
 
     context 'with a PTY' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-api
 version: !ruby/object:Gem::Version
-  version: 0.9.27
+  version: 0.10.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-resource
@@ -178,6 +178,8 @@ files:
 - lib/aptible/api/database_credential.rb
 - lib/aptible/api/database_image.rb
 - lib/aptible/api/disk.rb
+- lib/aptible/api/ephemeral_container.rb
+- lib/aptible/api/ephemeral_session.rb
 - lib/aptible/api/image.rb
 - lib/aptible/api/log_drain.rb
 - lib/aptible/api/operation.rb
@@ -215,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby client for api.aptible.com