aws_ip_utilities 0.2.20180711 → 0.3.1533583353

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5d93c07fc920e62a4495b5050ed298f148cb392b
-  data.tar.gz: 6f9fb2355ed442a615d3ae68ed811cd13ac36ed3
+SHA256:
+  metadata.gz: 98b8ec5122fe163540412bf2d886c59315fe72e754297312f30e72c6b7ad9367
+  data.tar.gz: be1d2d7adf7d345ae508b860978632e691ad4b84746e0c949f77a30443af74f4
 SHA512:
-  metadata.gz: 40a264b4f9edcbb1e4ce60f18027bbd9f1a82553ba93775bc8ca24a4663843a63e358ecc5b64d9a11457692de47016904e95341f3b295d9f5a5bd2f0f9615e9b
-  data.tar.gz: a44fe2f29f406f510a18d6c47b9d4db00a5b933fa3db99869fec9b0a1c54e83253d5f02c3544f045e93a1341d6638ec6dc33c8c2e006e7b92e2d4fdfbdf5c458
+  metadata.gz: 20266bb5510107c2161b391cdf0be1719455aec7ddb4acc9ce2a4300b86f9a1fa6aa06ae6e360ecee53aa8986500eab4bea4d969c95ef412953a99c0f1c85a00
+  data.tar.gz: 270a556d1a73b9434b8b6e601df91ccca5a33fbb843654db72b36d6c3913563e7e584a2919c9b169420f9205281978b02ae9bb1e870d4d9576ac774583c70f4a

data/.rubocop.yml

@@ -0,0 +1,2 @@
+inherit_gem:
+  wetransfer_style: ruby/default.yml

data/README.md

@@ -5,6 +5,7 @@ if the AWS IP ranges change.
 
 The prefixes get retrieved from https://ip-ranges.amazonaws.com/ip-ranges.json
 
+[![Build Status](https://travis-ci.com/WeTransfer/aws_ip_utilities.svg?branch=master)](https://travis-ci.com/WeTransfer/aws_ip_utilities)
 
 ## Installation
 

data/Rakefile

@@ -1,40 +1,43 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
+require 'rubocop/rake_task'
 
 desc 'Update the version.rb file with the sync token and the minor version based on modification date'
-task :update_version_tokens, [:sync_token, :modification_date] do |_task, args|
-  version_specifier = args.modification_date.strftime("%Y%m%d")
-  version_file_contents = File.read(__dir__  + '/lib/aws_ip_utilities/version.rb')
+task :update_version_tokens, [:sync_token] do |_task, args|
+  version_specifier = args.sync_token
+  version_file_contents = File.read(__dir__ + '/lib/aws_ip_utilities/version.rb')
   version_file_contents.gsub!(/(\d+\.\d+\.)(\d+)/, '\1%s' % version_specifier)
-  version_file_contents.gsub!(/SYNC_TOKEN.+$/, 'SYNC_TOKEN = "%s"' % args.sync_token)
-  File.open(__dir__  + '/lib/aws_ip_utilities/version.rb', 'wb') do |f|
+  version_file_contents.gsub!(/SYNC_TOKEN.+$/, 'SYNC_TOKEN = "%s"' % version_specifier)
+  File.open(__dir__ + '/lib/aws_ip_utilities/version.rb', 'wb') do |f|
     f << version_file_contents
   end
 end
 
 desc 'Download the IP ranges from AWS and update the version of the gem'
 task :download_and_bump_version do
-  $stderr.puts "Checking if ip-ranges.json needs an update"
+  warn "Checking if ip-ranges.json needs an update"
   require 'open-uri'
   require 'json'
   uri = 'https://ip-ranges.amazonaws.com/ip-ranges.json'
   open(uri) do |f|
     raise "Unexpected status #{f.status.inspect}" unless f.status.first == "200"
     parsed = JSON.parse(f.read)
-    cached = JSON.parse(File.read(__dir__  + '/lib/aws_ip_utilities/ip-ranges.json')) rescue nil
+    cached = JSON.parse(File.read(__dir__ + '/lib/aws_ip_utilities/ip-ranges.json'))
 
-    #break if parsed.fetch('syncToken') == cached.fetch('syncToken')
+    if parsed.fetch('syncToken') == cached.fetch('syncToken')
+      warn "ip-ranges.json is up to date, no need to bump version"
+      break
+    end
 
     sync_token = parsed.fetch('syncToken')
-    last_modified = Time.parse(parsed.fetch('createDate'))
-    File.open(__dir__  + '/lib/aws_ip_utilities/ip-ranges.json', 'wb') do |fo|
+    File.open(__dir__ + '/lib/aws_ip_utilities/ip-ranges.json', 'wb') do |fo|
       fo << JSON.pretty_generate(parsed)
     end
-    Rake::Task["update_version_tokens"].invoke(sync_token, last_modified)
+    Rake::Task["update_version_tokens"].invoke(sync_token)
   end
 end
+task release_with_ip_data: [:download_and_bump_version, :release]
 
-task :default => :spec
-task :release_with_ip_data => [:download_and_bump_version, :release]
+RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new(:rubocop)
+task default: [:spec, :rubocop]

data/aws_ip_utilities.gemspec

@@ -1,4 +1,4 @@
-# coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'aws_ip_utilities/version'
@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.14"
+  spec.add_development_dependency "wetransfer_style", "0.6.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rack"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/aws_ip_utilities.rb

@@ -21,7 +21,9 @@ module AwsIpUtilities
 
   def self.aws_prefix(ip_addr_string)
     ip = IPAddr.new(ip_addr_string)
-    PREFIXES.find {|subnet| subnet.include?(ip) }
+    PREFIXES.find { |subnet| subnet.include?(ip) }
+  rescue IPAddr::InvalidAddressError
+    nil
   end
 
   def self.region_for(ip_addr_string)

data/lib/aws_ip_utilities/ip-ranges.json

@@ -1,6 +1,6 @@
 {
-  "syncToken": "1531345951",
-  "createDate": "2018-07-11-21-52-31",
+  "syncToken": "1533583353",
+  "createDate": "2018-08-06-19-22-33",
   "prefixes": [
     {
       "ip_prefix": "18.208.0.0/13",
@@ -482,6 +482,11 @@
       "region": "us-west-2",
       "service": "AMAZON"
     },
+    {
+      "ip_prefix": "99.82.174.0/24",
+      "region": "us-east-1",
+      "service": "AMAZON"
+    },
     {
       "ip_prefix": "52.95.255.128/28",
       "region": "eu-central-1",
@@ -803,13 +808,13 @@
       "service": "AMAZON"
     },
     {
-      "ip_prefix": "204.246.160.0/22",
-      "region": "us-west-1",
+      "ip_prefix": "99.82.160.0/24",
+      "region": "ap-south-1",
       "service": "AMAZON"
     },
     {
-      "ip_prefix": "52.93.142.0/23",
-      "region": "eu-north-1",
+      "ip_prefix": "204.246.160.0/22",
+      "region": "us-west-1",
       "service": "AMAZON"
     },
     {
@@ -842,6 +847,11 @@
       "region": "eu-west-1",
       "service": "AMAZON"
     },
+    {
+      "ip_prefix": "52.95.29.0/26",
+      "region": "us-east-2",
+      "service": "AMAZON"
+    },
     {
       "ip_prefix": "35.160.0.0/13",
       "region": "us-west-2",
@@ -972,6 +982,11 @@
       "region": "us-west-1",
       "service": "AMAZON"
     },
+    {
+      "ip_prefix": "99.82.161.0/24",
+      "region": "eu-west-3",
+      "service": "AMAZON"
+    },
     {
       "ip_prefix": "46.137.192.0/19",
       "region": "ap-southeast-1",
@@ -1087,6 +1102,11 @@
       "region": "eu-west-1",
       "service": "AMAZON"
     },
+    {
+      "ip_prefix": "99.82.171.0/24",
+      "region": "ap-southeast-1",
+      "service": "AMAZON"
+    },
     {
       "ip_prefix": "52.94.4.0/24",
       "region": "us-east-2",
@@ -1207,6 +1227,11 @@
       "region": "eu-west-2",
       "service": "AMAZON"
     },
+    {
+      "ip_prefix": "54.239.112.0/24",
+      "region": "us-east-1",
+      "service": "AMAZON"
+    },
     {
       "ip_prefix": "52.95.34.0/24",
       "region": "ap-northeast-1",
@@ -1237,11 +1262,6 @@
       "region": "eu-central-1",
       "service": "AMAZON"
     },
-    {
-      "ip_prefix": "52.93.144.0/23",
-      "region": "eu-north-1",
-      "service": "AMAZON"
-    },
     {
       "ip_prefix": "52.94.16.0/24",
       "region": "eu-west-3",
@@ -1287,6 +1307,11 @@
       "region": "GLOBAL",
       "service": "AMAZON"
     },
+    {
+      "ip_prefix": "99.82.162.0/24",
+      "region": "eu-west-1",
+      "service": "AMAZON"
+    },
     {
       "ip_prefix": "54.239.0.144/28",
       "region": "cn-north-1",
@@ -1497,6 +1522,11 @@
       "region": "us-west-1",
       "service": "AMAZON"
     },
+    {
+      "ip_prefix": "99.82.173.0/24",
+      "region": "us-east-1",
+      "service": "AMAZON"
+    },
     {
       "ip_prefix": "18.194.0.0/15",
       "region": "eu-central-1",
@@ -1532,6 +1562,11 @@
       "region": "us-east-1",
       "service": "AMAZON"
     },
+    {
+      "ip_prefix": "99.82.163.0/24",
+      "region": "eu-central-1",
+      "service": "AMAZON"
+    },
     {
       "ip_prefix": "54.92.128.0/17",
       "region": "us-east-1",
@@ -1597,6 +1632,11 @@
       "region": "me-south-1",
       "service": "AMAZON"
     },
+    {
+      "ip_prefix": "99.82.166.0/24",
+      "region": "ap-northeast-2",
+      "service": "AMAZON"
+    },
     {
       "ip_prefix": "13.58.0.0/15",
       "region": "us-east-2",
@@ -1872,6 +1912,11 @@
       "region": "eu-west-1",
       "service": "AMAZON"
     },
+    {
+      "ip_prefix": "3.8.0.0/14",
+      "region": "eu-west-2",
+      "service": "AMAZON"
+    },
     {
       "ip_prefix": "18.246.0.0/16",
       "region": "us-west-2",
@@ -2062,6 +2107,11 @@
       "region": "ap-southeast-1",
       "service": "AMAZON"
     },
+    {
+      "ip_prefix": "52.95.52.0/22",
+      "region": "us-east-1",
+      "service": "AMAZON"
+    },
     {
       "ip_prefix": "18.153.0.0/16",
       "region": "eu-central-1",
@@ -2472,6 +2522,11 @@
       "region": "us-west-2",
       "service": "AMAZON"
     },
+    {
+      "ip_prefix": "99.82.164.0/24",
+      "region": "sa-east-1",
+      "service": "AMAZON"
+    },
     {
       "ip_prefix": "52.92.68.0/22",
       "region": "eu-central-1",
@@ -2572,6 +2627,11 @@
       "region": "ap-northeast-1",
       "service": "AMAZON"
     },
+    {
+      "ip_prefix": "99.82.168.0/24",
+      "region": "ap-northeast-1",
+      "service": "AMAZON"
+    },
     {
       "ip_prefix": "52.93.48.22/31",
       "region": "eu-central-1",
@@ -2852,6 +2912,11 @@
       "region": "me-south-1",
       "service": "AMAZON"
     },
+    {
+      "ip_prefix": "99.82.167.0/24",
+      "region": "eu-west-2",
+      "service": "AMAZON"
+    },
     {
       "ip_prefix": "205.251.254.0/24",
       "region": "GLOBAL",
@@ -2927,11 +2992,6 @@
       "region": "cn-northwest-1",
       "service": "AMAZON"
     },
-    {
-      "ip_prefix": "52.93.224.0/22",
-      "region": "me-south-1",
-      "service": "AMAZON"
-    },
     {
       "ip_prefix": "52.144.194.192/26",
       "region": "us-west-1",
@@ -2992,6 +3052,11 @@
       "region": "ap-south-1",
       "service": "AMAZON"
     },
+    {
+      "ip_prefix": "99.82.156.0/22",
+      "region": "GLOBAL",
+      "service": "AMAZON"
+    },
     {
       "ip_prefix": "52.94.199.0/24",
       "region": "us-east-2",
@@ -3112,6 +3177,11 @@
       "region": "sa-east-1",
       "service": "AMAZON"
     },
+    {
+      "ip_prefix": "99.82.172.0/24",
+      "region": "ca-central-1",
+      "service": "AMAZON"
+    },
     {
       "ip_prefix": "52.119.184.0/22",
       "region": "ap-southeast-1",
@@ -3192,6 +3262,11 @@
       "region": "me-south-1",
       "service": "AMAZON"
     },
+    {
+      "ip_prefix": "99.82.169.0/24",
+      "region": "us-east-1",
+      "service": "AMAZON"
+    },
     {
       "ip_prefix": "52.94.198.128/28",
       "region": "ca-central-1",
@@ -3247,6 +3322,16 @@
       "region": "eu-central-1",
       "service": "AMAZON"
     },
+    {
+      "ip_prefix": "99.82.165.0/24",
+      "region": "us-east-1",
+      "service": "AMAZON"
+    },
+    {
+      "ip_prefix": "3.0.0.0/15",
+      "region": "ap-southeast-1",
+      "service": "AMAZON"
+    },
     {
       "ip_prefix": "43.250.193.0/24",
       "region": "ap-southeast-1",
@@ -3297,6 +3382,11 @@
       "region": "ap-southeast-1",
       "service": "AMAZON"
     },
+    {
+      "ip_prefix": "54.239.113.0/24",
+      "region": "eu-west-1",
+      "service": "AMAZON"
+    },
     {
       "ip_prefix": "176.32.112.0/21",
       "region": "us-west-1",
@@ -3307,6 +3397,11 @@
       "region": "us-west-2",
       "service": "AMAZON"
     },
+    {
+      "ip_prefix": "99.82.170.0/24",
+      "region": "us-west-1",
+      "service": "AMAZON"
+    },
     {
       "ip_prefix": "52.94.7.0/24",
       "region": "sa-east-1",
@@ -4792,6 +4887,11 @@
       "region": "us-west-2",
       "service": "EC2"
     },
+    {
+      "ip_prefix": "3.8.0.0/14",
+      "region": "eu-west-2",
+      "service": "EC2"
+    },
     {
       "ip_prefix": "18.246.0.0/16",
       "region": "us-west-2",
@@ -5402,6 +5502,11 @@
       "region": "eu-central-1",
       "service": "EC2"
     },
+    {
+      "ip_prefix": "3.0.0.0/15",
+      "region": "ap-southeast-1",
+      "service": "EC2"
+    },
     {
       "ip_prefix": "52.77.0.0/16",
       "region": "ap-southeast-1",
@@ -5757,6 +5862,11 @@
       "region": "GLOBAL",
       "service": "CLOUDFRONT"
     },
+    {
+      "ip_prefix": "99.82.156.0/22",
+      "region": "GLOBAL",
+      "service": "CLOUDFRONT"
+    },
     {
       "ip_prefix": "205.251.252.0/23",
       "region": "GLOBAL",
@@ -5847,6 +5957,11 @@
       "region": "ap-south-1",
       "service": "CODEBUILD"
     },
+    {
+      "ip_prefix": "52.82.1.0/29",
+      "region": "cn-northwest-1",
+      "service": "CODEBUILD"
+    },
     {
       "ip_prefix": "177.71.207.16/29",
       "region": "sa-east-1",
@@ -5882,6 +5997,11 @@
       "region": "sa-east-1",
       "service": "CODEBUILD"
     },
+    {
+      "ip_prefix": "52.80.198.136/29",
+      "region": "cn-north-1",
+      "service": "CODEBUILD"
+    },
     {
       "ip_prefix": "13.56.32.200/29",
       "region": "us-west-1",
@@ -5892,6 +6012,16 @@
       "region": "us-east-1",
       "service": "CODEBUILD"
     },
+    {
+      "ip_prefix": "13.251.113.64/26",
+      "region": "ap-southeast-1",
+      "service": "AMAZON"
+    },
+    {
+      "ip_prefix": "13.251.116.0/23",
+      "region": "ap-southeast-1",
+      "service": "AMAZON"
+    },
     {
       "ip_prefix": "13.210.2.192/26",
       "region": "ap-southeast-2",
@@ -6089,6 +6219,11 @@
       "region": "me-south-1",
       "service": "AMAZON"
     },
+    {
+      "ipv6_prefix": "2a05:d050:e000::/40",
+      "region": "me-south-1",
+      "service": "AMAZON"
+    },
     {
       "ipv6_prefix": "2a05:d07c:e000::/40",
       "region": "me-south-1",
@@ -7309,6 +7444,11 @@
       "region": "ap-southeast-1",
       "service": "S3"
     },
+    {
+      "ipv6_prefix": "2a05:d050:e000::/40",
+      "region": "me-south-1",
+      "service": "S3"
+    },
     {
       "ipv6_prefix": "2a05:d050:c000::/40",
       "region": "eu-west-2",

data/lib/aws_ip_utilities/version.rb

@@ -1,4 +1,4 @@
 module AwsIpUtilities
-  VERSION = "0.2.20180711"
-  SYNC_TOKEN = "1531345951"
+  VERSION = "0.3.1533583353"
+  SYNC_TOKEN = "1533583353"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws_ip_utilities
 version: !ruby/object:Gem::Version
-  version: 0.2.20180711
+  version: 0.3.1533583353
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-13 00:00:00.000000000 Z
+date: 2018-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: wetransfer_style
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +89,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - README.md
@@ -105,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Checks for AWS IP ranges.