sortinghat 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf767b88b4dc1e13e2c2ba670b706efc8ce09d33
-  data.tar.gz: 42cda4780b90f711e220d44f7f46baa96d93d402
+  metadata.gz: 59892d22cedf8e98be4abe64b1eaad223777806a
+  data.tar.gz: c66c95ed0098a384a0e5797e6a914354e7431c0c
 SHA512:
-  metadata.gz: cde94d2d42010301ed9131a059086021067279fdd046069468f3ee9b3ec622ecdf43619a1a69360e36323963d15a4d8ded25fbaf1c19437f502b93c66ce8058d
-  data.tar.gz: 2845e1f467a07980e370e465e16f38fffc385cc02dd6eddd966465e0ed359f497dd9d9f7f700c0d3efb4213eabb99e14b291fff5302d97f51bba17c200fc50d2
+  metadata.gz: 0bef5473f37c0d14c36ab6290340c9d1764ac70c72b3c39bbcea12455da3ae871a88ad5288aa700cec18eddf96c961b93b1d2989090362d0d8bc2017ba3d2e2d
+  data.tar.gz: 8ae5477f8b4b6fdec97b50193147601353f546fbf2543c44bed0cc0c326bc63cd3504a56e6f742e9f1d4d1cd4484b2d3408f9ec3ab505858dff589a92e570ca4

data/README.md

@@ -14,7 +14,7 @@ It follows a specific pattern for hostnames/fqdn:
 For example:
 
 ```
-nike-prod-nginx09.prod-internal.nike.com
+nike-prod-nginx09.prod-nike.com
 ```
 
 ## Installation:
@@ -32,7 +32,8 @@ It requires the following gems:
 * pure_json
 
 During actually usage, the gem requires that the instance have the following IAM actions allowed via policy:
-* autoscaling:Describe*
+* autoscaling:DescribeAutoScalingInstances
+* autoscaling:DescribeAutoScalingGroups
 * ec2:DescribeInstances
 * ec2:CreateTags
 * route53:ListHostedZones
@@ -73,7 +74,6 @@ Run:
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/praymann/sortinghat.
 
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/lib/sortinghat/aws.rb

@@ -16,7 +16,7 @@ module Sortinghat
       @log = Syslog::Logger.new 'sortinghat'
     end
 
-    # Method to discover all the alive auto-scaling instances
+    # Method to discover what auto-scaling group the current instance is in, then the instances in that group
     # Returns array of the Name tag values of the instances
     def discover()
       # Temporay array for use
@@ -25,14 +25,25 @@ module Sortinghat
       # Start a new client
       autoscale = Aws::AutoScaling::Client.new( region: @region )
 
-      # Use the client to grab all autoscaling instances
-      resp = autoscale.describe_auto_scaling_instances()
-      @log.info("Grabbed all AutoScaling instances via aws-sdk")
+      # Use the client to describe this instance
+      current = autoscale.describe_auto_scaling_instances({
+        instance_ids: [grabinstanceid()],
+        max_records: 1
+      })
+      @log.info("Grabbed current AutoScaling instance via aws-sdk")
+
+      # Use the client to grab all instances in this auto-scaling group
+      all = autoscale.describe_auto_scaling_groups({
+        auto_scaling_group_names: [current.auto_scaling_instances[0].auto_scaling_group_name],
+        max_records: 1
+      })
+      @log.info("Grabbed the instances of our AutoScaling group via aws-sdk")
 
       # Grab their instanceId(s)
-      resp.auto_scaling_instances.each do |instance|
-	ids << idtoname(instance.instance_id)
+      all.auto_scaling_groups[0].instances.each do |instance|
+        ids << idtoname(instance.instance_id)
       end
+      @log.info("Returning instances '#{ids.join("','")}'")      
       
       # Return the ids
       ids
@@ -51,7 +62,7 @@ module Sortinghat
             key: 'Name',
             value: hostname,
           },
-	]
+	      ]
       })
       @log.info("Set Name tag to #{hostname} via aws-sdk")
     end
@@ -110,11 +121,8 @@ module Sortinghat
 
     def idtoname(instance_id)
       resource = Aws::EC2::Resource.new(client: @client)
-      resource.instance(instance_id).tags.each do |tag|
-        if tag.key == 'Name'
-          return tag.value
-        end
-      end
+      name = resource.instance(instance_id).tags.find { |tag| tag.key == 'Name' }
+      return name.value unless name.nil?
     end
 
     def zonetoid(hostedzone)

data/lib/sortinghat/banquet.rb

@@ -29,17 +29,19 @@ module Sortinghat
       # Check for sentinel file
       if File.exists?('/etc/.sorted')
         # We found it, log error and exit successfully
-        @log.error('Found /etc/.sorted, refusing to sort.')
-        abort('Found /etc/.sorted, refusing to sort.')
+        @log.info('Found /etc/.sorted, refusing to sort.')
+        exit 0
       end
     end
 
     # Main method of Sortinghat
     def start!
       # Find out who is who, instances alive
+      # If discover() returns a nil Array, alive will be nil
       alive = cleanup(@aws.discover())
 
       # Given the alive instances, find our prefix
+      # If alive is nil, selection will return the number '1'
       @prefix = ensurezero(selection(alive))
 
       # Put together hostname/fqdn
@@ -48,6 +50,7 @@ module Sortinghat
       @aws.settag!(@hostname)
 
       # Find out who is who, instances alive
+      # If discover() returns a nil Array, alive will be nil
       alive = cleanup(@aws.discover())
 
       unless alive.uniq.length == alive.length
@@ -90,10 +93,14 @@ module Sortinghat
     end
 
     def cleanup(array)
+      return [] if array.any? { |item| item.nil? }
       array.select! { |name| name.include?(@options[:env]) and name.include?(@options[:client]) and name.include?(@options[:type]) }
     end
 
     def selection(array)
+      # If array is nil, just return 01
+      return 1 if array.nil?
+
       # Array to store the numbers already taken 
       taken = Array.new
       

data/lib/sortinghat/version.rb

@@ -1,3 +1,3 @@
 module Sortinghat
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sortinghat
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - D. Pramann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler