aptible-cli 0.20.0 → 0.22.0

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

@@ -0,0 +1,115 @@
+require 'spec_helper'
+
+describe Aptible::CLI::Agent do
+  let(:token) { 'some-token' }
+  let(:account) { Fabricate(:account, handle: 'test') }
+  let(:database) { Fabricate(:database, account: account, handle: 'some-db') }
+  let!(:policy) do
+    # created_at: 2016-06-14 13:24:11 +0000
+    Fabricate(:backup_retention_policy, account: account)
+  end
+
+  let(:default_handle) { 'some-db-at-2016-06-14-13-24-11' }
+
+  before do
+    allow(subject).to receive(:fetch_token).and_return(token)
+    allow(Aptible::Api::Account).to receive(:all) { [account] }
+  end
+
+  describe '#backup_retention_policy' do
+    it 'raises an error if the environment has no policy' do
+      allow(account).to receive(:backup_retention_policies).and_return([])
+      expect { subject.backup_retention_policy('test') }
+        .to raise_error(/does not have a custom backup retention policy/)
+    end
+
+    it "prints the enviroment's current policy" do
+      subject.backup_retention_policy('test')
+      out = captured_output_text
+      expect(out).to match(/daily: 30/i)
+      expect(out).to match(/monthly: 12/i)
+      expect(out).to match(/yearly: 6/i)
+      expect(out).to match(/make copy: true/i)
+      expect(out).to match(/keep final: true/i)
+      expect(out).to match(/environment: test/i)
+    end
+  end
+
+  describe '#backup_retention_policy:set' do
+    it 'requires all attributes if the environment has no policy' do
+      allow(account).to receive(:backup_retention_policies).and_return([])
+      opts = {
+        daily: 3,
+        monthly: 2,
+        yearly: 1,
+        make_copy: false,
+        keep_final: true
+      }
+
+      opts.each_key do |k|
+        missing_opts = opts.clone
+        missing_opts.delete(k)
+
+        subject.options = missing_opts
+        expect { subject.send('backup_retention_policy:set', 'test') }
+          .to raise_error(/please specify all attributes/i)
+      end
+
+      expect(account).to receive(:create_backup_retention_policy!)
+        .with(**opts).and_return(Fabricate(:backup_retention_policy))
+      subject.options = opts
+      subject.send('backup_retention_policy:set', 'test')
+    end
+
+    it 'merges provided options with the current policy' do
+      expected_opts = {
+        daily: 5,
+        monthly: policy.monthly,
+        yearly: policy.yearly,
+        make_copy: policy.make_copy,
+        keep_final: false
+      }
+
+      expect(account).to receive(:create_backup_retention_policy!)
+        .with(**expected_opts).and_return(Fabricate(:backup_retention_policy))
+      subject.options = { daily: 5, keep_final: false, force: true }
+      subject.send('backup_retention_policy:set', 'test')
+    end
+
+    it 'prompts the user if the new policy retains fewer backups' do
+      subject.options = { daily: 0 }
+
+      # Reject Prompt
+      expect(subject).to receive(:yes?).with(/do you want to proceed/i)
+
+      expect { subject.send('backup_retention_policy:set', 'test') }
+        .to raise_error(/aborting/i)
+
+      # Accept Prompt
+      expect(subject).to receive(:yes?).with(/do you want to proceed/i)
+        .and_return(true)
+
+      expect(account).to receive(:create_backup_retention_policy!)
+        .and_return(Fabricate(:backup_retention_policy))
+
+      subject.send('backup_retention_policy:set', 'test')
+    end
+
+    it '--force skips the confirmation promt' do
+      subject.options = { make_copy: false }
+
+      # Reject Prompt
+      expect(subject).to receive(:yes?).with(/do you want to proceed/i)
+
+      expect { subject.send('backup_retention_policy:set', 'test') }
+        .to raise_error(/aborting/i)
+
+      # --force
+      subject.options[:force] = true
+      expect(account).to receive(:create_backup_retention_policy!)
+        .and_return(Fabricate(:backup_retention_policy))
+
+      subject.send('backup_retention_policy:set', 'test')
+    end
+  end
+end

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

