aws_metadata 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b0460eb560e5d3f2550b6b9974d743e273450d5
-  data.tar.gz: 6c4f85ce0e75b54a47e4fa06221910910a080cbd
+  metadata.gz: 0f47a7ac354bc5131d0a0541230d849359b4be02
+  data.tar.gz: 77b8a99b8ab04b3b6cba8de44ad416f5f9c74ec7
 SHA512:
-  metadata.gz: d2475064140697e30b234182779b6944240fc7cd865f5d9cad27a9d25284672f338170a265a59f970297acc6d9aaa7323d4fa1356a19575353050c63c416716f
-  data.tar.gz: d60031ec53de55a4ac4edddaabef1e0f963bad642790219403755533c726f77da869a4155a6acf533ec10873a630bb3a2eac2a6ef675b294aae6870ef4fc17c1
+  metadata.gz: f326ea632fbac729bfbf1dac578524da9595bb2672f0e83e7b78536ed5b1137ef6afa33e6c4804ed30f2b4d6ca2b165ccb34baa28943749853c4238618b5ee62
+  data.tar.gz: 9c7685e8d65f6ddf500814623bb56ed441113d943731c52efd4ee8a1e1cc54b95c0b8794e9df317154e1aaf8cc84dd16485e31f72b739eb53ecb2553aae3a915

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aws_metadata (0.1.4)
+    aws_metadata (0.1.5)
       aws-sdk
 
 GEM

data/lib/aws_metadata/instance_metadata.rb

@@ -61,11 +61,55 @@ module AWS
         load_stubs
         return
       end
-      http       = Net::HTTP.new host, port
+      http      = Net::HTTP.new host, port
+      load_metadata(http, version)
+      load_user_data(http, version)
+      load_dynamic(http, version)
+    end
+
+    # @private
+    def self.query http, path
+      rep = http.request Net::HTTP::Get.new path
+      unless Net::HTTPOK === rep
+        return nil
+      end
+      rep.body
+    end
+
+    # All the metadata from 169.254.169.254
+    #
+    # The hashes are Hashish objects that allows regular method like calls where all method names are the keys underscored.
+    def to_hash
+      { :metadata => @metadata, :user_data => @user_data, :dynamic => @dynamic }
+    end
+
+    private
+
+    # Load data from the meta-data URL
+    # @private
+    def load_metadata(http, version)
+      tries ||= 1
       @metadata = Treeish.new http, "/#{version}/meta-data/"
+      raise 'no metadata' if @metadata.nil?
+    rescue
+      raise if tries >= 10
+      sleep 1
+      tries += 1
+      retry
+    end
+
+    # Load data from the user-data URL
+    # @private
+    def load_user_data(http, version)
       @user_data = Instance.query http, "/#{version}/user-data"
-      @dynamic   = Hashish.new
+    rescue
+      @user_data = nil
+    end
 
+    # Load data from the dynamic URL
+    # @private
+    def load_dynamic(http, version)
+      @dynamic = Hashish.new
       begin
         dynamic_stuff = Instance.query(http, "/#{version}/dynamic/").lines
       rescue
@@ -77,31 +121,15 @@ module AWS
       end
     end
 
-    # @private
-    def self.query http, path
-      rep = http.request Net::HTTP::Get.new path
-      unless Net::HTTPOK === rep
-        return nil
-      end
-      rep.body
-    end
-
     # Helper method to provide "stubs" for non aws deployments
     # @private
     def load_stubs
-      yaml = Pathname.new(File.join(AWS::Metadata.aws_identity_stubs_path, 'aws_identity_stubs.yml'))
-      responses = YAML.load(ERB.new(yaml.read).result)
-      @metadata = Hashish.new responses[:metadata]
-      @user_data = responses[:user_data]
-      @dynamic = Hashish.new responses[:dynamic]
+      yaml                                      = Pathname.new(File.join(AWS::Metadata.aws_identity_stubs_path, 'aws_identity_stubs.yml'))
+      responses                                 = YAML.load(ERB.new(yaml.read).result)
+      @metadata                                 = Hashish.new responses[:metadata]
+      @user_data                                = responses[:user_data]
+      @dynamic                                  = Hashish.new responses[:dynamic]
       @dynamic['instance-identity']['document'] = @dynamic['instance-identity']['document'].to_json
     end
-
-    # All the metadata from 169.254.169.254
-    #
-    # The hashes are Hashish objects that allows regular method like calls where all method names are the keys underscored.
-    def to_hash
-      { :metadata => @metadata, :user_data => @user_data, :dynamic => @dynamic }
-    end
   end
 end

data/lib/aws_metadata/version.rb

@@ -1,5 +1,5 @@
 module AWS
   module Metadata
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws_metadata
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Evident.io
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler