leeroy_app 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a33c630bfff44d8f1fbaff8694c65891aef0f8c5
-  data.tar.gz: ad0999e31aec974b08fb8f1e10c268b62a653004
+  metadata.gz: 0c6837848cfe4074d257010b7e9ee430844ab59b
+  data.tar.gz: 743dc38168b8eb748a440372aaa0ee5598c9daf3
 SHA512:
-  metadata.gz: faf7735d2cdcd8f9cf9cb0e834210f465802fb614845bdca5c8ccd7bb1f3bd8da3d81cda343c036bfe2cf1488d32196c7b28ee6eb5d2c7dab40fc96aa2eedf0e
-  data.tar.gz: a5c965a55dc5be2683f0f27e98405e7c200ef6f0566ef000b62e760d8150e3e58b57c2e4b74193fd697abfb35949e3c1dfc853adb932fc423ed4109a0065dddf
+  metadata.gz: 167b5061e5a7323724d11850d3468f6f9b09e3fe3d941729ab9122b22d3e257377bb1cacd53af7a4bc1d305b1c7269ed230eb6c842533e6ca03b48575428eaa8
+  data.tar.gz: db277e54f900b5e6acd2b50e525debabacf2f146ecf50352dac914c91523f2b69619f34cdca2910ad0c74be688452763aa2b606612fe0428c20accc689b09247

data/README.md

@@ -1,4 +1,4 @@
-# leeroy
+# leeroy [![Gem Version](https://badge.fury.io/rb/leeroy_app.svg)](https://badge.fury.io/rb/leeroy_app) [![Code Climate](https://codeclimate.com/github/FitnessKeeper/leeroy/badges/gpa.svg)](https://codeclimate.com/github/FitnessKeeper/leeroy)
 o rly?  ya rly!
 
 ## Installation/Configuration

data/lib/leeroy/app.rb

@@ -8,6 +8,7 @@ require 'leeroy/task/instantiate'
 require 'leeroy/task/terminate'
 require 'leeroy/task/sleep'
 require 'leeroy/task/stub'
+require 'leeroy/types/phase'
 
 include GLI::App
 
@@ -15,7 +16,7 @@ module Leeroy
   module App
 
     # constants
-    VALID_PHASE = ['gold_master','application']
+    VALID_PHASE = Leeroy::Types::Phase::VALID_PHASE
 
     program_desc 'Automate tasks with Jenkins'
 

data/lib/leeroy/env.rb

@@ -14,11 +14,13 @@ module Leeroy
 
     # constants
     S3_PREFIXES = {
-      :secrets    => 'secrets',
-      :jenkins    => 'jenkins',
       :builds     => 'builds',
+      :fixtures   => 'fixtures',
+      :jenkins    => 'jenkins',
       :logs       => 'logs',
+      :secrets    => 'secrets',
       :semaphores => 'semaphores',
+      :sql        => 'fixtures/sql',
       :tests      => 'tests',
     }
 
@@ -38,7 +40,7 @@ module Leeroy
       'LEEROY_POLL_TIMEOUT' => '<number of seconds to wait between giving up on long-running AWS operations>',
       'LEEROY_PROVISIONING_TEMPLATE_PREFIX' => '<path on local filesystem to directory containing provisioning templates>',
       'LEEROY_S3_BUCKET' => '<name of bucket used as datastore>',
-      'LEEROY_PROVISIONING_TEMPLATE_PREFIX' => '<path on local filesystem to directory containing user-data templates>',
+      'LEEROY_USER_DATA_PREFIX' => '<path on local filesystem to directory containing user-data scripts>',
     }
 
     ENV_EXTRAS = {

data/lib/leeroy/helpers/aws.rb

@@ -13,7 +13,7 @@ module Leeroy
     module AWS
       include Leeroy::Helpers
 
-      attr :ec2, :s3
+      attr :ec2, :rds, :s3
 
       def initialize(*args, &block)
         super(*args, &block)
@@ -21,6 +21,7 @@ module Leeroy
         logger.debug "initializing AWS helpers"
 
         @ec2 = Aws::EC2::Client.new
+        @rds = Aws::RDS::Client.new
         @s3 = Aws::S3::Client.new
 
         logger.debug "AWS helpers initialized"
@@ -31,7 +32,6 @@ module Leeroy
       def ec2Request(method, params = {}, ec2 = self.ec2, options = self.options, global_options = self.global_options)
         begin
           logger.debug "constructing EC2 request for '#{method}'"
-          logger.debug "params: #{params.inspect}"
 
           params_mash = Leeroy::Types::Mash.new(params)
           params = params_mash
@@ -40,8 +40,6 @@ module Leeroy
 
           params.dry_run = dry_run
 
-          logger.debug "params: #{params.inspect}"
-
           resp = ec2.send(method.to_sym, params)
 
           logger.debug "resp: #{resp.inspect}"
@@ -207,7 +205,7 @@ module Leeroy
 
           resp = ec2Request(:describe_images, run_params)
 
-          # now filter based on callback
+          # now filter based on callbacks
           resp.images.select {|x| selector.call(x)}.collect {|x| collector.call(x)}
 
         rescue Aws::EC2::Errors::DryRunOperation => e
@@ -219,30 +217,58 @@ module Leeroy
         end
       end
 
+      def getImageByName(image_name)
+        begin
+
+          raise "image_name parameter cannot be nil" if image_name.nil?
+
+          selector = lambda {|image| image.name == image_name}
+          collector = lambda {|image| image.image_id}
+
+          image_ids = filterImages(selector, collector)
+          logger.debug image_ids.inspect
+          logger.debug "image_name: #{image_name}"
+
+          image_ids[0]
+
+        rescue StandardError => e
+          raise e
+        end
+      end
+
+
       def getGoldMasterInstanceName(env_name = 'LEEROY_GOLD_MASTER_NAME')
         checkEnv(env_name)
       end
 
-      def getApplicationInstanceName(index, env_app = 'LEEROY_APP_NAME', env_name = 'LEEROY_BUILD_TARGET')
-        name_prefix = [checkEnv(env_app), checkEnv(env_name), index].join('-')
+      def getApplicationInstanceName(index = nil, env_app = 'LEEROY_APP_NAME', env_name = 'LEEROY_BUILD_TARGET')
+        name_prefix = [checkEnv(env_app), checkEnv(env_name)].join('-')
         logger.debug "name_prefix: #{name_prefix}"
 
         if index.nil?
-          # determine the index by looking at existing images
-          selector = lambda {|image| image.name =~ /^#{name_prefix}/}
-          # and extract the names
-          collector = lambda {|image| image.name}
-
-          image_names = filterImages(selector, collector)
-          logger.debug image_names.awesome_inspect
+          index = getApplicationImageIndex
         end
 
+        instance_name = [name_prefix, index].join('-')
+        logger.debug "instance_name: #{instance_name}"
+
+        instance_name
+
       end
 
       def getGoldMasterImageIndex(env_prefix = 'LEEROY_GOLD_MASTER_IMAGE_PREFIX')
         name_prefix = checkEnv(env_prefix)
-        logger.debug "name_prefix: #{name_prefix}"
+        getMaxImageIndex(name_prefix)
+      end
 
+      def getApplicationImageIndex(env_build_target = 'LEEROY_BUILD_TARGET', env_app_name = 'LEEROY_APP_NAME')
+        app_name = checkEnv(env_app_name)
+        build_target = checkEnv(env_build_target)
+        name_prefix = [app_name, build_target].join('-')
+        getMaxImageIndex(name_prefix)
+      end
+
+      def getMaxImageIndex(name_prefix)
         # determine the index by looking at existing images
         selector = lambda {|image| image.name =~ /^#{name_prefix}/}
         # and extract the names
@@ -255,13 +281,54 @@ module Leeroy
           end
         end
 
-        latest_image = image_numbers.sort.compact.uniq.pop
+        latest_image = image_numbers.sort.compact.uniq.pop || 1
         logger.debug "latest_image: #{latest_image}"
 
         latest_image
 
       end
 
+      # RDS
+
+      def rdsRequest(method, params = {}, rds = self.rds, options = self.options, global_options = self.global_options)
+        begin
+          logger.debug "constructing RDS request for '#{method}'"
+
+          params_mash = Leeroy::Types::Mash.new(params)
+          params = params_mash
+
+          logger.debug "params: #{params.inspect}"
+
+          resp = rds.send(method.to_sym, params)
+
+          logger.debug "resp: #{resp.inspect}"
+
+          resp
+
+        rescue StandardError => e
+          raise e
+        end
+      end
+
+      def getRDSInstanceEndpoint(instancename, rds = self.rds)
+        begin
+          logger.debug "getting DB Instance Endpoint for '#{instancename}'"
+
+          resp = rdsRequest(:describe_db_instances, {:db_instance_identifier => instancename})
+          db_instances = resp.db_instances
+          logger.debug "db_instances: #{db_instances.inspect}"
+
+          db_instances[0].endpoint.address
+
+        rescue Aws::EC2::Errors::DryRunOperation => e
+          logger.info e.message
+          "DRYRUN_DUMMY_VALUE: #{self.class.to_s}"
+
+        rescue StandardError => e
+          raise e
+        end
+      end
+
       # S3
 
       def s3Request(method, params = {}, s3 = self.s3, options = self.options, global_options = self.global_options)

data/lib/leeroy/helpers/inventory.rb

@@ -0,0 +1,81 @@
+# Helper methods for managing inventory (images, instances, etc.)
+#
+require 'leeroy/helpers'
+require 'leeroy/helpers/aws'
+require 'leeroy/helpers/logging'
+
+module Leeroy
+  module Helpers
+    module Inventory
+      include Leeroy::Helpers::AWS
+      include Leeroy::Helpers::Logging
+
+      # determine the name of an AMI to use in creating an instance
+      def genImageName(phase = nil, state = self.state, options = self.options)
+        begin
+          # extract phase from state if not provided
+          phase = state.phase if phase.nil?
+
+          raise "no phase provided in state data or as param, exiting." if phase.nil?
+
+          # were we given an app_name?
+          app_name = state.app_name? ? state.app_name : checkEnv('LEEROY_APP_NAME')
+          logger.debug "app_name: #{app_name}"
+
+          # build target depends on phase
+          build_target = case phase
+          when 'gold_master'
+            'master'
+          when 'application'
+            checkEnv('LEEROY_BUILD_TARGET')
+          else
+            raise "unable to build target for phase"
+          end
+
+          # were we given an image index?
+          index = genImageIndex(state, self.env, self.ec2, options).to_s
+          logger.debug "index: #{index}"
+
+          image_name = [app_name, build_target, index].join('-')
+
+          logger.debug "image_name: #{image_name}"
+
+          image_name
+
+        rescue StandardError => e
+          raise e
+        end
+      end
+
+      def genImageIndex(state = self.state, env = self.env, ec2 = self.ec2, options = self.options)
+        begin
+          index = options[:index]
+
+          if index
+            logger.debug "index provided: #{index}"
+          else
+            logger.debug "index not provided, calculating"
+            phase = state.phase
+
+            index = case phase
+            when 'gold_master'
+              getGoldMasterImageIndex.to_i + 1
+            when 'application'
+              getGoldMasterImageIndex.to_i
+            else
+              raise "unable to determine image index for phase '#{phase.to_s}'"
+            end
+          end
+
+          logger.debug "index: #{index}"
+
+          index
+
+        rescue StandardError => e
+          raise e
+        end
+      end
+
+    end
+  end
+end

data/lib/leeroy/helpers/template.rb

@@ -0,0 +1,23 @@
+require 'leeroy/helpers'
+
+module Leeroy
+  module Helpers
+    module Template
+      include Leeroy::Helpers
+
+      def renderTemplate(template, b = binding)
+        begin
+          logger.debug "processing template '#{template}'"
+
+          # run the ERB renderer in a separate thread, restricted
+          # http://www.stuartellis.eu/articles/erb/
+          ERB.new(File.read(template), 0).result(binding)
+
+        rescue StandardError => e
+          raise e
+        end
+      end
+
+    end
+  end
+end

data/lib/leeroy/task/base.rb

@@ -21,26 +21,14 @@ module Leeroy
       def initialize(params = {})
         begin
           @global_options = params.fetch(:global_options, {})
-          logger.debug("global_options: #{self.global_options.to_s}")
-
-          logger.debug("setting options")
           @options = params.fetch(:options, {})
-          logger.debug("options: #{self.options.to_s}")
-
-          logger.debug("setting args")
           @args = params.fetch(:args, {})
-          logger.debug("args: #{self.args.to_s}")
 
-          logger.debug("setting env")
           @env = Leeroy::Env.new({}, params.fetch(:env, ENV))
-          logger.debug("env: #{self.env.to_s}")
 
-          logger.debug("setting state")
           @state = Leeroy::State.new(state_from_pipe(params.fetch(:state, {})))
           rotate_task_metadata
-          logger.debug("state: #{self.state}")
 
-          logger.debug("base initialization of #{self.class.to_s} complete")
         rescue StandardError => e
           raise e
         end
@@ -51,6 +39,7 @@ module Leeroy
           self.logger.info("performing #{self.class.to_s}")
           self.logger.debug("args: #{args.inspect}")
           self.logger.debug("options: #{options.inspect}")
+          self.logger.debug("global_options: #{global_options.inspect}")
 
         rescue StandardError => e
           raise e

data/lib/leeroy/task/image.rb

@@ -1,6 +1,7 @@
 require 'leeroy'
 require 'leeroy/task'
 require 'leeroy/helpers/aws'
+require 'leeroy/helpers/inventory'
 require 'leeroy/helpers/polling'
 require 'leeroy/types/image'
 require 'leeroy/types/phase'
@@ -9,6 +10,7 @@ module Leeroy
   module Task
     class Image < Leeroy::Task::Base
       include Leeroy::Helpers::AWS
+      include Leeroy::Helpers::Inventory
       include Leeroy::Helpers::Polling
 
       def perform(args = self.args, options = self.options, global_options = self.global_options)
@@ -90,18 +92,8 @@ module Leeroy
           logger.debug "instance_id: #{instance_id}"
           image_params.instance_id = instance_id
 
-          # were we given an app_name?
-          app_name = state.app_name? ? state.app_name : checkEnv('LEEROY_APP_NAME')
-          logger.debug "app_name: #{app_name}"
-
-          # were we given an image index?
-          index = _genImageIndex(state, env, ec2, options).to_s
-          logger.debug "index: #{index}"
-
-          # build target depends on phase
-          build_target = phase == 'gold_master' ? 'master' : checkEnv('LEEROY_BUILD_TARGET')
-
-          image_params.name = [app_name, build_target, index].join('-')
+          # generate image name based on state data
+          image_params.name = genImageName(phase, state)
 
           image_params
 
@@ -110,17 +102,6 @@ module Leeroy
         end
       end
 
-      def _genImageIndex(state = self.state, env = self.env, ec2 = self.ec2, options = self.options)
-        begin
-          logger.debug "determining gold master instance ID"
-
-          options[:index] or getGoldMasterImageIndex.to_i + 1
-
-        rescue StandardError => e
-          raise e
-        end
-      end
-
     end
   end
 end

data/lib/leeroy/task/instantiate.rb

@@ -1,13 +1,17 @@
 require 'leeroy'
 require 'leeroy/task'
 require 'leeroy/helpers/aws'
+require 'leeroy/helpers/inventory'
 require 'leeroy/helpers/polling'
+require 'leeroy/helpers/template'
 
 module Leeroy
   module Task
     class Instantiate < Leeroy::Task::Base
       include Leeroy::Helpers::AWS
+      include Leeroy::Helpers::Inventory
       include Leeroy::Helpers::Polling
+      include Leeroy::Helpers::Template
 
       def perform(args = self.args, options = self.options, global_options = self.global_options)
         begin
@@ -88,22 +92,7 @@ module Leeroy
       def _readSemaphore(phase)
         begin
           template = File.join(checkEnv('LEEROY_PROVISIONING_TEMPLATE_PREFIX'), "#{phase}.erb")
-          logger.debug "processing template '#{template}'"
-
-          # this is heinous
-          # http://stackoverflow.com/a/22777806/17597
-          rendered = String.new
-
-          begin
-            old_stdout = $stdout
-            $stdout = StringIO.new('','w')
-            ERB.new(File.read(template)).run
-            rendered = $stdout.string
-          ensure
-            $stdout = old_stdout
-          end
-
-          rendered
+          renderTemplate(template, binding)
 
         rescue StandardError => e
           raise e
@@ -166,15 +155,18 @@ module Leeroy
           phase = options[:phase]
           logger.debug "phase is #{phase}"
 
+          instance_params.phase = phase
+
           # AMI id depends on phase
-          if phase == 'gold_master'
-            image_id = checkEnv('LEEROY_AWS_LINUX_AMI')
-          elsif phase == 'application'
-            image_id = state.imageid
+          image_id = case phase
+          when 'gold_master'
+            checkEnv('LEEROY_AWS_LINUX_AMI')
+          when 'application'
+            state.imageid || getImageByName(genImageName('gold_master'))
+          else
+            nil
           end
 
-          instance_params.phase = phase
-
           raise "unable to determine image ID for phase '#{phase}'" if image_id.nil?
 
           instance_params.image_id = image_id

data/lib/leeroy/types/phase.rb

@@ -1,6 +1,10 @@
+require 'leeroy/helpers/logging'
+
 module Leeroy
   module Types
     class Phase < String
+      include Leeroy::Helpers::Logging
+
       VALID_PHASE = ['gold_master', 'application']
 
       def initialize(*args, &block)
@@ -10,6 +14,9 @@ module Leeroy
           phase = self.to_s
           raise "invalid value for phase: '#{phase}'" unless VALID_PHASE.include?(phase)
 
+        rescue TypeError => e
+          raise "invalid value for phase: #{e.message}"
+
         rescue StandardError => e
           raise e
         end

data/lib/leeroy/types/userdata.rb

@@ -6,7 +6,7 @@ module Leeroy
   module Types
     class UserData < Leeroy::Types::PackedString
       def encoded_for_ec2(input = self.to_s)
-        Base64.urlsafe_encode64(input)
+        Base64.encode64(input)
       end
     end
   end

data/lib/leeroy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leeroy_app
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Steve Huff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -276,9 +276,11 @@ files:
 - lib/leeroy/helpers/aws.rb
 - lib/leeroy/helpers/dumpable.rb
 - lib/leeroy/helpers/env.rb
+- lib/leeroy/helpers/inventory.rb
 - lib/leeroy/helpers/logging.rb
 - lib/leeroy/helpers/polling.rb
 - lib/leeroy/helpers/state.rb
+- lib/leeroy/helpers/template.rb
 - lib/leeroy/state.rb
 - lib/leeroy/task.rb
 - lib/leeroy/task/base.rb