aptible-cli 0.18.0 → 0.19.0

data/spec/fabricators/account_fabricator.rb

@@ -26,4 +26,7 @@ Fabricator(:account, from: :stub_account) do
   apps { [] }
   databases { [] }
   certificates { [] }
+  log_drains { [] }
+  metric_drains { [] }
+  created_at { Time.now }
 end

data/spec/fabricators/app_fabricator.rb

@@ -29,6 +29,7 @@ Fabricator(:app, from: :stub_app) do
   configurations { [] }
   current_configuration { nil }
   errors { Aptible::Resource::Errors.new }
+  created_at { Time.now }
 
   after_create { |app| app.account.apps << app }
 end

data/spec/fabricators/database_disk_fabricator.rb

@@ -3,5 +3,6 @@ end
 
 Fabricator(:database_disk, from: :stub_database_disk) do
   size 100
-  ebs_volume_type { 'gb2' }
+  ebs_volume_type { 'gp2' }
+  baseline_iops '300'
 end

data/spec/fabricators/database_fabricator.rb

@@ -22,6 +22,7 @@ Fabricator(:database, from: :stub_database) do
 
   backups { [] }
   database_credentials { [] }
+  created_at { Time.now }
 
   after_create do |database, transients|
     database.account.databases << database

data/spec/fabricators/log_drain_fabricator.rb

@@ -0,0 +1,21 @@
+class StubLogDrain < OpenStruct
+  def attributes
+    # I foresee hard-coding values like this
+    # being hard to debug in the future,
+    # so sorry if you're here and cursing me, but
+    # I can't think of a better way to fake this.
+    {
+      'drain_username' => drain_username,
+      'drain_host' => drain_host,
+      'drain_port' => drain_port,
+      'url' => url
+    }
+  end
+end
+
+Fabricator(:log_drain, from: :stub_log_drain) do
+  id { sequence(:log_drain_id) }
+  account
+
+  after_create { |drain| drain.account.log_drains << drain }
+end

data/spec/fabricators/metric_drain_fabricator.rb

@@ -0,0 +1,8 @@
+class StubMetricDrain < OpenStruct; end
+
+Fabricator(:metric_drain, from: :stub_metric_drain) do
+  id { sequence(:metric_drain_id) }
+  account
+
+  after_create { |drain| drain.account.metric_drains << drain }
+end

data/spec/fabricators/service_fabricator.rb

@@ -14,6 +14,7 @@ Fabricator(:service, from: :stub_service) do
   container_count { 1 }
   container_memory_limit_mb { 512 }
   vhosts { [] }
+  created_at { Time.now }
 
   after_create do |service, transients|
     if transients[:app]

data/spec/fabricators/vhost_fabricator.rb

@@ -7,6 +7,7 @@ Fabricator(:vhost, from: :stub_vhost) do
   virtual_domain { Fabricate.sequence(:virtual_domain) { |i| "domain#{i}" } }
   ip_whitelist { [] }
   container_ports { [] }
+  created_at { Time.now }
 
   after_create { |vhost| vhost.service.vhosts << vhost }
 end

data/spec/spec_helper.rb

@@ -11,6 +11,10 @@ end
 # Require library up front
 require 'aptible/cli'
 
+def fmt_time(time)
+  time.strftime('%Y-%m-%d %H:%M:%S %z')
+end
+
 class SpecRenderer < Aptible::CLI::Renderer::Base
   def initialize
     @nodes = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-resource
@@ -274,8 +274,11 @@ files:
 - lib/aptible/cli/formatter/value.rb
 - lib/aptible/cli/helpers/app.rb
 - lib/aptible/cli/helpers/app_or_database.rb
+- lib/aptible/cli/helpers/config_path.rb
 - lib/aptible/cli/helpers/database.rb
 - lib/aptible/cli/helpers/environment.rb
+- lib/aptible/cli/helpers/log_drain.rb
+- lib/aptible/cli/helpers/metric_drain.rb
 - lib/aptible/cli/helpers/operation.rb
 - lib/aptible/cli/helpers/security_key.rb
 - lib/aptible/cli/helpers/ssh.rb
@@ -294,11 +297,12 @@ files:
 - lib/aptible/cli/subcommands/config.rb
 - lib/aptible/cli/subcommands/db.rb
 - lib/aptible/cli/subcommands/deploy.rb
-- lib/aptible/cli/subcommands/domains.rb
 - lib/aptible/cli/subcommands/endpoints.rb
 - lib/aptible/cli/subcommands/environment.rb
 - lib/aptible/cli/subcommands/inspect.rb
+- lib/aptible/cli/subcommands/log_drain.rb
 - lib/aptible/cli/subcommands/logs.rb
+- lib/aptible/cli/subcommands/metric_drain.rb
 - lib/aptible/cli/subcommands/operation.rb
 - lib/aptible/cli/subcommands/rebuild.rb
 - lib/aptible/cli/subcommands/restart.rb
@@ -323,11 +327,12 @@ files:
 - spec/aptible/cli/subcommands/config_spec.rb
 - spec/aptible/cli/subcommands/db_spec.rb
 - spec/aptible/cli/subcommands/deploy_spec.rb
-- spec/aptible/cli/subcommands/domains_spec.rb
 - spec/aptible/cli/subcommands/endpoints_spec.rb
 - spec/aptible/cli/subcommands/environment_spec.rb
 - spec/aptible/cli/subcommands/inspect_spec.rb
+- spec/aptible/cli/subcommands/log_drain_spec.rb
 - spec/aptible/cli/subcommands/logs_spec.rb
+- spec/aptible/cli/subcommands/metric_drain_spec.rb
 - spec/aptible/cli/subcommands/operation_spec.rb
 - spec/aptible/cli/subcommands/rebuild_spec.rb
 - spec/aptible/cli/subcommands/restart_spec.rb
@@ -343,6 +348,8 @@ files:
 - spec/fabricators/database_disk_fabricator.rb
 - spec/fabricators/database_fabricator.rb
 - spec/fabricators/database_image_fabricator.rb
+- spec/fabricators/log_drain_fabricator.rb
+- spec/fabricators/metric_drain_fabricator.rb
 - spec/fabricators/operation_fabricator.rb
 - spec/fabricators/service_fabricator.rb
 - spec/fabricators/stack_fabricator.rb
@@ -398,11 +405,12 @@ test_files:
 - spec/aptible/cli/subcommands/config_spec.rb
 - spec/aptible/cli/subcommands/db_spec.rb
 - spec/aptible/cli/subcommands/deploy_spec.rb
-- spec/aptible/cli/subcommands/domains_spec.rb
 - spec/aptible/cli/subcommands/endpoints_spec.rb
 - spec/aptible/cli/subcommands/environment_spec.rb
 - spec/aptible/cli/subcommands/inspect_spec.rb
+- spec/aptible/cli/subcommands/log_drain_spec.rb
 - spec/aptible/cli/subcommands/logs_spec.rb
+- spec/aptible/cli/subcommands/metric_drain_spec.rb
 - spec/aptible/cli/subcommands/operation_spec.rb
 - spec/aptible/cli/subcommands/rebuild_spec.rb
 - spec/aptible/cli/subcommands/restart_spec.rb
@@ -418,6 +426,8 @@ test_files:
 - spec/fabricators/database_disk_fabricator.rb
 - spec/fabricators/database_fabricator.rb
 - spec/fabricators/database_image_fabricator.rb
+- spec/fabricators/log_drain_fabricator.rb
+- spec/fabricators/metric_drain_fabricator.rb
 - spec/fabricators/operation_fabricator.rb
 - spec/fabricators/service_fabricator.rb
 - spec/fabricators/stack_fabricator.rb

data/lib/aptible/cli/subcommands/domains.rb

@@ -1,40 +0,0 @@
-require 'shellwords'
-
-module Aptible
-  module CLI
-    module Subcommands
-      module Domains
-        def self.included(thor)
-          thor.class_eval do
-            include Helpers::Operation
-            include Helpers::App
-
-            desc 'domains',
-                 "Print an app's current virtual domains - DEPRECATED"
-            app_options
-            option :verbose, aliases: '-v'
-            def domains
-              deprecated 'This command is deprecated in favor of endpoints:list'
-              app = ensure_app(options)
-              print_vhosts(app) do |vhost|
-                if options[:verbose]
-                  "#{vhost.virtual_domain} -> #{vhost.external_host}"
-                else
-                  vhost.virtual_domain
-                end
-              end
-            end
-
-            private
-
-            def print_vhosts(app)
-              (app.vhosts || []).each do |vhost|
-                say yield(vhost)
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/spec/aptible/cli/subcommands/domains_spec.rb

@@ -1,76 +0,0 @@
-require 'spec_helper'
-
-describe Aptible::CLI::Agent do
-  before do
-    allow(subject).to receive(:ask)
-    allow(subject).to receive(:save_token)
-    allow(subject).to receive(:fetch_token) { double 'token' }
-  end
-
-  let!(:account) { Fabricate(:account) }
-  let!(:app) { Fabricate(:app, handle: 'hello', account: account) }
-  let!(:service) { Fabricate(:service, app: app) }
-  let(:op) { Fabricate(:operation, status: 'succeeded', resource: app) }
-
-  before do
-    allow(Aptible::Api::App).to receive(:all) { [app] }
-    allow(Aptible::Api::Account).to receive(:all) { [account] }
-  end
-
-  let!(:vhost1) do
-    Fabricate(:vhost, virtual_domain: 'domain1', external_host: 'host1',
-                      service: service)
-  end
-
-  let!(:vhost2) do
-    Fabricate(:vhost, virtual_domain: 'domain2', external_host: 'host2',
-                      service: service)
-  end
-
-  describe '#domains' do
-    it 'should print out the hostnames' do
-      expect(subject).to receive(:environment_from_handle)
-        .with('foobar')
-        .and_return(account)
-      expect(subject).to receive(:apps_from_handle).and_return([app])
-      allow(subject).to receive(:options) do
-        { environment: 'foobar', app: 'web' }
-      end
-      expect(subject).to receive(:say).with('domain1')
-      expect(subject).to receive(:say).with('domain2')
-
-      subject.send('domains')
-    end
-
-    it 'should fail if app is non-existent' do
-      allow(subject).to receive(:options) { { app: 'not-an-app' } }
-
-      expect do
-        subject.send('domains')
-      end.to raise_error(Thor::Error, /Could not find app/)
-    end
-
-    it 'should fail if environment is non-existent' do
-      allow(Aptible::Api::Account).to receive(:all) { [] }
-
-      expect do
-        subject.send('domains')
-      end.to raise_error(Thor::Error)
-    end
-
-    it 'should print hostnames if -v is passed' do
-      expect(subject).to receive(:environment_from_handle)
-        .with('foobar')
-        .and_return(account)
-      expect(subject).to receive(:apps_from_handle).and_return([app])
-      allow(subject).to receive(:options) do
-        { verbose: true, app: 'hello', environment: 'foobar' }
-      end
-
-      expect(subject).to receive(:say).with('domain1 -> host1')
-      expect(subject).to receive(:say).with('domain2 -> host2')
-
-      subject.send('domains')
-    end
-  end
-end