puppet_ec2_enc 0.1.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66de548d7b6c1341448ca7ef411fba0eb1db1838
-  data.tar.gz: acc3e3b4f17963c6905e17182d7762144166a330
+  metadata.gz: 60913d10ff8ae2d089a94e77315856b39e46daa9
+  data.tar.gz: 81246e7da702eee2d3a07c376c24bc109c669a0b
 SHA512:
-  metadata.gz: 304633b6109bbaf756d036e989dfc65be71991ff9c5b68674faedb8467065fee2b57a8067231e2fee3528b2d5a3ad4f4fd7d81a4cc2e70385f42ff24f5784fd2
-  data.tar.gz: 98f1a016479a9bc587a8df55cad1a72445799a6f05ed09b54acbfa588327a444b73052a1d729d6659424f8dcbd165c90d4c72635f9154dd252f7c66cae5b97a7
+  metadata.gz: 0aeda2ed057c932380f3270f87ed6607d63fe796f60d4947fc70777ff369fec9e9628ef647d11f6c1ab6fcbad8ac59021d57fa10aaad0918cce45d4f1a0022d3
+  data.tar.gz: d51685be014bc1f9629f0477acfc4cae0193b6b35037008ae8e2baf05e6ff54ee708f62854d08f25a5b16af7350e8c001868b4ac49f0394eded700da9f1229e4

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/scratch/

data/exe/puppet_ec2_enc

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+require 'puppet_ec2_enc'
+
+raise ArgumentError.new(
+  'Usage: puppet_ec2_enc <node>'
+) unless ARGV.count == 1
+
+node = ARGV[0]
+
+puts PuppetEc2Enc.generate(node)

data/lib/puppet_ec2_enc.rb

@@ -1,13 +1,14 @@
 require "puppet_ec2_enc/version"
+require "puppet_ec2_enc/instance"
 require "puppet_ec2_enc/metadata"
 require "puppet_ec2_enc/ec2tags"
 require "puppet_ec2_enc/enc"
 
 module PuppetEc2Enc
-  def self.generate
-    instance_id = PuppetEc2Enc::Metadata.instance_id
-    region      = PuppetEc2Enc::Metadata.region
-    ec2tags     = PuppetEc2Enc::EC2Tags.new(instance_id: instance_id, region: region)
+  def self.generate(fqdn)
+    client      = PuppetEc2Enc::Instance.client
+    instance    = client.by_private_dns(fqdn)
+    ec2tags     = PuppetEc2Enc::EC2Tags.new(instance: instance)
     tags        = ec2tags.tags
     role        = tags.fetch('puppet_role')
     environment = tags.fetch('puppet_env')

data/lib/puppet_ec2_enc/ec2tags.rb

@@ -2,12 +2,10 @@ require 'aws-sdk'
 
 module PuppetEc2Enc
   class EC2Tags
-    attr_accessor :instance_id, :region, :ec2
+    attr_accessor :instance
 
     def initialize(opts = {})
-      @instance_id = opts[:instance_id] if opts[:instance_id]
-      @region      = opts[:region] if opts[:region]
-      @ec2         = Aws::EC2::Resource.new(region: @region)
+      @instance = opts[:instance] if opts[:instance]
     end
 
     def tags
@@ -17,11 +15,5 @@ module PuppetEc2Enc
       end
       tags
     end
-
-    private
-
-    def instance
-      ec2.instance(instance_id)
-    end
   end
 end

data/lib/puppet_ec2_enc/instance.rb

@@ -0,0 +1,45 @@
+module PuppetEc2Enc
+  class Instance
+    attr_accessor :ec2
+
+    def initialize
+      @ec2 = Aws::EC2::Client.new
+    end
+
+    def self.client
+      self.new
+    end
+
+    def by_private_dns(fqdn)
+      filter_hash = {
+        name: 'private-dns-name',
+        values: [fqdn]
+      }
+
+      reservations = filtered_search(filter_hash)
+
+      raise RuntimeError.new(
+        "Did not find EC2 instance named #{fqdn}!"
+      ) if reservations.nil?
+
+      raise RuntimeError.new(
+        "Somehow found more than one EC2 instance named #{fqdn}!"
+      ) if reservations.count > 1
+
+      return reservations[0].instances[0]
+    end
+
+    private
+
+    def filtered_search(filter_hash = {})
+      result = ec2.describe_instances({
+        filters: [
+          filter_hash
+        ]
+      })
+
+      return nil if result.reservations.count == 0
+      return result.reservations
+    end
+  end
+end

data/lib/puppet_ec2_enc/version.rb

@@ -1,3 +1,3 @@
 module PuppetEc2Enc
-  VERSION = "0.1.1"
+  VERSION = "0.2.2"
 end

data/puppet_ec2_enc.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Eric Olsen"]
   spec.email         = ["eric@ericolsen.net"]
 
-  spec.summary       = %q{ENC for Standalone Puppet Nodes Running on EC2}
-  spec.description   = %q{ENC for Standalone Puppet Nodes Running on EC2}
+  spec.summary       = %q{ENC for Puppet Running on EC2}
+  spec.description   = %q{ENC for Puppet Running on EC2}
   spec.homepage      = "https://github.com/eoly/puppet_ec2_enc"
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_ec2_enc
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Eric Olsen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-10 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,11 +66,11 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
-description: ENC for Standalone Puppet Nodes Running on EC2
+description: ENC for Puppet Running on EC2
 email:
 - eric@ericolsen.net
 executables:
-- puppet_ec2_enc.rb
+- puppet_ec2_enc
 extensions: []
 extra_rdoc_files: []
 files:
@@ -80,10 +80,11 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- exe/puppet_ec2_enc.rb
+- exe/puppet_ec2_enc
 - lib/puppet_ec2_enc.rb
 - lib/puppet_ec2_enc/ec2tags.rb
 - lib/puppet_ec2_enc/enc.rb
+- lib/puppet_ec2_enc/instance.rb
 - lib/puppet_ec2_enc/metadata.rb
 - lib/puppet_ec2_enc/version.rb
 - puppet_ec2_enc.gemspec
@@ -107,8 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
-summary: ENC for Standalone Puppet Nodes Running on EC2
+summary: ENC for Puppet Running on EC2
 test_files: []

data/exe/puppet_ec2_enc.rb

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'puppet_ec2_enc'
-
-puts PuppetEc2Enc.generate