@@ -116,6 +116,21 @@ describe Aptible::CLI::Agent do
         subject.send('backup:restore', 1)
       end
 
+      it 'accept scaling options' do
+        expect(backup).to receive(:create_operation!) do |options|
+          expect(options[:instance_profile]).to eq('m5')
+          expect(options[:provisioned_iops]).to eq(4000)
+          op
+        end
+
+        expect(subject).to receive(:attach_to_operation_logs).with(op) do
+          Fabricate(:database, account: account, handle: default_handle)
+        end
+
+        subject.options = { container_profile: 'm5', iops: 4000 }
+        subject.send('backup:restore', 1)
+      end
+
       it 'accepts an destination environment' do
         expect(backup).to receive(:create_operation!) do |options|
           expect(options[:handle]).to be_present

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

@@ -70,6 +70,20 @@ describe Aptible::CLI::Agent do
       subject.send('db:create', 'foo')
     end
 
+    it 'creates a new DB with container profile and iops' do
+      expect_provision_database(
+        { handle: 'foo', type: 'postgresql' },
+        { instance_profile: 'm5', provisioned_iops: 4000 }
+      )
+
+      subject.options = {
+        type: 'postgresql',
+        container_profile: 'm5',
+        iops: 4000
+      }
+      subject.send('db:create', 'foo')
+    end
+
     it 'deprovisions the database if the operation cannot be created' do
       db = Fabricate(:database)
 

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

@@ -160,6 +160,27 @@ describe Aptible::CLI::Agent do
         expect { subject.deploy }
           .to raise_error(/either from git.*docker/im)
       end
+
+      it 'allows providing scaling options' do
+        stub_options(
+          container_profile: 'm5',
+          container_size: 1024,
+          container_count: 2
+        )
+
+        expect(app).to receive(:create_operation!)
+          .with(
+            type: 'deploy',
+            container_size: 1024,
+            instance_profile: 'm5',
+            container_count: 2
+          )
+          .and_return(operation)
+        expect(subject).to receive(:attach_to_operation_logs)
+          .with(operation)
+
+        subject.deploy
+      end
     end
   end
 end

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

@@ -452,6 +452,30 @@ describe Aptible::CLI::Agent do
       end
     end
 
+    describe 'endpoints:grpc:create' do
+      m = 'endpoints:grpc:create'
+      include_examples 'shared create app vhost examples', m
+      include_examples 'shared create tls vhost examples', m
+
+      it 'creates a gRPC Endpoint' do
+        expect_create_vhost(
+          service,
+          type: 'grpc',
+          platform: 'elb',
+          internal: false,
+          default: false,
+          ip_whitelist: []
+        )
+        subject.send(m, 'web')
+      end
+
+      it 'creates an Endpoint with a container Port' do
+        expect_create_vhost(service, container_port: 10)
+        stub_options(port: 10)
+        subject.send(m, 'web')
+      end
+    end
+
     shared_examples 'shared modify app vhost examples' do |m|
       it 'does not change anything if no options are passed' do
         v = Fabricate(:vhost, service: service)
@@ -579,6 +603,20 @@ describe Aptible::CLI::Agent do
       end
     end
 
+    describe 'endpoints:grpc:modify' do
+      m = 'endpoints:grpc:modify'
+      include_examples 'shared modify app vhost examples', m
+      include_examples 'shared modify tls vhost examples', m
+
+      it 'allows updating the Container Port' do
+        v = Fabricate(:vhost, service: service)
+        expect_modify_vhost(v, container_port: 10)
+
+        stub_options(port: 10)
+        subject.send(m, v.external_host)
+      end
+    end
+
     describe 'endpoints:list' do
       it 'lists Endpoints across services' do
         s1 = Fabricate(:service, app: app)

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

@@ -8,45 +8,78 @@ describe Aptible::CLI::Agent do
     allow(subject).to receive(:fetch_token) { token }
     allow(Aptible::Api::App).to receive(:all).with(token: token)
       .and_return([app])
-    allow(subject).to receive(:options).and_return(app: app.handle)
   end
 
-  it 'lists a CMD service' do
-    Fabricate(:service, app: app, process_type: 'cmd', command: nil)
-    subject.send('services')
+  describe '#services' do
+    before do
+      allow(subject).to receive(:options).and_return(app: app.handle)
+    end
 
-    expect(captured_output_text.split("\n")).to include('Service: cmd')
-    expect(captured_output_text.split("\n")).to include('Command: CMD')
-  end
+    it 'lists a CMD service' do
+      Fabricate(:service, app: app, process_type: 'cmd', command: nil)
+      subject.send('services')
 
-  it 'lists a service with command' do
-    Fabricate(:service, app: app, process_type: 'cmd', command: 'foobar')
-    subject.send('services')
+      expect(captured_output_text.split("\n")).to include('Service: cmd')
+      expect(captured_output_text.split("\n")).to include('Command: CMD')
+    end
 
-    expect(captured_output_text.split("\n")).to include('Service: cmd')
-    expect(captured_output_text.split("\n")).to include('Command: foobar')
-  end
+    it 'lists a service with command' do
+      Fabricate(:service, app: app, process_type: 'cmd', command: 'foobar')
+      subject.send('services')
 
-  it 'lists container size' do
-    Fabricate(:service, app: app, container_memory_limit_mb: 1024)
-    subject.send('services')
+      expect(captured_output_text.split("\n")).to include('Service: cmd')
+      expect(captured_output_text.split("\n")).to include('Command: foobar')
+    end
 
-    expect(captured_output_text.split("\n")).to include('Container Size: 1024')
-  end
+    it 'lists container size' do
+      Fabricate(:service, app: app, container_memory_limit_mb: 1024)
+      subject.send('services')
+
+      expect(captured_output_text.split("\n"))
+        .to include('Container Size: 1024')
+    end
 
-  it 'lists container count' do
-    Fabricate(:service, app: app, container_count: 3)
-    subject.send('services')
+    it 'lists container count' do
+      Fabricate(:service, app: app, container_count: 3)
+      subject.send('services')
 
-    expect(captured_output_text.split("\n")).to include('Container Count: 3')
+      expect(captured_output_text.split("\n")).to include('Container Count: 3')
+    end
+
+    it 'lists multiple services' do
+      Fabricate(:service, app: app, process_type: 'foo')
+      Fabricate(:service, app: app, process_type: 'bar')
+      subject.send('services')
+
+      expect(captured_output_text.split("\n")).to include('Service: foo')
+      expect(captured_output_text.split("\n")).to include('Service: bar')
+    end
   end
 
-  it 'lists multiple services' do
-    Fabricate(:service, app: app, process_type: 'foo')
-    Fabricate(:service, app: app, process_type: 'bar')
-    subject.send('services')
+  describe '#services:settings' do
+    let(:base_options) { { app: app.handle } }
+
+    it 'allows changing zero_downtime_deployment settings' do
+      stub_options(force_zero_downtime: true, simple_health_check: true)
+      service = Fabricate(:service, app: app, process_type: 'foo')
+
+      expect(service).to receive(:update!)
+        .with(force_zero_downtime: true, naive_health_check: true)
+
+      subject.send('services:settings', 'foo')
+    end
+
+    it 'allows changing only one of the options' do
+      stub_options(simple_health_check: true)
+      service = Fabricate(:service, app: app, process_type: 'foo')
+
+      expect(service).to receive(:update!).with(naive_health_check: true)
+
+      subject.send('services:settings', 'foo')
+    end
+  end
 
-    expect(captured_output_text.split("\n")).to include('Service: foo')
-    expect(captured_output_text.split("\n")).to include('Service: bar')
+  def stub_options(**opts)
+    allow(subject).to receive(:options).and_return(base_options.merge(opts))
   end
 end

data/spec/fabricators/account_fabricator.rb

@@ -28,5 +28,6 @@ Fabricator(:account, from: :stub_account) do
   certificates { [] }
   log_drains { [] }
   metric_drains { [] }
+  backup_retention_policies { [] }
   created_at { Time.now }
 end

data/spec/fabricators/backup_retention_policy_fabricator.rb

@@ -0,0 +1,18 @@
+class StubBackupRetentionPolicy < OpenStruct
+  def reload
+    self
+  end
+end
+
+Fabricator(:backup_retention_policy, from: :stub_backup_retention_policy) do
+  id { sequence(:backup_retention_policy_id) }
+  created_at { Time.now }
+  daily { 30 }
+  monthly { 12 }
+  yearly { 6 }
+  make_copy { true }
+  keep_final { true }
+  account
+
+  after_create { |policy| policy.account.backup_retention_policies << policy }
+end

metadata

@@ -1,57 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Frank Macreery
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-04 00:00:00.000000000 Z
+date: 2024-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aptible-resource
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: aptible-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.6.5
 - !ruby/object:Gem::Dependency
   name: aptible-auth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: aptible-billing
   requirement: !ruby/object:Gem::Requirement
@@ -67,35 +73,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: aptible-resource
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: git
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: term-ansicolor
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.5
+- !ruby/object:Gem::Dependency
+  name: cbor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,67 +143,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.10.6
 - !ruby/object:Gem::Dependency
-  name: cbor
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.10
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
-  name: bigdecimal
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
+        version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 0.20.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -292,9 +334,9 @@ extra_rdoc_files: []
 files:
 - ".dockerignore"
 - ".github/CODEOWNERS"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Dockerfile
 - Gemfile
 - Gemfile.lock
@@ -379,6 +421,7 @@ files:
 - spec/aptible/cli/renderer/text_spec.rb
 - spec/aptible/cli/resource_formatter_spec.rb
 - spec/aptible/cli/subcommands/apps_spec.rb
+- spec/aptible/cli/subcommands/backup_retention_policy_spec.rb
 - spec/aptible/cli/subcommands/backup_spec.rb
 - spec/aptible/cli/subcommands/config_spec.rb
 - spec/aptible/cli/subcommands/db_spec.rb
@@ -399,6 +442,7 @@ files:
 - spec/fabricators/account_fabricator.rb
 - spec/fabricators/app_fabricator.rb
 - spec/fabricators/backup_fabricator.rb
+- spec/fabricators/backup_retention_policy_fabricator.rb
 - spec/fabricators/certificate_fabricator.rb
 - spec/fabricators/configuration_fabricator.rb
 - spec/fabricators/database_credential_fabricator.rb
@@ -427,7 +471,7 @@ homepage: https://github.com/aptible/aptible-cli
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -442,8 +486,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Command-line interface for Aptible services
 test_files:
@@ -463,6 +507,7 @@ test_files:
 - spec/aptible/cli/renderer/text_spec.rb
 - spec/aptible/cli/resource_formatter_spec.rb
 - spec/aptible/cli/subcommands/apps_spec.rb
+- spec/aptible/cli/subcommands/backup_retention_policy_spec.rb
 - spec/aptible/cli/subcommands/backup_spec.rb
 - spec/aptible/cli/subcommands/config_spec.rb
 - spec/aptible/cli/subcommands/db_spec.rb
@@ -483,6 +528,7 @@ test_files:
 - spec/fabricators/account_fabricator.rb
 - spec/fabricators/app_fabricator.rb
 - spec/fabricators/backup_fabricator.rb
+- spec/fabricators/backup_retention_policy_fabricator.rb
 - spec/fabricators/certificate_fabricator.rb
 - spec/fabricators/configuration_fabricator.rb
 - spec/fabricators/database_credential_fabricator.rb