conan 0.4.10 → 0.4.11

data/lib/conan/cloud/aws/autoscale.rb

@@ -67,7 +67,7 @@ module AWS
           image_id = new_conf[:image_id]
         end
       else
-        image_id = create_ami_from_server(new_conf[:server_to_image], region)      
+        image_id = create_ami_from_server(new_conf[:server_to_image], region)
       end
 
       autoscale = Fog::AWS::AutoScaling.new(:region => region)
@@ -102,6 +102,54 @@ module AWS
       end
     end
 
+    def launch_test_instances
+      autoscale_config.each do |type, resources|
+         case type
+         when "launch-config"
+           resources.each do |name, conf|
+             start_test_server(name, conf)
+           end
+         end
+      end
+    end
+
+    def start_test_server(name, config = {})
+      new_conf = config.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+      region = new_conf[:region] || "us-east-1"
+
+      compute = Fog::Compute.new(:provider => :aws, :region => region)
+
+      autoscale = Fog::AWS::AutoScaling.new(:region => region)
+      asres = autoscale.describe_auto_scaling_groups({'AutoScalingGroupNames' => new_conf[:autoscale_groups]})
+      lcname = ""
+      #so aws APIs sometimes return a blank scaling group????? need to check if there is a LC
+      asres.body["DescribeAutoScalingGroupsResult"]["AutoScalingGroups"].each do |asgroup|
+        lcname = asgroup["LaunchConfigurationName"]
+        break if !lcname.nil? && lcname.length > 0
+      end
+
+      lcres = autoscale.describe_launch_configurations({'LaunchConfigurationNames' => [lcname]})
+      lc = lcres.body["DescribeLaunchConfigurationsResult"]["LaunchConfigurations"][0]
+
+      compute = Fog::Compute.new(:provider => :aws, :region => region)
+      server_params = {}
+      server_params[:groups] = lc["SecurityGroups"]
+      server_params[:key_name] = lc["KeyName"]
+      server_params[:image_id] = lc["ImageId"]
+      server_params[:monitoring] = false
+      server_params[:flavor_id] = lc["InstanceType"]
+      server_params[:root_device_type] = "ebs"
+      server_params[:availability_zone] = default_availability_zone(region)
+
+
+      puts "Creating test instance from image for launch configuration #{lcname}"
+      server = compute.servers.create(server_params)
+      server.wait_for { ready? }
+
+      puts "Created server #{server.dns_name} for testing. Please delete manually"
+
+    end
+
   end
 end
 

data/lib/conan/cloud/aws/provision.rb

@@ -162,7 +162,11 @@ module AWS
 
         rdssg_name = rds_name_tag(name)
 
-        rdssg = rds.security_groups.get(rdssg_name)
+        rdssg = begin
+                  rds.security_groups.get(rdssg_name)
+                rescue Excon::Errors::NotFound
+                  nil
+                end
 
         if rdssg.nil?
           puts "Creating RDS Security Group #{rdssg_name}"
@@ -239,7 +243,12 @@ module AWS
 
       elb_name = ec2_name_tag(name)
 
-      lb = elb.load_balancers.get(elb_name)
+      lb = begin
+             elb.load_balancers.get(elb_name)
+           rescue Excon::Errors::BadRequest, Excon::Errors::NotFound
+             nil
+           end
+
       if lb.nil?
         puts "Creating Elastic Load Balancer #{elb_name}"
       
@@ -365,7 +374,11 @@ module AWS
           params[:security_group_names] = [rds_name_tag('default')]
         end
 
-        server = rds.servers.get(params[:id])
+        server = begin
+                   rds.servers.get(params[:id])
+                 rescue Excon::Errors::NotFound
+                   nil
+                 end
 
         if server.nil?
           puts "Creating RDS Server #{params[:id]}"
@@ -401,7 +414,11 @@ module AWS
 
         cluster_name = ec2_name_tag(name) 
 
-        cl = elasticache.clusters.get(cluster_name)
+        cl = begin
+               elasticache.clusters.get(cluster_name)
+             rescue Excon::Errors::NotFound
+               nil
+             end
 
         unless cl
           puts "Creating ElastiCache cluster #{cluster_name}"

data/lib/conan/cloud/aws/utils.rb

@@ -52,7 +52,7 @@ module AWS
       case region
       when "us-east-1"
         #not using availability zone us-east-1a as it often fails
-        ["us-east-1b", "us-east-1c"]
+        ["us-east-1b", "us-east-1d"]
       when "us-west-1"
         ["us-west-1a", "us-west-1b", "us-west-1c"]
       when "eu-west-1"

data/lib/conan/cloud/tasks.rb

@@ -41,5 +41,10 @@ namespace :aws do
     AWS::Autoscale.new(stage, autoscale_config, application).update_autoscale
   end
 
+  desc "create a test instance from an autoscale image after a deployment"
+  task :test_autoscale do
+    autoscale_config = JSON.parse(File.read("config/autoscale.json"))[stage] || {}
+    AWS::Autoscale.new(stage, autoscale_config, application).launch_test_instances
+  end
 end
 

data/lib/conan/deployment.rb

@@ -31,13 +31,10 @@ module Conan
 
 
       def git_log(from, to)
-       begin  
-          run_locally("git log #{real_revision(from)}..#{real_revision(to)}")
-       rescue RuntimeError
-          #runtime error probably means there is no initial tag and no deploys have been done
-          return run_locally("git log #{real_revision(to)}")
-       end
-
+        run_locally "git log #{real_revision(from)}..#{real_revision(to)}"
+      rescue RuntimeError
+        # there is probably no initial tag or no deploys have been done
+        return run_locally("git log #{real_revision(to)}")
       end
 
       def real_revision(tag)

data/lib/conan/deployment/git.rb

@@ -6,6 +6,7 @@ namespace :git do
 
   before "git:tag_attempted_deploy", "git:deploy_commits"  unless deploy_via == :copy
   task :deploy_commits do
+    run_locally "git fetch origin --tags"
     logs = git_log("#{stage}.#{application}.last-successful-deploy", branch)
     puts "the following new commits for #{application} on #{stage} revision #{real_revision(branch)} will be deployed"
     puts logs

data/lib/conan/template/config/aws.json

@@ -44,7 +44,8 @@
     }, 
     "s3": { 
       "bucket-name": { 
-        "region": "us-east-1"
+        "region": "us-east-1",
+        "location_constraint": "us-east-1"
       }
    } 
   },

data/lib/conan/version.rb

@@ -1,3 +1,3 @@
 module Conan
-  VERSION = "0.4.10"
+  VERSION = "0.4.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conan
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,16 +10,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: capistrano
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,23 +27,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.1
-- !ruby/object:Gem::Dependency
-  name: capistrano
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement