fastlyctl 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ab49669dc42a806c9f2dcb070abaaaa2caf3ab3971d98137272297079ceae79
-  data.tar.gz: 956dd730b5d2fc1458e862d9470d37a2e967d0d0673dad7db88043ccc9294873
+  metadata.gz: 47e44218334f858ca38258f7d78f7b06a43c4ad469a3471065e9c73d44b07d4b
+  data.tar.gz: 1f49de73048ed5acaadb18306eb3d8567e3740b40617720fb55d3386176ed104
 SHA512:
-  metadata.gz: 2537e34e4fcaf9151bcab19e0187f90e88afd61c12521045c640af86afa49bad52d14362a453b6d9ad8b4aea75b4ac345a790bfecd81458e5c2c2df2ea3d2091
-  data.tar.gz: db50f38b85871b732fe36dee45d65d562e203ced1e084cd37e59ab4ca76cc74217239c8ac22376c01b326c8be2f4f160d734567e723034c1d0fcdf252b633089
+  metadata.gz: 2db1dffff49f810de07d362bc61c43a2577084f66530b2e48e20913a7187b41818363fcaefa2783df590cbe194aeb457b4d846794cecae5624febc63c8fe58b9
+  data.tar.gz: 03fda9af78e06722122abfb1d992574daaafcfe5acfc55de4ebeae3699ee6f281820131c13e8773c6ecd94ca127fedad172e2de921f2673b5454128da62001aa

data/README.md

@@ -47,16 +47,17 @@ Manipulate ACLs on a service.
 Usage:
 
 ```
-fastlyctl acl [action] [acl_name] [ip_or_subnet]
+fastlyctl acl [action] [acl_name] [ip]
 ```
 
 Available Actions:
-  * create: Creates a new ACL. `ip_or_subnet` parameter is omitted.
-  * delete: Deletes an ACL. `ip_or_subnet` parameter is omitted.
-  * list: Lists all ACLs. `ip_or_subnet` parameter is omitted.
+  * create: Creates a new ACL. `ip` parameter is omitted.
+  * delete: Deletes an ACL. `ip` parameter is omitted.
+  * list: Lists all ACLs. `ip` parameter is omitted.
   * add: Adds a new IP or Subnet to an ACL.
   * remove: Removes an IP or Subnet from an ACL.
   * list_ips: Lists all IPs/Subnets in an ACL.
+  * sync: Synchronizes an ACL with a comma separated list of IPs. Will create or delete ACL entries as needed.
   * bulk_add: Adds multiple items to an ACL. See [this documentation](https://docs.fastly.com/api/config#acl_entry_c352ca5aee49b7898535cce488e3ba82) for information on the format.
 
 Flags:

data/lib/fastlyctl/commands/acl.rb

@@ -1,11 +1,12 @@
 module FastlyCTL
   class CLI < Thor
-    desc "acl ACTION ACL_NAME IP_OR_SUBNET", "Manipulate ACLS.\n  Actions:\n    create: Create an ACL\n
+    desc "acl ACTION ACL_NAME IP", "Manipulate ACLS.\n  Actions:\n    create: Create an ACL\n
     delete: Delete an ACL\n
     list: Provide a list of ACLs on this service\n
     add: Add an IP/subnet to an ACL\n
     remove: Remove an IP/subnet from an ACL\n
     list_ips: List all IPs/subnets in the ACL\n
+    sync: Synchronizes an ACL with a comma separated list of IPs. Will create or delete ACL entries as needed.
     bulk_add: Perform operations on the ACL in bulk. A list of operations in JSON format should be specified in the ip field. Documentation on this format can be found here: https://docs.fastly.com/api/config#acl_entry_c352ca5aee49b7898535cce488e3ba82"
     method_option :service, :aliases => ["--s"]
     method_option :version, :aliases => ["--v"]
@@ -43,10 +44,24 @@ module FastlyCTL
       when "add"
         abort "Must specify name for ACL" unless name
         abort "Must specify IP" unless ip
+
+        subnet = false
+        if ip.include?("/")
+          ip = ip.sub(/\/(\d{1,2})/,"")
+          subnet = $1
+        end
+
         acl = FastlyCTL::Fetcher.api_request(:get, "/service/#{id}/version/#{version}/acl/#{encoded_name}")
-        FastlyCTL::Fetcher.api_request(:post, "/service/#{id}/acl/#{acl["id"]}/entry", params: { ip: ip, negated: options.key?(:negate) ? "1" : "0" })   
 
-        say("#{ip} added to ACL #{name}.")   
+        params = {
+          ip: ip,
+          negated: options.key?(:negate) ? "1" : "0"
+        }
+        params[:subnet] = subnet if subnet
+
+        FastlyCTL::Fetcher.api_request(:post, "/service/#{id}/acl/#{acl["id"]}/entry", params: params)   
+
+        say("#{ip} added to ACL #{name}.")    
       when "remove"
         abort "Must specify name for ACL" unless name
         abort "Must specify IP for ACL entry" unless ip
@@ -73,13 +88,66 @@ module FastlyCTL
 
         say("No items in ACL.") unless entries.length > 0
         entries.each do |i|
-          puts "#{i["ip"]} - Negated: #{i["negated"] == "0" ? "false" : "true"}"
+          puts "#{i["ip"]}#{i["subnet"].nil? ? "" : "/"+i["subnet"].to_s} - Negated: #{i["negated"] == "0" ? "false" : "true"}"
         end
+      when "sync"
+        abort "Must specify name for ACL" unless name
+        abort "Must supply comma separated list of IPs as the \"ip\" parameter" unless ip
+
+        ips = ip.split(',').to_set.to_a
+        entry_ids = Hash.new
+        current_ips = []
+
+        acl = FastlyCTL::Fetcher.api_request(:get, "/service/#{id}/version/#{version}/acl/#{encoded_name}")
+        entries = FastlyCTL::Fetcher.api_request(:get, "/service/#{id}/acl/#{acl["id"]}/entries")
+        entries.each do |entry|
+          ip_with_subnet = entry["ip"]
+          ip_with_subnet += "/" + entry["subnet"].to_s if (entry.key?("subnet") && !entry["subnet"].nil?)
+
+          entry_ids[ip_with_subnet] = entry["id"]
+          current_ips.push(ip_with_subnet)
+        end
+
+        to_add = ips - current_ips
+        to_remove = current_ips - ips
+
+        bulk = []
+
+        to_add.each do |add|
+          subnet = false
+          if add.include?("/")
+            add = add.sub(/\/(\d{1,2})/,"")
+            subnet = $1
+          end
+
+          params = {
+            "op" => "create",
+            "ip" => add
+          }
+          params["subnet"] = subnet if subnet
+
+          bulk.push(params)
+        end
+
+        to_remove.each do |remove|
+          entry_id = entry_ids[remove]
+          remove = remove.sub(/\/(\d{1,2})/,"") if remove.include?("/")
+
+          bulk.push({
+            "op" => "delete",
+            "id" => entry_id
+          })
+        end
+
+        FastlyCTL::Fetcher.api_request(:patch, "/service/#{id}/acl/#{acl["id"]}/entries", {body: {entries: bulk}.to_json, headers: {"Content-Type" => "application/json"}})
+
+        say("Sync operation completed successfully with #{bulk.length} operations.")
+
       when "bulk_add"
         abort "Must specify name for ACL" unless name
         abort "Must specify JSON blob of operations in ip field. Documentation on this can be found here: https://docs.fastly.com/api/config#acl_entry_c352ca5aee49b7898535cce488e3ba82" unless ip
         acl = FastlyCTL::Fetcher.api_request(:get, "/service/#{id}/version/#{version}/acl/#{encoded_name}")
-        FastlyCTL::Fetcher.api_request(:patch, "/service/#{id}/acl/#{acl["id"]}/items", {body: ip, headers: {"Content-Type" => "application/json"}})
+        FastlyCTL::Fetcher.api_request(:patch, "/service/#{id}/acl/#{acl["id"]}/entries", {body: ip, headers: {"Content-Type" => "application/json"}})
 
         say("Bulk add operation completed successfully.")
       else

data/lib/fastlyctl/version.rb

@@ -1,3 +1,3 @@
 module FastlyCTL
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlyctl
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Stephen Basile
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-19 00:00:00.000000000 Z
+date: 2019-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler