tn_s3_file_uploader 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eaa24797da8fe43d9f3c72169f9d41686eaec5e
-  data.tar.gz: 855f649660e7ddd96c0d2e26663b92cfc546e92d
+  metadata.gz: 7f60a16847c7c072d148a3accaf2ed48b1535aeb
+  data.tar.gz: fe05f935dec58056e2a7717d9f21bfab031751c5
 SHA512:
-  metadata.gz: 40d472d1a25293fa8f057fa06b8d8b9b9339ec279f1cb8c8202dd16885be22b8c11ff6477416be77ddeddd4ba5601c44a71c5242543d9a292b23e10758a92931
-  data.tar.gz: 96335682165b4ecd26d0f7a9bc3ab33017c5134b6a6301e101d0cced5d7489d678a459f2849495ed39570689f22f4ed97bc87795111cccba4724ae034d380f82
+  metadata.gz: 3ae8a26d5339599ac657cccbcbdc19ae71fcfb8f1a81bc360976679e78e9d17786e3a4df3c07666065210d3c99cca0549d263de52c4ee930e906d9a86cb461a9
+  data.tar.gz: 0080d296b62139eb18c30d329f76769b9912655a6f9cfb0ab5c873ff76c79f0ed3fef675d61f413b4780939c57238ec2939bb58b84d93d5e389618a0fd81739d

data/lib/tn_s3_file_uploader/cli_parser.rb

@@ -50,13 +50,11 @@ module TnS3FileUploader
         opts.on("--aws-secret-access-key AWS-SECRET-ACCESS-KEY", "Provide the AWS secret access key") do |aws_secret_access_key|
           options[:aws_secret_access_key] = aws_secret_access_key
         end
-        
-        # Default: Google's static IP
-        options[:udp_resolve_ip] = '64.233.187.99'
-        opts.on("--udp_resolve_ip RESOLVE-IP", "Lookup IP to determine active network interface local IP.") do |resolve_ip|
-          if resolve_ip =~ /\d+\.\d+\.\d+\.\d+/
-            options[:udp_resolve_ip] = resolve_ip
-          end
+
+        options[:use_ec2_metadata_flag] = true
+        opts.on("--use-ec2-metadata [USE_EC2_METADATA]", "The flag for using the ec2 instance metadata endpoint to lookup the local IP."\
+            "It is an optional parameter, default is true.") do |use_ec2_metadata|
+          options[:use_ec2_metadata_flag] = use_ec2_metadata
         end
 
         opts.on("-v", "--verbose", "Display verbose output") do |v|

data/lib/tn_s3_file_uploader/file_path_generator.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'net/http'
 
 module TnS3FileUploader
 
@@ -15,6 +16,8 @@ module TnS3FileUploader
   # date = Wed Jun 18 19:03:40 UTC 2014
   class FilePathGenerator
 
+    EC2_INSTANCE_METADATA_IP='169.254.169.254'
+
     def initialize(options)
       #Find the last rotation window
       @options = options
@@ -62,16 +65,15 @@ module TnS3FileUploader
       end
     end
 
-    # First tries to find local IP using UDPSocket technique.
+    # First tries to find local IP using the EC2 instance metadata endpoint.
     # In the event of a failure, we will revert to using the old
     # method of local ip retrieval.  In the event that both techniques
     # fail, we return a default value
     def local_ip
-      resolve_ip = @options[:udp_resolve_ip]
       ip_address = nil
-      
-      unless resolve_ip.nil?
-        ip_address = udp_resolve_ip(resolve_ip)
+
+      if @options[:use_ec2_metadata_flag]
+        ip_address = ec2_instance_metadata_local_ip
       end
 
       unless ip_address.nil? or valid_ip?(ip_address)
@@ -81,27 +83,14 @@ module TnS3FileUploader
       unless valid_ip?(ip_address)
         ip_address = '0.0.0.0'
       end
-      
+
       ip_address
     end
 
-    # Finds public local IP by tracing a UDP route.
-    # Note: This code does NOT make a connection or send any packets to the listed resolve_ip
-    # UDP is a stateless protocol, the connect method makes
-    # a system call to determine packet routing based on address and what interface it
-    # should bind to. addr returns an array containing the family, local port and local address
-    # The local address is the last element in the addr array.
-    def udp_resolve_ip(resolve_ip)
-      orig, Socket.do_not_reverse_lookup = Socket.do_not_reverse_lookup, true
-
-      UDPSocket.open do |s|
-        s.connect resolve_ip, 1
-        s.addr.last
-      end
-    ensure
-      Socket.do_not_reverse_lookup = orig
+    def ec2_instance_metadata_local_ip
+      Net::HTTP.get(EC2_INSTANCE_METADATA_IP, '/latest/meta-data/local-ipv4') rescue nil
     end
-    
+
     def hostname_resolve_ip
       IPSocket.getaddress(Socket.gethostname)
     end

data/lib/tn_s3_file_uploader/version.rb

@@ -1,3 +1,3 @@
 module TnS3FileUploader
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tn_s3_file_uploader
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Thinknear.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: honeybadger
@@ -61,7 +61,7 @@ files:
 - lib/tn_s3_file_uploader/version.rb
 homepage: http://www.thinknear.com
 licenses:
-- Copyright (c) ThinkNear 2014, Licensed under APLv2.0
+- Copyright (c) ThinkNear 2014-2015, Licensed under APLv2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []