marty 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4069f0be0ac4faa38738a0aa5f1a76fa56fcbed5
-  data.tar.gz: 832fed4b13056de3a94fbcaebb9fa463fd475f0b
+SHA256:
+  metadata.gz: 12916fbcdae9c35d9e8005866bf47f499e87d52c3ce6a11baf6c1c27cccfa30d
+  data.tar.gz: 7adf195afe0428efc1d50f1c30571a609e052d7c1a163aeb46832b77a9d8b81b
 SHA512:
-  metadata.gz: 57cd24df5c095785c4a22d8c801db32a1e504e773bf0d0edce681d53edd71c1b22e55925bcd1fe931dc71457d88b720ad1ad04f1010d50d07df0dfe93caf52e1
-  data.tar.gz: bbcb53ecee094328f5271f5f60b90daa4f606729b196389d0e2316cb14cb53318ef57b603626fca446521aea19a9f734b9b61f1014ec5a7c45e8f4b4bb05bcba
+  metadata.gz: 0db85cccbd634db5c5edb59d44184778de62b75c8854f8f5b00fa2a7f35555f757a94f0d76b335566d91a9dc0b8044c722e831e0242cbb29893c1c62b8f764c5
+  data.tar.gz: a749f278a997cffa3374070fb9d562c3d703213666cb97b7595d8958a56a158eb41a241631c5d26573b07375ade09b07fd9eb541681d550047d6abf54bc73dd0

data/lib/marty/aws/base.rb

@@ -1,4 +1,6 @@
 class Marty::Aws::Base
+  # this base class is used for instance information/credential acquisition
+
   # aws reserved host used to get instance meta-data
   META_DATA_HOST = '169.254.169.254'
 
@@ -46,53 +48,15 @@ class Marty::Aws::Base
     query_meta_data('iam/security-credentials').to_s
   end
 
-  def get_credentials
-    res = JSON.parse(query_meta_data("iam/security-credentials/#{@role}"))
-    res.symbolize_keys
+  def sym obj
+    obj.each_with_object({}){|(k,v),h| h[k.underscore.to_sym] = v}
   end
 
-  def get_document
-    res = JSON.parse(query_dynamic('instance-identity/document'))
-    res.symbolize_keys
-  end
-
-  def request info, params = {}
-    action   = info[:action]
-    endpoint = info[:endpoint]
-    method   = info[:method] || :get
-
-    default = action ? {'Action' => action, 'Version' => @version} : {}
-
-    host = "#{@service}.#{@doc[:region]}.amazonaws.com"
-
-    url = "https://#{host}/"
-    url += endpoint if endpoint
-    url += '?' + (default + params).map{|a, v| "#{a}=#{v}"}.join('&') unless
-      params.empty?
-
-    sig = Aws::Sigv4::Signer.new(service:           @service,
-                                 region:            @doc[:region],
-                                 access_key_id:     @creds[:access_key_id],
-                                 secret_access_key: @creds[:secret_access_key],
-                                 session_token:     @creds[:token])
-    signed_url = sig.presign_url(http_method:'GET', url: url)
-
-    http = Net::HTTP.new(host, 443)
-    http.use_ssl = true
-    Net::HTTP.send(method, signed_url)
+  def get_credentials
+    sym(JSON.parse(query_meta_data("iam/security-credentials/#{@role}")))
   end
 
-  def ensure_resp path, obj
-    if path == []
-      obj.is_a?(Array) ? obj : [obj]
-    elsif obj.is_a?(Hash)
-      key = path.shift
-      raise "Unexpected AWS Response: #{key} missing" unless
-        (obj.is_a?(Hash) && obj[key])
-
-      ensure_resp(path, obj[key])
-    else
-      obj.map{|s| ensure_resp(path.clone, s)}.flatten(1)
-    end
+  def get_document
+    sym(JSON.parse(query_dynamic('instance-identity/document')))
   end
 end

data/lib/marty/aws/request.rb

@@ -0,0 +1,44 @@
+class Marty::Aws::Request < Marty::Aws::Base
+  # this class is used to make aws api requests for specific services
+  # currently only used for diagnostics
+
+  def request info, params = {}
+    action   = info[:action]
+    endpoint = info[:endpoint]
+    method   = info[:method] || :get
+
+    default = action ? {'Action' => action, 'Version' => @version} : {}
+
+    host = "#{@service}.#{@doc[:region]}.amazonaws.com"
+
+    url = "https://#{host}/"
+    url += endpoint if endpoint
+    url += '?' + (default + params).map{|a, v| "#{a}=#{v}"}.join('&') unless
+      params.empty?
+
+    sig = Aws::Sigv4::Signer.new(service:           @service,
+                                 region:            @doc[:region],
+                                 access_key_id:     @creds[:access_key_id],
+                                 secret_access_key: @creds[:secret_access_key],
+                                 session_token:     @creds[:token])
+    signed_url = sig.presign_url(http_method:'GET', url: url)
+
+    http = Net::HTTP.new(host, 443)
+    http.use_ssl = true
+    Net::HTTP.send(method, signed_url)
+  end
+
+  def ensure_resp path, obj
+    if path == []
+      obj.is_a?(Array) ? obj : [obj]
+    elsif obj.is_a?(Hash)
+      key = path.shift
+      raise "Unexpected AWS Response: #{key} missing" unless
+        (obj.is_a?(Hash) && obj[key])
+
+      ensure_resp(path, obj[key])
+    else
+      obj.map{|s| ensure_resp(path.clone, s)}.flatten(1)
+    end
+  end
+end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "2.4.2"
+  VERSION = "2.4.3"
 end

data/other/marty/diagnostic/aws/ec2_instance.rb

@@ -1,9 +1,5 @@
-class Marty::Diagnostic::Aws::Ec2Instance < Marty::Aws::Base
-  # aws reserved host used to get instance meta-data
-  META_DATA_HOST = '169.254.169.254'
-
-  attr_reader :host,
-              :tag,
+class Marty::Diagnostic::Aws::Ec2Instance < Marty::Aws::Request
+  attr_reader :tag,
               :nodes,
               :instances
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -491,6 +491,7 @@ files:
 - gemini_deprecations.md
 - lib/marty.rb
 - lib/marty/aws/base.rb
+- lib/marty/aws/request.rb
 - lib/marty/content_handler.rb
 - lib/marty/data_change.rb
 - lib/marty/data_conversion.rb
@@ -1722,7 +1723,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A framework for working with versioned data