aptible-api 1.0.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: badb2a83972ce6b05b50ec1ee107f45b41eb1817
-  data.tar.gz: bb991020c5af70cd9f2655122c54fe7d0ed95555
+SHA256:
+  metadata.gz: be1c6053f997574827fdcfb296226ff27099004d6c41f518e9af1282289aa6be
+  data.tar.gz: 5358305b1616321c836cccbe74e59510f6d47f5075f5ab36cfa80bd01b9b34b8
 SHA512:
-  metadata.gz: 5c3d799644752a869c4467431520d73c9878b270519c9e137ee54da5e01787b621f098af164a8d4b7c7683786322c45e71b01bd40b55bff4e08c94c53ec403f7
-  data.tar.gz: a319e8406cf1cbbf80108ecae77396b5931cc642446bc98a9fca67c27f0babf6fa38b5923bb4afd1bf82ceda2d0862d9f6c3b721e640f6cbac0171d6cdaf5b2f
+  metadata.gz: 482ba8b83dc939813695cd27715767741a67fdc14920e0b152e53ee1aa9b05263762e130e973e88b13a00933c6d9cfc9afe85989e8621647c1d3f48c8663ecad
+  data.tar.gz: 5aeaaef8f892b287f45ed953e6e0a54d765c6467bf58aed2d4e33379686c8c2cda12724c94b066e7cf647c24392de3e1fb71ba9c75be43f13d0d9448da5f70f7

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+*   @almathew

data/.travis.yml

@@ -1,6 +1,9 @@
 sudo: false
 
 rvm:
-  - "2.0"
   - "2.1"
   - "2.2"
+  - "2.3"
+  - "2.4"
+  - "2.5"
+  - "2.6"

data/README.md

@@ -61,6 +61,4 @@ end
 
 MIT License, see [LICENSE](LICENSE.md) for details.
 
-Copyright (c) 2014 [Aptible](https://www.aptible.com) and contributors.
-
-[<img src="https://s.gravatar.com/avatar/9b58236204e844e3181e43e05ddb0809?s=60" style="border-radius: 50%;" alt="@sandersonet" />](https://github.com/sandersonet)
+Copyright (c) 2019 [Aptible](https://www.aptible.com) and contributors.

data/Rakefile

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

data/aptible-api.gemspec

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
@@ -19,15 +20,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'aptible-resource', '~> 1.0'
   spec.add_dependency 'aptible-auth', '~> 1.0'
+  spec.add_dependency 'aptible-resource', '~> 1.0'
   spec.add_dependency 'gem_config'
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'aptible-tasks', '>= 0.2.0'
   spec.add_development_dependency 'activesupport'
-  spec.add_development_dependency 'rake', '~> 10.5'
-  spec.add_development_dependency 'rspec', '~> 2.0'
+  spec.add_development_dependency 'aptible-tasks', '>= 0.2.0'
+  spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'foreman'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake', '~> 12.3.3'
+  spec.add_development_dependency 'rspec', '~> 3.9.0'
+  spec.add_development_dependency 'rspec-its', '~> 1.3.0'
 end

data/lib/aptible/api/account.rb

@@ -12,6 +12,8 @@ module Aptible
       has_many :disks
       has_many :services
       has_many :permissions
+      has_many :metric_drains
+      has_many :backup_retention_policy
       embeds_many :log_drains
 
       field :id
@@ -50,6 +52,7 @@ module Aptible
 
       def organization
         return @organization if @organization
+
         auth = Aptible::Auth::Organization.new(token: token, headers: headers)
         @organization = auth.find_by_url(organization_url)
       end
@@ -58,6 +61,14 @@ module Aptible
         rand = ('a'..'z').to_a.sample(8).join
         "#{organization_name.parameterize}-#{plan_id}-#{rand}"
       end
+
+      def each_orphaned_backup
+        base_href = "#{links['backups'].base_href}?orphaned=true"
+        Backup.each_page(href: base_href, headers: headers,
+                         token: token) do |page|
+          page.each { |entry| yield entry }
+        end
+      end
     end
   end
 end

data/lib/aptible/api/backup.rb

@@ -14,6 +14,11 @@ module Aptible
       field :aws_region
       field :created_at, type: Time
       field :updated_at, type: Time
+
+      def database_with_deleted
+        db_id = links['database'].href.split('/').last
+        Database.find(db_id, with_deleted: true, token: token, headers: headers)
+      end
     end
   end
 end

data/lib/aptible/api/backup_retention_policy.rb

@@ -0,0 +1,16 @@
+module Aptible
+  module Api
+    class BackupRetentionPolicy < Resource
+      belongs_to :account
+
+      field :id
+      field :daily
+      field :monthly
+      field :make_copy, type: Aptible::Resource::Boolean
+      field :created_at, type: Time
+      field :updated_at, type: Time
+      field :keep_final, type: Aptible::Resource::Boolean
+      field :account_id
+    end
+  end
+end

data/lib/aptible/api/container.rb

@@ -4,6 +4,7 @@ module Aptible
       belongs_to :release
       belongs_to :vhost
       belongs_to :log_drain
+      belongs_to :metric_drain
 
       field :id
       field :host
@@ -16,6 +17,7 @@ module Aptible
       field :layer
       field :aws_instance_id
       field :port_mapping
+      field :mounts
     end
   end
 end

data/lib/aptible/api/database.rb

@@ -28,12 +28,27 @@ module Aptible
       def failed?
         # TODO: Add failed status at API level
         return false if provisioned?
+
         operations.select { |o| o.type == 'provision' }.all?(&:failed?)
       end
 
       def provisioned?
         status == 'provisioned'
       end
+
+      def current_configuration_with_deleted
+        id = links['current_configuration'].href.split('/').last
+        Aptible::Api::Configuration.find(
+          id, with_deleted: true, token: token, headers: headers
+        )
+      end
+
+      def disk_with_deleted
+        id = links['disk'].href.split('/').last
+        Aptible::Api::Disk.find(
+          id, with_deleted: true, token: token, headers: headers
+        )
+      end
     end
   end
 end

data/lib/aptible/api/metric_drain.rb

@@ -0,0 +1,28 @@
+module Aptible
+  module Api
+    class MetricDrain < Resource
+      belongs_to :account
+      belongs_to :database
+      has_many :operations
+      has_many :containers
+
+      field :id
+
+      field :handle
+      field :status
+      field :drain_type
+      field :drain_configuration
+
+      field :aggregator_ca_certificate
+      field :aggregator_ca_private_key_blob
+      field :aggregator_host
+      field :aggregator_port_mapping
+      field :aggregator_docker_name
+      field :aggregator_instance_id
+      field :aggregator_allocation
+
+      field :created_at, type: Time
+      field :updated_at, type: Time
+    end
+  end
+end

data/lib/aptible/api/operation.rb

@@ -28,13 +28,14 @@ module Aptible
       belongs_to :destination_account
       field :user_name
       field :user_email
+      field :immediate
       field :created_at, type: Time
       field :updated_at, type: Time
 
       def user
         auth = Aptible::Auth::User.new(token: token, headers: headers)
         auth.find_by_url(links['user'].href)
-      rescue
+      rescue StandardError
         nil
       end
 

data/lib/aptible/api/resource.rb

@@ -35,3 +35,5 @@ require 'aptible/api/stack'
 require 'aptible/api/database_credential'
 require 'aptible/api/ephemeral_session'
 require 'aptible/api/ephemeral_container'
+require 'aptible/api/metric_drain'
+require 'aptible/api/backup_retention_policy'

data/lib/aptible/api/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Api
-    VERSION = '1.0.2'.freeze
+    VERSION = '1.2.4'.freeze
   end
 end

data/spec/spec_helper.rb

@@ -9,6 +9,8 @@ end
 # Require library up front
 require 'aptible/api'
 
+require 'rspec/its'
+
 RSpec.configure do |config|
   config.before { Aptible::Api.configuration.reset }
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: aptible-api
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.2.4
 platform: ruby
 authors:
 - Frank Macreery
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2020-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aptible-resource
+  name: aptible-auth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: aptible-auth
+  name: aptible-resource
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aptible-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: foreman
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,61 +109,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
-  name: foreman
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 description: Ruby client for api.aptible.com
 email:
 - frank@macreery.com
@@ -157,6 +171,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CODEOWNERS"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -171,6 +186,7 @@ files:
 - lib/aptible/api/agent.rb
 - lib/aptible/api/app.rb
 - lib/aptible/api/backup.rb
+- lib/aptible/api/backup_retention_policy.rb
 - lib/aptible/api/certificate.rb
 - lib/aptible/api/configuration.rb
 - lib/aptible/api/container.rb
@@ -182,6 +198,7 @@ files:
 - lib/aptible/api/ephemeral_session.rb
 - lib/aptible/api/image.rb
 - lib/aptible/api/log_drain.rb
+- lib/aptible/api/metric_drain.rb
 - lib/aptible/api/operation.rb
 - lib/aptible/api/permission.rb
 - lib/aptible/api/release.rb
@@ -201,7 +218,7 @@ homepage: https://github.com/aptible/aptible-api-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -216,9 +233,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Ruby client for api.aptible.com
 test_files: