droplet_kit 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 025077918c4a61f739d58486166607209439b129
-  data.tar.gz: c66125a6ac2909c842b79242e3c818c0e5228287
+  metadata.gz: 9321808dc6ae64cb77eb86c4411a41a3eb6592f9
+  data.tar.gz: 83ad4999326aa114fb3a05832ae08ed31c4bd86a
 SHA512:
-  metadata.gz: 6198f8fc7be8f537cbbbd8996253c877748428ada7078c680f4f95598d3e2d7dbcd8aebb99da5623927c7d8dbaec30ff2dc6f6a2eb7c814c2bd2d6a2029c4e57
-  data.tar.gz: f84a6955aae3e753dcba901b31527bde4048e887779be627b77a68b6a0e3b49801e71b4b3624d3d7043c4c59640af27cae4cf512d2a516ff5a7c38025ae736c8
+  metadata.gz: 036ef5cb5972947986806e9e194ac470d03684e32597702d3ac866b65b51dd39e7761fbc0b1b93862fbf795b3b3c46fa2b5dc1d2622461731c7e639a57db50a9
+  data.tar.gz: 0add3525b382329e513187b96e3ed6b1c3c7bad1485c24c327553a126de270781ec4e40c513b12e8c34d68d7dc903d6d477a31cb585279fd8620235584354909

data/.travis.yml

@@ -6,15 +6,16 @@ before_install:
 
 rvm:
   - "2.0.0"
-  - "2.1.5"
-  - "2.2.2"
-  - "2.3.0"
+  - "2.1.10"
+  - "2.2.7"
+  - "2.3.4"
+  - "2.4.1"
 
 matrix:
   exclude:
     - rvm: "2.0.0"
       env: ACTIVESUPPORT_VERSION=5
-    - rvm: "2.1.5"
+    - rvm: "2.1.10"
       env: ACTIVESUPPORT_VERSION=5
 
 env:

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### Version 2.2.0
+* Added Firewall resource.
+* Added support for updating TTLs for DomainRecord resource.
+* Added support of all Rails 5 releases.
+* Added depreciation for Tag resource rename.
+
 ### Version 2.1.0
 * Added monitoring to the Droplet resource.
 * Added LoadBalancer resource.

data/README.md

@@ -162,7 +162,8 @@ client.domain_records #=> DropletKit::DomainRecordResource
 domain_record = DropletKit::DomainRecord.new(
   type: 'CNAME',
   name: 'www',
-  data: '@'
+  data: '@',
+  ttl: 1800
 )
 ```
 
@@ -174,6 +175,58 @@ Actions supported:
 * `client.domain_records.delete(for_domain: 'for_domain', id: 'id')`
 * `client.domain_records.update(domain_record, for_domain: 'for_domain', id: 'id')`
 
+## Firewall resource
+
+```ruby
+client = DropletKit::Client.new(access_token: 'TOKEN')
+client.firewalls #=> DropletKit::FirewallResource
+
+inbound_rule = DropletKit::FirewallInboundRule.new(
+  protocol: 'icmp',
+  ports: '0',
+  sources: {
+    tags: ['frontend', 'backend'],
+    load_balancer_uids: ['d2d3920a-9d45-41b0-b018-d15e18ec60a4']
+  }
+)
+
+outbound_rule = DropletKit::FirewallOutboundRule.new(
+  protocol: 'icmp',
+  ports: '0',
+  destinations: {
+    addresses: ["127.0.0.0"],
+    droplet_ids: [456, 789]
+  }
+)
+
+firewall = DropletKit::Firewall.new(
+  name: 'firewall',
+  inbound_rules: [
+    inbound_rule
+  ],
+  outbound_rules: [
+    outbound_rule
+  ],
+  droplet_ids: [123],
+  tags: ['backend']
+)
+```
+
+Actions supported:
+
+* `client.firewalls.find(id: 'id')`
+* `client.firewalls.create(firewall)`
+* `client.firewalls.update(firewall, id: 'id')`
+* `client.firewalls.all()`
+* `client.firewalls.all_by_droplet(droplet_id: 'id')`
+* `client.firewalls.delete(id: 'id')`
+* `client.firewalls.add_droplets([droplet.id], id: 'id')`
+* `client.firewalls.remove_droplets([droplet.id], id: 'id')`
+* `client.firewalls.add_tags([tag.name], id: 'id')`
+* `client.firewalls.remove_tags([tag.name], id: 'id')`
+* `client.firewalls.add_rules(inbound_rules: [inbound_rule], outbound_rules: [outbound_rule], id: 'id')`
+* `client.firewalls.remove_rules(inbound_rules: [inbound_rule], outbound_rules: [outbound_rule], id: 'id')`
+
 
 ## Image resource
 
@@ -272,6 +325,22 @@ Actions supported:
 * `client.ssh_keys.delete(id: 'id')`
 * `client.ssh_keys.update(ssh_key, id: 'id')`
 
+## Tag resource
+
+```ruby
+client = DropletKit::Client.new(access_token: 'TOKEN')
+client.tags #=> DropletKit::TagResource
+```
+
+Actions supported:
+
+* `client.tags.all()`
+* `client.tags.find(name: 'name')`
+* `client.tags.create(tag)
+* `client.tags.delete(name: 'name')`
+* `client.tags.tag_resources(name: 'name', resources: [{ resource_id => 'droplet_id', resource_type: 'droplet' }])`
+* `client.tags.untag_resources(name 'name', resources: [{ resource_id => 'droplet_id', resource_type: 'droplet' }])`
+
 ## Account resource
 
 ```ruby

data/droplet_kit.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'virtus', '~> 1.0.3'
   spec.add_dependency "resource_kit", '~> 0.1.5'
   spec.add_dependency "kartograph", '~> 0.2.3'
-  spec.add_dependency "activesupport", '> 3.0', '< 5.1'
+  spec.add_dependency "activesupport", '> 3.0', '< 6'
   spec.add_dependency "faraday", '~> 0.9.1'
 
   spec.add_development_dependency "bundler", ">= 1.11.0"

data/lib/droplet_kit.rb

@@ -33,6 +33,11 @@ module DropletKit
   autoload :HealthCheck, 'droplet_kit/models/health_check'
   autoload :ForwardingRule, 'droplet_kit/models/forwarding_rule'
   autoload :Certificate, 'droplet_kit/models/certificate'
+  autoload :Firewall, 'droplet_kit/models/firewall'
+  autoload :FirewallRule, 'droplet_kit/models/firewall_rule'
+  autoload :FirewallInboundRule, 'droplet_kit/models/firewall_inbound_rule'
+  autoload :FirewallOutboundRule, 'droplet_kit/models/firewall_outbound_rule'
+  autoload :FirewallPendingChange, 'droplet_kit/models/firewall_pending_change'
 
   # Resources
   autoload :DropletResource, 'droplet_kit/resources/droplet_resource'
@@ -55,6 +60,7 @@ module DropletKit
   autoload :SnapshotResource, 'droplet_kit/resources/snapshot_resource'
   autoload :LoadBalancerResource, 'droplet_kit/resources/load_balancer_resource'
   autoload :CertificateResource, 'droplet_kit/resources/certificate_resource'
+  autoload :FirewallResource, 'droplet_kit/resources/firewall_resource'
 
   # JSON Maps
   autoload :DropletMapping, 'droplet_kit/mappings/droplet_mapping'
@@ -83,6 +89,11 @@ module DropletKit
   autoload :HealthCheckMapping, 'droplet_kit/mappings/health_check_mapping'
   autoload :ForwardingRuleMapping, 'droplet_kit/mappings/forwarding_rule_mapping'
   autoload :CertificateMapping, 'droplet_kit/mappings/certificate_mapping'
+  autoload :FirewallMapping, 'droplet_kit/mappings/firewall_mapping'
+  autoload :FirewallRuleMapping, 'droplet_kit/mappings/firewall_rule_mapping'
+  autoload :FirewallInboundRuleMapping, 'droplet_kit/mappings/firewall_inbound_rule_mapping'
+  autoload :FirewallOutboundRuleMapping, 'droplet_kit/mappings/firewall_outbound_rule_mapping'
+  autoload :FirewallPendingChangeMapping, 'droplet_kit/mappings/firewall_pending_change_mapping'
 
   # Utils
   autoload :PaginatedResource, 'droplet_kit/paginated_resource'

data/lib/droplet_kit/client.rb

@@ -24,6 +24,7 @@ module DropletKit
         domains: DomainResource,
         domain_records: DomainRecordResource,
         droplet_actions: DropletActionResource,
+        firewalls: FirewallResource,
         images: ImageResource,
         image_actions: ImageActionResource,
         load_balancers: LoadBalancerResource,

data/lib/droplet_kit/mappings/domain_record_mapping.rb

@@ -12,6 +12,7 @@ module DropletKit
       property :data, scopes: [:read, :create, :update]
       property :priority, scopes: [:read, :create, :update]
       property :port, scopes: [:read, :create, :update]
+      property :ttl, scopes: [:read, :create, :update]
       property :weight, scopes: [:read, :create, :update]
     end
   end

data/lib/droplet_kit/mappings/firewall_inbound_rule_mapping.rb

@@ -0,0 +1,16 @@
+module DropletKit
+  class FirewallInboundRuleMapping
+    include Kartograph::DSL
+
+    kartograph do
+      mapping FirewallInboundRule
+      root_key plural: 'inbound_rules', scopes: [:read, :create, :update]
+
+      scoped :read, :create, :update do
+        property :protocol
+        property :ports
+        property :sources
+      end
+    end
+  end
+end

data/lib/droplet_kit/mappings/firewall_mapping.rb

@@ -0,0 +1,25 @@
+module DropletKit
+  class FirewallMapping
+    include Kartograph::DSL
+
+    kartograph do
+      mapping Firewall
+      root_key singular: 'firewall', plural: 'firewalls', scopes: [:read]
+
+      scoped :read do
+        property :id
+        property :status
+        property :created_at
+        property :pending_changes, plural: true, include: FirewallPendingChangeMapping
+      end
+
+      scoped :read, :create, :update do
+        property :name
+        property :inbound_rules, plural: true, include: FirewallInboundRuleMapping
+        property :outbound_rules, plural: true, include: FirewallOutboundRuleMapping
+        property :droplet_ids
+        property :tags
+      end
+    end
+  end
+end

data/lib/droplet_kit/mappings/firewall_outbound_rule_mapping.rb

@@ -0,0 +1,16 @@
+module DropletKit
+  class FirewallOutboundRuleMapping
+    include Kartograph::DSL
+
+    kartograph do
+      mapping FirewallOutboundRule
+      root_key plural: 'outbound_rules', scopes: [:read, :create, :update]
+
+      scoped :read, :create, :update do
+        property :protocol
+        property :ports
+        property :destinations
+      end
+    end
+  end
+end

data/lib/droplet_kit/mappings/firewall_pending_change_mapping.rb

@@ -0,0 +1,16 @@
+module DropletKit
+  class FirewallPendingChangeMapping
+    include Kartograph::DSL
+
+    kartograph do
+      mapping FirewallPendingChange
+      root_key plural: 'pending_changes', scopes: [:read]
+
+      scoped :read do
+        property :droplet_id
+        property :removing
+        property :status
+      end
+    end
+  end
+end

data/lib/droplet_kit/mappings/firewall_rule_mapping.rb

@@ -0,0 +1,14 @@
+module DropletKit
+  class FirewallRuleMapping
+    include Kartograph::DSL
+
+    kartograph do
+      mapping FirewallRule
+
+      scoped :create, :update do
+        property :inbound_rules, plural: true, include: FirewallInboundRuleMapping
+        property :outbound_rules, plural: true, include: FirewallOutboundRuleMapping
+      end
+    end
+  end
+end

data/lib/droplet_kit/mappings/tag_mapping.rb

@@ -6,7 +6,7 @@ module DropletKit
       mapping Tag
       root_key plural: 'tags', singular: 'tag', scopes: [:read]
 
-      scoped :read, :create, :update do
+      scoped :read, :create do
         property :name
       end
 

data/lib/droplet_kit/models/domain_record.rb

@@ -6,6 +6,7 @@ module DropletKit
     attribute :data
     attribute :priority
     attribute :port
+    attribute :ttl
     attribute :weight
   end
 end

data/lib/droplet_kit/models/firewall.rb

@@ -0,0 +1,13 @@
+module DropletKit
+  class Firewall < BaseModel
+    attribute :id
+    attribute :name
+    attribute :status
+    attribute :created_at
+    attribute :inbound_rules
+    attribute :outbound_rules
+    attribute :droplet_ids
+    attribute :tags
+    attribute :pending_changes
+  end
+end

data/lib/droplet_kit/models/firewall_inbound_rule.rb

@@ -0,0 +1,7 @@
+module DropletKit
+  class FirewallInboundRule < BaseModel
+    attribute :protocol
+    attribute :ports
+    attribute :sources
+  end
+end

data/lib/droplet_kit/models/firewall_outbound_rule.rb

@@ -0,0 +1,7 @@
+module DropletKit
+  class FirewallOutboundRule < BaseModel
+    attribute :protocol
+    attribute :ports
+    attribute :destinations
+  end
+end

data/lib/droplet_kit/models/firewall_pending_change.rb

@@ -0,0 +1,7 @@
+module DropletKit
+  class FirewallPendingChange < BaseModel
+    attribute :droplet_id
+    attribute :removing
+    attribute :status
+  end
+end

data/lib/droplet_kit/models/firewall_rule.rb

@@ -0,0 +1,6 @@
+module DropletKit
+  class FirewallRule < BaseModel
+    attribute :inbound_rules
+    attribute :outbound_rules
+  end
+end

data/lib/droplet_kit/resources/firewall_resource.rb

@@ -0,0 +1,85 @@
+module DropletKit
+  class FirewallResource < ResourceKit::Resource
+    include ErrorHandlingResourcable
+
+    resources do
+      action :find, 'GET /v2/firewalls/:id' do
+        handler(200) { |response| FirewallMapping.extract_single(response.body, :read) }
+      end
+
+      action :create, 'POST /v2/firewalls' do
+        body { |firewall| FirewallMapping.representation_for(:create, firewall) }
+        handler(202) { |response| FirewallMapping.extract_single(response.body, :read) }
+        handler(422) { |response| ErrorMapping.fail_with(FailedCreate, response.body) }
+      end
+
+      action :update, 'PUT /v2/firewalls/:id' do
+        body { |firewall| FirewallMapping.representation_for(:update, firewall) }
+        handler(200) { |response| FirewallMapping.extract_single(response.body, :read) }
+        handler(422) { |response| ErrorMapping.fail_with(FailedUpdate, response.body) }
+      end
+
+      action :all, 'GET /v2/firewalls' do
+        query_keys :per_page, :page
+        handler(200) { |response| FirewallMapping.extract_collection(response.body, :read) }
+      end
+
+      action :all_by_droplet, 'GET /v2/droplets/:droplet_id/firewalls' do
+        query_keys :per_page, :page
+        handler(200) { |response| FirewallMapping.extract_collection(response.body, :read) }
+      end
+
+      action :delete, 'DELETE /v2/firewalls/:id' do
+        handler(204) { |_| true }
+      end
+
+      action :add_droplets, 'POST /v2/firewalls/:id/droplets' do
+        body { |droplet_ids| { droplet_ids: droplet_ids }.to_json }
+        handler(204) { |_| true }
+      end
+
+      action :remove_droplets, 'DELETE /v2/firewalls/:id/droplets' do
+        body { |droplet_ids| { droplet_ids: droplet_ids }.to_json }
+        handler(204) { |_| true }
+      end
+
+      action :add_tags, 'POST /v2/firewalls/:id/tags'  do
+        body { |tags| { tags: tags}.to_json }
+        handler(204) { |_| true }
+      end
+
+      action :remove_tags, 'DELETE /v2/firewalls/:id/tags' do
+        body { |tags| { tags: tags}.to_json }
+        handler(204) { |_| true }
+      end
+
+      action :add_rules, 'POST /v2/firewalls/:id/rules' do
+        body do |rules|
+          DropletKit::FirewallRuleMapping
+            .representation_for(:create,
+                                FirewallRule.new(inbound_rules: rules[:inbound_rules],
+                                                 outbound_rules: rules[:outbound_rules]))
+        end
+        handler(204) { |_| true }
+      end
+
+      action :remove_rules, 'DELETE /v2/firewalls/:id/rules' do
+        body do |rules|
+          DropletKit::FirewallRuleMapping
+            .representation_for(:update,
+                                FirewallRule.new(inbound_rules: rules[:inbound_rules],
+                                                 outbound_rules: rules[:outbound_rules]))
+        end
+        handler(204) { |_| true }
+      end
+    end
+
+    def all(*args)
+      PaginatedResource.new(action(:all), self, *args)
+    end
+
+    def all_by_droplet(*args)
+      PaginatedResource.new(action(:all_by_droplet), self, *args)
+    end
+  end
+end

data/lib/droplet_kit/resources/tag_resource.rb

@@ -18,11 +18,6 @@ module DropletKit
         handler(422) { |response| ErrorMapping.fail_with(FailedCreate, response.body) }
       end
 
-      action :update, 'PUT /v2/tags/:name' do
-        body { |object| TagMapping.representation_for(:update, object) }
-        handler(200) { |response| TagMapping.extract_single(response.body, :read) }
-      end
-
       action :delete, 'DELETE /v2/tags/:name' do
         handler(204) { |_| true }
         handler(422) { |response| ErrorMapping.fail_with(FailedCreate, response.body) }

data/lib/droplet_kit/version.rb

@@ -1,3 +1,3 @@
 module DropletKit
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/spec/fixtures/domain_records/all.json

@@ -7,6 +7,7 @@
       "data": "8.8.8.8",
       "priority": null,
       "port": null,
+      "ttl": 1800,
       "weight": null
     },
     {
@@ -16,6 +17,7 @@
       "data": "NS1.DIGITALOCEAN.COM.",
       "priority": null,
       "port": null,
+      "ttl": 1800,
       "weight": null
     },
     {
@@ -25,6 +27,7 @@
       "data": "NS2.DIGITALOCEAN.COM.",
       "priority": null,
       "port": null,
+      "ttl": 1800,
       "weight": null
     },
     {
@@ -34,6 +37,7 @@
       "data": "NS3.DIGITALOCEAN.COM.",
       "priority": null,
       "port": null,
+      "ttl": 1800,
       "weight": null
     },
     {
@@ -43,6 +47,7 @@
       "data": "@",
       "priority": null,
       "port": null,
+      "ttl": 1800,
       "weight": null
     }
   ],

data/spec/fixtures/domain_records/create.json

@@ -6,6 +6,7 @@
     "data": "@",
     "priority": null,
     "port": null,
+    "ttl": 90,
     "weight": null
   }
 }

data/spec/fixtures/domain_records/find.json

@@ -6,6 +6,7 @@
     "data": "@",
     "priority": null,
     "port": null,
+    "ttl": 1800,
     "weight": null
   }
 }

data/spec/fixtures/domain_records/update.json

@@ -6,6 +6,7 @@
     "data": "@",
     "priority": null,
     "port": null,
+    "ttl": 1800,
     "weight": null
   }
 }

data/spec/fixtures/firewalls/all.json

@@ -0,0 +1,67 @@
+{
+  "firewalls": [
+    {
+      "id": "11d87802-df17-4f8f-a691-58e408570c12",
+      "name": "firewall",
+      "status": "succeeded",
+      "inbound_rules": [
+        {
+          "protocol": "icmp",
+          "ports": "0",
+          "sources": {
+            "load_balancer_uids": [
+              "d2d3920a-9d45-41b0-b018-d15e18ec60a4"
+            ],
+            "tags": [
+              "backend"
+            ]
+          }
+        },
+        {
+          "protocol": "tcp",
+          "ports": "8000-9000",
+          "sources": {
+            "addresses": [
+              "0.0.0.0/0"
+            ]
+          }
+        }
+      ],
+      "outbound_rules": [
+        {
+          "protocol": "icmp",
+          "ports": "0",
+          "destinations": {
+            "tags": [
+              "backend"
+            ]
+          }
+        },
+        {
+          "protocol": "tcp",
+          "ports": "8000-9000",
+          "destinations": {
+            "addresses": [
+              "127.0.0.0"
+            ],
+            "droplet_ids": [
+              345
+            ]
+          }
+        }
+      ],
+      "created_at": "2017-05-30T16:25:21Z",
+      "droplet_ids": [
+        123
+      ],
+      "tags": [
+        "backend"
+      ],
+      "pending_changes": []
+    }
+  ],
+  "links": {},
+  "meta": {
+    "total": 1
+  }
+}

data/spec/fixtures/firewalls/find.json

@@ -0,0 +1,61 @@
+{
+  "firewall": {
+    "id": "11d87802-df17-4f8f-a691-58e408570c12",
+    "name": "firewall",
+    "status": "succeeded",
+    "inbound_rules": [
+      {
+        "protocol": "icmp",
+        "ports": "0",
+        "sources": {
+          "load_balancer_uids": [
+            "d2d3920a-9d45-41b0-b018-d15e18ec60a4"
+          ],
+          "tags": [
+            "backend"
+          ]
+        }
+      },
+      {
+        "protocol": "tcp",
+        "ports": "8000-9000",
+        "sources": {
+          "addresses": [
+            "0.0.0.0/0"
+          ]
+        }
+      }
+    ],
+    "outbound_rules": [
+      {
+        "protocol": "icmp",
+        "ports": "0",
+        "destinations": {
+          "tags": [
+            "backend"
+          ]
+        }
+      },
+      {
+        "protocol": "tcp",
+        "ports": "8000-9000",
+        "destinations": {
+          "addresses": [
+            "127.0.0.0"
+          ],
+          "droplet_ids": [
+            345
+          ]
+        }
+      }
+    ],
+    "created_at": "2017-05-30T16:25:21Z",
+    "droplet_ids": [
+      123
+    ],
+    "tags": [
+      "backend"
+    ],
+    "pending_changes": []
+  }
+}

data/spec/lib/droplet_kit/resources/domain_record_resource_spec.rb

@@ -29,12 +29,14 @@ RSpec.describe DropletKit::DomainRecordResource do
       domain_record = DropletKit::DomainRecord.new(
         type: 'CNAME',
         name: 'www',
-        data: '@'
+        data: '@',
+        ttl: 90
       )
       as_hash = DropletKit::DomainRecordMapping.hash_for(:create, domain_record)
       expect(as_hash['type']).to eq('CNAME')
       expect(as_hash['name']).to eq('www')
       expect(as_hash['data']).to eq('@')
+      expect(as_hash['ttl']).to eq(90)
 
       as_json = DropletKit::DomainRecordMapping.representation_for(:create, domain_record)
       stub_do_api('/v2/domains/example.com/records', :post).with(body: as_json).to_return(body: response, status: 201)
@@ -44,6 +46,7 @@ RSpec.describe DropletKit::DomainRecordResource do
       expect(created_domain_record.name).to eq('www')
       expect(created_domain_record.type).to eq('CNAME')
       expect(created_domain_record.data).to eq('@')
+      expect(created_domain_record.ttl).to eq(90)
     end
   end
 
@@ -90,6 +93,7 @@ RSpec.describe DropletKit::DomainRecordResource do
       expect(updated_domain_record.name).to eq('lol')
       expect(updated_domain_record.type).to eq('CNAME')
       expect(updated_domain_record.data).to eq('@')
+      expect(updated_domain_record.ttl).to eq(1800)
     end
   end
 end

data/spec/lib/droplet_kit/resources/firewall_resource_spec.rb

@@ -0,0 +1,265 @@
+require 'spec_helper'
+
+RSpec.describe DropletKit::FirewallResource do
+  include_context 'resources'
+
+  let(:firewall_fixture_path) { 'firewalls/find' }
+  let(:base_path) { '/v2/firewalls' }
+  let(:firewall_id) { '11d87802-df17-4f8f-a691-58e408570c12' }
+  let(:firewall) do
+    DropletKit::Firewall.new(
+      name: 'firewall',
+      inbound_rules: [
+        DropletKit::FirewallInboundRule.new(
+          protocol: 'icmp',
+          ports: '0',
+          sources: {
+            tags: ['backend'],
+            load_balancer_uids: ['d2d3920a-9d45-41b0-b018-d15e18ec60a4']
+          }
+        ),
+        DropletKit::FirewallInboundRule.new(
+          protocol: 'tcp',
+          ports: '8000-9000',
+          sources: {
+            addresses: ['0.0.0.0/0']
+          }
+        )
+      ],
+      outbound_rules: [
+        DropletKit::FirewallOutboundRule.new(
+          protocol: 'icmp',
+          ports: '0',
+          destinations: {
+            tags: ['backend']
+          }
+        ),
+        DropletKit::FirewallOutboundRule.new(
+          protocol: 'tcp',
+          ports: '8000-9000',
+          destinations: {
+            addresses: ['127.0.0.0']
+          }
+        )
+      ],
+      droplet_ids: [123],
+      tags: ['backend'])
+  end
+
+  subject(:resource) { described_class.new(connection: connection) }
+
+  RSpec::Matchers.define :match_firewall_fixture do
+    match do |firewall|
+      expect(firewall.id).to eq('11d87802-df17-4f8f-a691-58e408570c12')
+      expect(firewall.name).to eq('firewall')
+      expect(firewall.status).to eq('succeeded')
+      expect(firewall.created_at).to eq('2017-05-30T16:25:21Z')
+      expect(firewall.inbound_rules.count).to eq(2)
+      expect(firewall.inbound_rules.first.attributes)
+        .to match(a_hash_including(protocol: 'icmp', ports: '0',
+                                   sources: { 'load_balancer_uids' => ['d2d3920a-9d45-41b0-b018-d15e18ec60a4'],
+                                              'tags' => ['backend'] }))
+      expect(firewall.inbound_rules.last.attributes)
+        .to match(a_hash_including(protocol: 'tcp', ports: '8000-9000',
+                                   sources: { 'addresses' => ['0.0.0.0/0'] }))
+      expect(firewall.outbound_rules.count).to eq(2)
+      expect(firewall.outbound_rules.first.attributes)
+        .to match(a_hash_including(protocol: 'icmp', ports: '0',
+                                   destinations: { 'tags' => ['backend'] }))
+      expect(firewall.outbound_rules.last.attributes)
+        .to match(a_hash_including(protocol: 'tcp', ports: '8000-9000',
+                                   destinations: { 'addresses' => ['127.0.0.0'],
+                                                   'droplet_ids' => [345] }))
+      expect(firewall.droplet_ids).to match_array([123])
+      expect(firewall.tags).to match_array(['backend'])
+      expect(firewall.pending_changes).to be_empty
+    end
+  end
+
+  describe '#find' do
+    it 'returns firewall' do
+      stub_do_api(File.join(base_path, firewall_id), :get).to_return(body: api_fixture(firewall_fixture_path))
+      firewall = resource.find(id: firewall_id)
+
+      expect(firewall).to match_firewall_fixture
+    end
+  end
+
+  describe '#create' do
+    let(:path) { base_path }
+
+    it 'returns created firewall' do
+      json_body = DropletKit::FirewallMapping.representation_for(:create, firewall)
+      stub_do_api(path, :post).with(body: json_body).to_return(body: api_fixture(firewall_fixture_path), status: 202)
+
+      expect(resource.create(firewall)).to match_firewall_fixture
+    end
+
+    it_behaves_like 'an action that handles invalid parameters' do
+      let(:action) { 'create' }
+      let(:arguments) { DropletKit::Firewall.new }
+    end
+  end
+
+  describe '#update' do
+    let(:path) { base_path }
+
+    it 'returns updated firewall' do
+      json_body = DropletKit::FirewallMapping.representation_for(:update, firewall)
+      stub_do_api(File.join(base_path, firewall_id), :put).with(body: json_body).to_return(body: api_fixture(firewall_fixture_path), status: 200)
+
+      expect(resource.update(firewall, id: firewall_id)).to match_firewall_fixture
+    end
+
+    it_behaves_like 'an action that handles invalid parameters' do
+      let(:verb) { :put }
+      let(:exception) { DropletKit::FailedUpdate }
+      let(:action) { 'update' }
+      let(:arguments) { DropletKit::Firewall.new }
+    end
+  end
+
+  describe '#all' do
+    let(:firewalls_fixture_path) { 'firewalls/all' }
+
+    it 'returns all firewalls' do
+      stub_do_api(base_path, :get).to_return(body: api_fixture(firewalls_fixture_path))
+      firewalls = resource.all
+
+      expect(firewalls).to all(be_kind_of(DropletKit::Firewall))
+      expect(firewalls.first).to match_firewall_fixture
+    end
+
+    it_behaves_like 'a paginated index' do
+      let(:fixture_path) { firewalls_fixture_path }
+      let(:api_path) { base_path }
+    end
+  end
+
+  describe '#all_by_droplet' do
+    let(:droplet_id) { 123 }
+    let(:all_by_droplet_path) { "/v2/droplets/#{droplet_id}/firewalls" }
+    let(:firewalls_fixture_path) { 'firewalls/all' }
+
+    it 'returns all firewalls for a provided droplet' do
+      stub_do_api(all_by_droplet_path, :get).to_return(body: api_fixture(firewalls_fixture_path))
+      firewalls = resource.all_by_droplet(droplet_id: droplet_id)
+
+      expect(firewalls).to all(be_kind_of(DropletKit::Firewall))
+      expect(firewalls.first).to match_firewall_fixture
+    end
+
+    it_behaves_like 'a paginated index' do
+      let(:fixture_path) { firewalls_fixture_path }
+      let(:action) { :all_by_droplet }
+      let(:parameters) { { droplet_id: droplet_id } }
+      let(:api_path) { all_by_droplet_path }
+    end
+  end
+
+  describe '#delete' do
+    it 'sends request to delete given firewall' do
+      request = stub_do_api(File.join(base_path, firewall_id), :delete)
+      resource.delete(id: firewall_id)
+
+      expect(request).to have_been_made
+    end
+  end
+
+  context 'droplets' do
+    let(:droplet_id_1) { 1 }
+    let(:droplet_id_2) { 2 }
+
+    describe '#add_droplets' do
+      it 'sends request to add droplets for a given firewall' do
+        request = stub_do_api(File.join(base_path, firewall_id, 'droplets'), :post).with(body: { droplet_ids: [droplet_id_1, droplet_id_2] }.to_json)
+        resource.add_droplets([droplet_id_1, droplet_id_2], id: firewall_id)
+
+        expect(request).to have_been_made
+      end
+    end
+
+    describe '#remove_droplets' do
+      it 'sends request to remove droplets from a given firewall' do
+        request = stub_do_api(File.join(base_path, firewall_id, 'droplets'), :delete).with(body: { droplet_ids: [droplet_id_1, droplet_id_2]}.to_json)
+        resource.remove_droplets([droplet_id_1, droplet_id_2], id: firewall_id)
+
+        expect(request).to have_been_made
+      end
+    end
+  end
+
+  context 'tags' do
+    let(:frontend_tag) { 'frontend' }
+    let(:backend_tag) { 'backend' }
+
+    describe '#add_tags' do
+      it 'sends request to add tags for a given firewall' do
+        request = stub_do_api(File.join(base_path, firewall_id, 'tags'), :post).with(body: { tags: [frontend_tag, backend_tag] }.to_json)
+        resource.add_tags([frontend_tag, backend_tag], id: firewall_id)
+
+        expect(request).to have_been_made
+      end
+    end
+
+    describe '#remove_tags' do
+      it 'sends request to remove tags from a given firewall' do
+        request = stub_do_api(File.join(base_path, firewall_id, 'tags'), :delete).with(body: { tags: [frontend_tag, backend_tag]}.to_json)
+        resource.remove_tags([frontend_tag, backend_tag], id: firewall_id)
+
+        expect(request).to have_been_made
+      end
+    end
+  end
+
+  context 'rules' do
+    let(:inbound_rule) do
+      DropletKit::FirewallInboundRule.new(
+        protocol: 'tcp',
+        ports: '22',
+        sources: {
+          addresses: ['127.0.0.0'],
+          tags: ['frontend', 'backend']
+        }
+      )
+    end
+
+    let(:outbound_rule) do
+      DropletKit::FirewallOutboundRule.new(
+        protocol: 'tcp',
+        ports: '8080',
+        destinations: {
+          droplet_ids: [123, 456],
+          load_balancer_uids: ['lb-uuid']
+        }
+      )
+    end
+
+    let(:rules) do
+      DropletKit::FirewallRule.new(
+        inbound_rules: [inbound_rule],
+        outbound_rules: [outbound_rule]
+      )
+    end
+
+    describe '#add_rules' do
+      it 'sends request to add rules for a given firewall' do
+        json_body = DropletKit::FirewallRuleMapping.representation_for(:create, rules)
+        request = stub_do_api(File.join(base_path, firewall_id, 'rules'), :post).with(body: json_body)
+        resource.add_rules(inbound_rules: [inbound_rule], outbound_rules: [outbound_rule], id: firewall_id)
+
+        expect(request).to have_been_made
+      end
+    end
+
+    describe '#remove_rules' do
+      it 'sends request to remove rules from a given firewall' do
+        json_body = DropletKit::FirewallRuleMapping.representation_for(:update, rules)
+        request = stub_do_api(File.join(base_path, firewall_id, 'rules'), :delete).with(body: json_body)
+        resource.remove_rules(inbound_rules: [inbound_rule], outbound_rules: [outbound_rule], id: firewall_id)
+
+        expect(request).to have_been_made
+      end
+    end
+  end
+end

data/spec/lib/droplet_kit/resources/tag_resource_spec.rb

@@ -67,20 +67,6 @@ describe DropletKit::TagResource do
     end
   end
 
-  describe '#update' do
-    it 'updateds a tag' do
-      tag = DropletKit::Tag.new(name: 'old-testing-1')
-      tag.name = 'testing-1'
-
-      request = stub_do_api('/v2/tags/old-testing-1', :put)
-        .with(body: DropletKit::TagMapping.representation_for(:update, tag))
-        .to_return(body: api_fixture('tags/find'))
-
-      tag = resource.update(tag, name: 'old-testing-1')
-      expect(tag.name).to eq('testing-1')
-    end
-  end
-
   describe '#delete' do
     it 'deletes a tag' do
       request = stub_do_api('/v2/tags/testing-1', :delete)

data/spec/support/shared_examples/paginated_endpoint.rb

@@ -4,11 +4,13 @@ shared_examples_for 'a paginated index' do
   let(:fixture_path) { }
   let(:api_path) { }
   let(:parameters) { {} }
+  let(:action) { :all }
 
   it 'returns a paginated resource' do
     fixture = api_fixture(fixture_path)
     stub_do_api(api_path, :get).to_return(body: fixture)
-    response = resource.all({page: 1, per_page: 1}.merge(parameters))
+    response = resource.send(action, {page: 1, per_page: 1}.merge(parameters))
+
     expect(response).to be_kind_of(DropletKit::PaginatedResource)
   end
-end
+end

data/spec/support/shared_examples/unprocessable_entity.rb

@@ -0,0 +1,11 @@
+shared_examples_for 'an action that handles invalid parameters' do
+  let(:verb) { :post }
+  let(:exception) { DropletKit::FailedCreate }
+
+  it 'raises an exception with the message attached' do
+    response_body = { id: :unprocessable_entity, message: 'Something is not right' }
+    stub_do_api(path, verb).to_return(body: response_body.to_json, status: 422)
+
+    expect { resource.send(action, arguments) }.to raise_exception(exception).with_message(response_body[:message])
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droplet_kit
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Robert Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -61,7 +61,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,7 +71,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -211,6 +211,11 @@ files:
 - lib/droplet_kit/mappings/droplet_mapping.rb
 - lib/droplet_kit/mappings/droplet_upgrade_mapping.rb
 - lib/droplet_kit/mappings/error_mapping.rb
+- lib/droplet_kit/mappings/firewall_inbound_rule_mapping.rb
+- lib/droplet_kit/mappings/firewall_mapping.rb
+- lib/droplet_kit/mappings/firewall_outbound_rule_mapping.rb
+- lib/droplet_kit/mappings/firewall_pending_change_mapping.rb
+- lib/droplet_kit/mappings/firewall_rule_mapping.rb
 - lib/droplet_kit/mappings/floating_ip_mapping.rb
 - lib/droplet_kit/mappings/forwarding_rule_mapping.rb
 - lib/droplet_kit/mappings/health_check_mapping.rb
@@ -236,6 +241,11 @@ files:
 - lib/droplet_kit/models/domain_record.rb
 - lib/droplet_kit/models/droplet.rb
 - lib/droplet_kit/models/droplet_upgrade.rb
+- lib/droplet_kit/models/firewall.rb
+- lib/droplet_kit/models/firewall_inbound_rule.rb
+- lib/droplet_kit/models/firewall_outbound_rule.rb
+- lib/droplet_kit/models/firewall_pending_change.rb
+- lib/droplet_kit/models/firewall_rule.rb
 - lib/droplet_kit/models/floating_ip.rb
 - lib/droplet_kit/models/forwarding_rule.rb
 - lib/droplet_kit/models/health_check.rb
@@ -264,6 +274,7 @@ files:
 - lib/droplet_kit/resources/droplet_action_resource.rb
 - lib/droplet_kit/resources/droplet_resource.rb
 - lib/droplet_kit/resources/droplet_upgrade_resource.rb
+- lib/droplet_kit/resources/firewall_resource.rb
 - lib/droplet_kit/resources/floating_ip_action_resource.rb
 - lib/droplet_kit/resources/floating_ip_resource.rb
 - lib/droplet_kit/resources/image_action_resource.rb
@@ -318,6 +329,8 @@ files:
 - spec/fixtures/droplets/list_backups.json
 - spec/fixtures/droplets/list_kernels.json
 - spec/fixtures/droplets/list_snapshots.json
+- spec/fixtures/firewalls/all.json
+- spec/fixtures/firewalls/find.json
 - spec/fixtures/floating_ip_actions/all.json
 - spec/fixtures/floating_ip_actions/assign.json
 - spec/fixtures/floating_ip_actions/find.json
@@ -371,6 +384,7 @@ files:
 - spec/lib/droplet_kit/resources/droplet_action_resource_spec.rb
 - spec/lib/droplet_kit/resources/droplet_resource_spec.rb
 - spec/lib/droplet_kit/resources/droplet_upgrade_resource_spec.rb
+- spec/lib/droplet_kit/resources/firewall_resource_spec.rb
 - spec/lib/droplet_kit/resources/floating_ip_action_resource_spec.rb
 - spec/lib/droplet_kit/resources/floating_ip_resource_spec.rb
 - spec/lib/droplet_kit/resources/image_action_resource_spec.rb
@@ -389,7 +403,7 @@ files:
 - spec/support/resource_context.rb
 - spec/support/shared_examples/common_errors.rb
 - spec/support/shared_examples/paginated_endpoint.rb
-- spec/support/shared_examples/unsuccessful_create.rb
+- spec/support/shared_examples/unprocessable_entity.rb
 homepage: https://github.com/digitalocean/droplet_kit
 licenses:
 - MIT
@@ -410,7 +424,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Droplet Kit is the official Ruby library for DigitalOcean's API
@@ -455,6 +469,8 @@ test_files:
 - spec/fixtures/droplets/list_backups.json
 - spec/fixtures/droplets/list_kernels.json
 - spec/fixtures/droplets/list_snapshots.json
+- spec/fixtures/firewalls/all.json
+- spec/fixtures/firewalls/find.json
 - spec/fixtures/floating_ip_actions/all.json
 - spec/fixtures/floating_ip_actions/assign.json
 - spec/fixtures/floating_ip_actions/find.json
@@ -508,6 +524,7 @@ test_files:
 - spec/lib/droplet_kit/resources/droplet_action_resource_spec.rb
 - spec/lib/droplet_kit/resources/droplet_resource_spec.rb
 - spec/lib/droplet_kit/resources/droplet_upgrade_resource_spec.rb
+- spec/lib/droplet_kit/resources/firewall_resource_spec.rb
 - spec/lib/droplet_kit/resources/floating_ip_action_resource_spec.rb
 - spec/lib/droplet_kit/resources/floating_ip_resource_spec.rb
 - spec/lib/droplet_kit/resources/image_action_resource_spec.rb
@@ -526,4 +543,4 @@ test_files:
 - spec/support/resource_context.rb
 - spec/support/shared_examples/common_errors.rb
 - spec/support/shared_examples/paginated_endpoint.rb
-- spec/support/shared_examples/unsuccessful_create.rb
+- spec/support/shared_examples/unprocessable_entity.rb

data/spec/support/shared_examples/unsuccessful_create.rb

@@ -1,8 +0,0 @@
-shared_examples_for 'an action that handles invalid parameters' do
-  it 'raises a FailedCreate exception with the message attached' do
-    response_body = { id: :unprocessable_entity, message: 'Something is not right' }
-    stub_do_api(path, :post).to_return(body: response_body.to_json, status: 422)
-
-    expect { resource.send(action, arguments) }.to raise_exception(DropletKit::FailedCreate).with_message(response_body[:message])
-  end
-end