automan 2.3.6 → 2.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba8bf0ad1d6385060e00b45ab199391f2520c179
-  data.tar.gz: 54e997202865573a99b4b21005869e79a3374977
+  metadata.gz: cfb2258dca674b5f5538a66cf62dfb5b85dba8fa
+  data.tar.gz: 1eae94e8cacea86e1bec2ed10220a59e59d6b898
 SHA512:
-  metadata.gz: af5c94a4677e630eca5ef7e9d2d4fb47b306b7e7dec0ffaa23246f57009855947b6df6378b31748cb671a7110ed1051b7bbd1b76ac6be857e6f2675f38755713
-  data.tar.gz: a5ca5a4b040037645bd92541bc4e3c1c6800ca6faa3539b28f6cdd7854b192f2c7159a91a3afc39f62eaac25d37f5f52c450c7d45a700a3152f51e1c58362b91
+  metadata.gz: 365b6f670a7cffcc09f049132a7d41b123eeca5f0f1d81147dc39122a13566e3e8b0573f7dc20e24f4096a71c7f875d484347e6e2f8f8235091544e6d69bed67
+  data.tar.gz: 7019345e8fbf59862b6dfeb8c7b805df644ed817dffd101fd360f17aab0a949142b3c11faa68b539377bf7dbb43fbeef14c2f09b7eae6df3dc8109a90f0c77b6

data/.ruby-gemset

@@ -0,0 +1 @@
+automan

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.1.2

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - "2.1.2"
+# uncomment this line if your project needs to run something other than `rake`:
+# script: bundle exec rspec spec

data/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/automan.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec-core", "~> 2.12.2"
-  spec.add_development_dependency "rspec-mocks", "~> 2.12.2"
-  spec.add_development_dependency "rspec-expectations", "~> 2.12.1"
+  spec.add_development_dependency "rspec-core", "~> 3"
+  spec.add_development_dependency "rspec-mocks", "~> 3"
+  spec.add_development_dependency "rspec-expectations", "~> 3"
   spec.add_dependency "aws-sdk", "< 2.0"
   spec.add_dependency "thor"
   spec.add_dependency "json"

data/lib/automan/base.rb

@@ -12,11 +12,9 @@ module Automan
 
     include Automan::Mixins::AwsCaller
 
-    def initialize(options=nil)
+    def initialize(options={})
       $stdout.sync = true
       @logger = Logger.new(STDOUT)
-      @log_aws_calls = false
-      #@wait = Wait.new(rescuer: WaitRescuer.new, logger: @logger)
 
       if !options.nil?
         options.each_pair do |k,v|
@@ -24,6 +22,12 @@ module Automan
           send(accessor, v) if respond_to? accessor
         end
       end
+
+      aws_options = {}
+      if options[:log_aws]
+        aws_options[:logger] = @logger
+      end
+      configure_aws(aws_options)
     end
 
     def self.add_option(*args)

data/lib/automan/beanstalk/deployer.rb

@@ -18,7 +18,7 @@ module Automan::Beanstalk
 
     include Automan::Mixins::Utils
 
-    def initialize(options=nil)
+    def initialize(options={})
       @number_to_keep = 0
       super
     end

data/lib/automan/beanstalk/package.rb

@@ -13,7 +13,7 @@ module Automan::Beanstalk
 
       # verify local package exists
       unless File.exists? source
-        raise MissingPackageFile, "package file #{source} does not exist"
+        raise MissingPackageFileError, "package file #{source} does not exist"
       end
 
       logger.info "Uploading #{source} to #{destination}"

data/lib/automan/beanstalk/router.rb

@@ -10,7 +10,7 @@ module Automan::Beanstalk
 
     attr_accessor :attempts_made
 
-    def initialize(options=nil)
+    def initialize(options={})
       super
       @wait = Wait.new({
         attempts: 10,

data/lib/automan/cli/snapper.rb

@@ -7,28 +7,28 @@ module Automan::Cli
     desc "create", "create a snapshot"
 
     option :environment,
-      aliases: "-e",
-      desc: "environment of database to snapshot"
+    aliases: "-e",
+    desc: "environment of database to snapshot"
 
     option :database,
-      aliases: "-d",
-      desc: "name of the database to snapshot"
+    aliases: "-d",
+    desc: "name of the database to snapshot"
 
     option :name,
-      aliases: "-n",
-      desc: "what to name the snapshot"
+    aliases: "-n",
+    desc: "what to name the snapshot"
 
     option :prune,
-      aliases: "-p",
-      type: :boolean,
-      default: true,
-      desc: "make this snapshot prunable and delete other prunable snapshots older than 30 days"
+    aliases: "-p",
+    type: :boolean,
+    default: true,
+    desc: "make this snapshot prunable and delete other prunable snapshots older than 30 days"
 
     option :wait_for_completion,
-      aliases: "-w",
-      type: :boolean,
-      default: false,
-      desc: "wait until snapshot is finished before exiting script"
+    aliases: "-w",
+    type: :boolean,
+    default: false,
+    desc: "wait until snapshot is finished before exiting script"
 
     def create
       if options[:database].nil? && options[:environment].nil?
@@ -37,8 +37,9 @@ module Automan::Cli
         exit 1
       end
 
-      s = Automan::RDS::Snapshot.new(options)
-      s.log_aws_calls = true
+      aws_opts = options.dup
+      aws_opts[:log_aws] = true
+      s = Automan::RDS::Snapshot.new(aws_opts)
       s.prune_snapshots if options[:prune]
       s.create
     end
@@ -46,9 +47,9 @@ module Automan::Cli
     desc "delete", "delete a snapshot"
 
     option :name,
-      required: true,
-      aliases: "-n",
-      desc: "name of snapshot to delete"
+    required: true,
+    aliases: "-n",
+    desc: "name of snapshot to delete"
 
     def delete
       Automan::RDS::Snapshot.new(options).delete
@@ -57,12 +58,12 @@ module Automan::Cli
     desc "latest", "find the most recent snapshot"
 
     option :database,
-      aliases: "-d",
-      desc: "name of the database to snapshot"
+    aliases: "-d",
+    desc: "name of the database to snapshot"
 
     option :environment,
-      aliases: "-e",
-      desc: "environment of database to snapshot"
+    aliases: "-e",
+    desc: "environment of database to snapshot"
 
     def latest
       if options[:database].nil? && options[:environment].nil?
@@ -77,15 +78,14 @@ module Automan::Cli
     desc "count", "return the number of snapshots"
 
     option :environment,
-      aliases: "-e",
-      desc: "environment of database to snapshot"
+    aliases: "-e",
+    desc: "environment of database to snapshot"
 
     option :database,
-      aliases: "-d",
-      desc: "name of the database to snapshot"
+    aliases: "-d",
+    desc: "name of the database to snapshot"
 
     def count
-
       if options[:database].nil? && options[:environment].nil?
         puts "Must specify either database or environment"
         help "count"
@@ -94,6 +94,6 @@ module Automan::Cli
 
       Automan::RDS::Snapshot.new(options).count_snapshots
     end
-
+     
   end
 end

data/lib/automan/cli/stacker.rb

@@ -102,5 +102,24 @@ module Automan::Cli
       h = Automan::Cloudformation::Launcher.new(options).parse_template_parameters
       say JSON.pretty_generate h
     end
+
+    include Thor::Actions
+    def self.source_root
+      File.join(File.dirname(__FILE__),'..','..', '..')
+    end
+
+    desc "project APP_NAME", "create stacker project"
+
+    attr_reader :app_name
+
+    def project(app_name)
+      @app_name = app_name
+
+      say "\nCreating stacker project: #{app_name}\n", :yellow
+      directory 'templates/stacker', app_name
+      [app_name, "launch_#{app_name}.sh"].each do |file|
+        chmod File.join(app_name, 'bin', file), 0755
+      end
+    end
   end
 end

data/lib/automan/cloudformation/launcher.rb

@@ -16,7 +16,7 @@ module Automan::Cloudformation
 
     include Automan::Mixins::Utils
 
-    def initialize(options=nil)
+    def initialize(options={})
       @wait_for_completion = false
       super
       @wait = Wait.new({
@@ -148,6 +148,8 @@ module Automan::Cloudformation
 
       logger.info "updating stack #{name}"
 
+      no_updates_needed = false
+
       # if cfn determines that no updates are to be performed,
       # it raises a ValidationError
       begin
@@ -157,10 +159,11 @@ module Automan::Cloudformation
           raise e
         else
           logger.info e.message
+          no_updates_needed = true
         end
       end
 
-      if wait_for_completion
+      if !no_updates_needed && wait_for_completion
         logger.info "waiting for stack #{name} to update"
         wait_until { stack_update_complete? }
       end
@@ -193,4 +196,4 @@ module Automan::Cloudformation
     end
   end
 
-end
+end

data/lib/automan/cloudformation/replacer.rb

@@ -5,7 +5,7 @@ module Automan::Cloudformation
   class Replacer < Automan::Base
     add_option :name
 
-    def initialize(options=nil)
+    def initialize(options={})
       super
       @wait = Wait.new({
         delay: 60,

data/lib/automan/cloudformation/terminator.rb

@@ -4,7 +4,7 @@ module Automan::Cloudformation
   class Terminator < Automan::Base
     add_option :name, :wait_for_completion
 
-    def initialize(options=nil)
+    def initialize(options={})
       @wait_for_completion = false
       super
       @wait = Wait.new({

data/lib/automan/ec2/image.rb

@@ -7,7 +7,7 @@ module Automan::Ec2
 
     include Automan::Mixins::Utils
 
-    def initialize(options=nil)
+    def initialize(options={})
       super
       @wait = Wait.new({
         delay: 5,
@@ -45,7 +45,7 @@ module Automan::Ec2
     end
 
     def default_image_name
-      stime = Time.new.iso8601.gsub(/:/, '-')
+      stime = Time.now.utc.iso8601.gsub(/[:+]/, '')
       return name + "-" + stime
     end
 
@@ -134,4 +134,4 @@ module Automan::Ec2
     end
 
   end
-end
+end

data/lib/automan/elasticache/router.rb

@@ -0,0 +1,79 @@
+require 'automan'
+
+module Automan::ElastiCache
+  class Router < Automan::Base
+
+    add_option :environment,
+    :hosted_zone_name,
+    :redis_host
+
+    def node_name_from_elasticache_environment(env)
+
+      opts = {
+        cache_cluster_id: "redis-#{env}",
+        show_cache_node_info: true
+      }
+
+      response = ec.client.describe_cache_clusters opts
+
+      unless response.successful?
+        raise RequestFailedError, "describe_cache_clusters failed: #{response.error}"
+      end
+
+      cluster=response.data[:cache_clusters]
+      if cluster.empty?
+        return nil
+      end
+
+      nodes=Hash[*cluster][:cache_nodes]
+      if nodes.empty?
+        return nil
+      end
+
+      endpoint=Hash[*nodes][:endpoint]
+      if endpoint.empty?
+        return nil
+      end
+
+      logger.info "found redis endpoint at #{endpoint[:address]}"
+      endpoint[:address]
+    end
+
+    # be sure alias_name ends in period
+    def update_dns_alias(zone_name, redis_cname, primary_endpoint)
+      zone = r53.hosted_zones.select {|z| z.name == zone_name}.first
+      rrset = zone.rrsets[redis_cname + '.', 'CNAME']
+
+      if rrset.exists?
+        logger.info "removing old record at #{redis_cname}"
+        rrset.delete
+      end
+
+      logger.info "creating record #{redis_cname} -> #{primary_endpoint}"
+      zone.rrsets.create(
+        redis_cname + '.',
+        'CNAME',
+        :ttl => 300,
+        :resource_records => [{:value => primary_endpoint}]
+        )
+    end
+
+    def run
+      log_options
+
+      logger.info "getting redis primary node name..."
+      primary_endpoint = node_name_from_elasticache_environment environment
+
+      if primary_endpoint.nil?
+        false
+      else
+        update_dns_alias(
+          hosted_zone_name,
+          redis_host,
+          primary_endpoint
+          )
+        true
+      end
+    end
+  end
+end

data/lib/automan/mixins/aws_caller.rb

@@ -8,14 +8,20 @@ module Automan
         ENV['AWS_ACCOUNT_ID']
       end
 
-      attr_reader :log_aws_calls
-      def log_aws_calls=(value)
-        if value == true
-          AWS.config(logger: @logger)
-        else
-          AWS.config(logger: nil)
+      def configure_aws(options={})
+        if ENV['AWS_ROLE']
+          sts = AWS::STS.new
+
+          @logger.info "Assuming role #{ENV['AWS_ROLE']}"
+          provider = AWS::Core::CredentialProviders::AssumeRoleProvider.new(
+            sts: sts,
+            role_arn: ENV['AWS_ROLE'],
+            role_session_name: "automan-aws-sdk"
+          )
+          options[:credential_provider] = provider
         end
-        @log_aws_calls = value
+
+        AWS.config(options)
       end
 
       attr_writer :eb
@@ -102,6 +108,14 @@ module Automan
         @rds
       end
 
+      attr_writer :ec
+      def ec
+        if @ec.nil?
+          @ec = AWS::ElastiCache.new
+        end
+        @ec
+      end
+
       attr_writer :ec2
       def ec2
         if @ec2.nil?

data/lib/automan/rds/snapshot.rb

@@ -12,7 +12,7 @@ module Automan::RDS
 
     attr_accessor :max_snapshots
 
-    def initialize(options=nil)
+    def initialize(options={})
       @prune = true
       @wait_for_completion = false
       super
@@ -33,6 +33,8 @@ module Automan::RDS
 
     include Automan::Mixins::Utils
 
+    # TODO move this and dependecies to an RDS utils class
+    # so we can re-use it
     def find_db
       db = nil
       if !database.nil?
@@ -63,7 +65,9 @@ module Automan::RDS
     end
 
     def snapshot_count
-      rds.db_instances[find_db.id].snapshots.count
+      AWS.memoize do
+        rds.db_instances[find_db.id].snapshots.count
+      end
     end
 
     def create
@@ -93,8 +97,8 @@ module Automan::RDS
       snap = db.create_snapshot(myname)
 
       if prune == true
-        logger.info "Setting snapshot to be prunable"
-        set_prunable(snap)
+        logger.info "Setting snapshot to be prunable and tagging environment"
+        set_prunable_and_env(snap,environment)
       end
 
       if wait_for_completion == true
@@ -120,7 +124,7 @@ module Automan::RDS
 
     def default_snapshot_name(db)
       env   = db_environment db
-      stime = Time.new.iso8601.gsub(/:/,'-')
+      stime = Time.new.strftime("%Y-%m-%dT%H-%M")
 
       return env + "-" + stime
     end
@@ -145,10 +149,10 @@ module Automan::RDS
     end
 
     # tag with CanPrune
-    def set_prunable(snapshot)
+    def set_prunable_and_env(snapshot,environment)
       opts = {
         resource_name: snapshot_arn(snapshot),
-        tags: [ {key: 'CanPrune', value: 'yes'} ]
+        tags: [ {key: 'CanPrune', value: 'yes'}, {key: 'Environment', value: environment} ]
       }
       response = rds.client.add_tags_to_resource opts
 
@@ -185,6 +189,15 @@ module Automan::RDS
       tagged_can_prune?(snapshot) && available?(snapshot) && manual?(snapshot)
     end
 
+    def is_env?(snapshot,environment)
+      tagged_env?(snapshot,environment) && available?(snapshot) && manual?(snapshot)
+    end
+
+    def tagged_env?(snapshot,environment)
+      arn = snapshot_arn(snapshot)
+      tags(arn)['Environment']  == environment
+    end
+
     def tagged_can_prune?(snapshot)
       arn = snapshot_arn(snapshot)
       tags(arn)['CanPrune']  == 'yes'
@@ -208,10 +221,8 @@ module Automan::RDS
     end
 
     def prunable_snapshots
-      AWS.memoize do
-        snapshots = get_all_snapshots
-        snapshots.select { |s| can_prune?(s) }
-      end
+      snapshots = get_all_snapshots
+      snapshots.select { |s| can_prune?(s) }
     end
 
     def oldest_prunable_snapshot
@@ -248,10 +259,20 @@ module Automan::RDS
 
     def latest
       log_options
-      db = find_db
-      logger.info "Finding most recent snapshot for #{db.id}"
-      s = db.snapshots.sort_by {|i| i.created_at }.last
+      logger.info "Finding most recent snapshot for #{environment}"
+
+      allsnaps=get_all_snapshots
+
+      envsnaps=[]
+      allsnaps.each do |onesnap|
+        if is_env?(onesnap,environment)
+          envsnaps.push(onesnap)
+        end
+      end
+
+      s=envsnaps.sort_by {|i| i.created_at }.last
       logger.info "Most recent snapshot is #{s.id}"
+      s.id
     end
   end
 end

data/lib/automan/s3/downloader.rb

@@ -9,7 +9,7 @@ module Automan::S3
     def download
       log_options
 
-      logger.info "uploading #{localfile} to #{s3file}"
+      logger.info "downloading #{s3file} to #{localfile}"
 
       bucket, key = parse_s3_path s3file
 
@@ -18,7 +18,16 @@ module Automan::S3
           file.write(chunk)
         end
       end
+    end
+
+    def read
+      log_options
+
+      logger.info "returning contents of #{s3file} as string"
+
+      bucket, key = parse_s3_path s3file
 
+      s3.buckets[bucket].objects[key].read
     end
 
   end

data/lib/automan/version.rb

@@ -1,3 +1,3 @@
 module Automan
-  VERSION = "2.3.6"
+  VERSION = "2.3.7"
 end

data/lib/automan.rb

@@ -19,6 +19,7 @@ require 'automan/cloudformation/terminator'
 require 'automan/cloudformation/replacer'
 require 'automan/cloudformation/uploader'
 require 'automan/cloudformation/errors'
+require 'automan/elasticache/router'
 require 'automan/rds/snapshot'
 require 'automan/rds/errors'
 require 'automan/ec2/instance'

data/spec/beanstalk/application_spec.rb

@@ -1,12 +1,12 @@
 require "automan"
 
 describe Automan::Beanstalk::Application do
-  it { should respond_to :name }
-  it { should respond_to :create }
-  it { should respond_to :delete }
+  it { is_expected.to respond_to :name }
+  it { is_expected.to respond_to :create }
+  it { is_expected.to respond_to :delete }
 
   describe '#create' do
-    subject(:a) do
+    subject() do
       AWS.stub!
       a = Automan::Beanstalk::Application.new
       a.logger = Logger.new('/dev/null')
@@ -14,20 +14,20 @@ describe Automan::Beanstalk::Application do
     end
 
     it "does not create if the application already exists" do
-      a.stub(:application_exists?).and_return(true)
-      a.should_not_receive(:create_application)
-      a.create
+      allow(subject).to receive(:application_exists?).and_return(true)
+      expect(subject).to_not receive(:create_application)
+      subject.create
     end
 
     it "does create if the application doesn't exist" do
-      a.stub(:application_exists?).and_return(false)
-      a.should_receive(:create_application)
-      a.create
+      allow(subject).to receive(:application_exists?).and_return(false)
+      expect(subject).to receive(:create_application)
+      subject.create
     end
   end
 
   describe '#delete' do
-    subject(:a) do
+    subject() do
       AWS.stub!
       a = Automan::Beanstalk::Application.new
       a.logger = Logger.new('/dev/null')
@@ -35,15 +35,15 @@ describe Automan::Beanstalk::Application do
     end
 
     it "does delete if the application already exists" do
-      a.stub(:application_exists?).and_return(true)
-      a.should_receive(:delete_application)
-      a.delete
+      allow(subject).to receive(:application_exists?).and_return(true)
+      expect(subject).to receive(:delete_application)
+      subject.delete
     end
 
     it "does not delete if the application doesn't exist" do
-      a.stub(:application_exists?).and_return(false)
-      a.should_not_receive(:delete_application)
-      a.delete
+      allow(subject).to receive(:application_exists?).and_return(false)
+      expect(subject).to_not receive(:delete_application)
+      subject.delete
     end
   end
 end