Merge pull request #332 from aws/1.4.0-release

1.4.0 release

Author: mwjones-aws

Diff for: Rakefile

@@ -3,7 +3,7 @@ require 'rake/packagetask'
 require 'rake/testtask'
 require 'rspec/core/rake_task'
 require 'rubygems'
-require 'yaml'
+require 'cucumber'
 
 # Run all units tests in test/
 desc "Run unit tests in test/"

Diff for: bin/codedeploy-local

@@ -65,7 +65,8 @@ Options
   The format of the application revision bundle. Supported types include tgz, tar, zip, and directory. If you do not specify a type, the tool uses directory by default. If you specify --type, you must also specify --bundle-location. [default: directory]
 
   -b, --file-exists-behavior <value>
-  Indicates how files are handled that already exist in a deployment target location but weren't part of a previous successful deployment. Options include DISALLOW, OVERWRITE, RETAIN. [default: #{InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification::DEFAULT_FILE_EXISTS_BEHAVIOR}]. 
+  Indicates how files are handled that already exist in a deployment target location but weren't part of a previous successful deployment. Options include DISALLOW, OVERWRITE, RETAIN. [default: #{InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification::DEFAULT_FILE_EXISTS_BEHAVIOR}].
+  Note: this setting can be overriden during individual deployments using the appspec file, which takes precedence over this option setting during that deployment installation.
   See also: "create-deployment" in the AWS CLI Reference for AWS CodeDeploy.
 
   -g, --deployment-group <value>

Diff for: bin/install

@@ -397,7 +397,7 @@ EOF
          package_file.write(s3.read)
       end
     rescue *exceptions  => e
-      @log.error("Could not find package to download at '#{uri.to_s}' - Retrying... Attempt: '#{retries.to_s}'")
+      @log.warn("Could not find package to download at '#{uri.to_s}' - Retrying... Attempt: '#{retries.to_s}'")
       if (retries < 5)
         sleep 2 ** retries
         retries += 1
@@ -415,14 +415,23 @@ end
     uri = s3_bucket.object_uri(key)
     @log.info("Endpoint: #{uri}")
 
+    retries ||= 0
+    exceptions = [OpenURI::HTTPError, OpenSSL::SSL::SSLError, Errno::ETIMEDOUT]
     begin
       require 'json'
 
       version_string = uri.read(:ssl_verify_mode => OpenSSL::SSL::VERIFY_PEER, :redirect => true, :read_timeout => 120, :proxy => @http_proxy)
       JSON.parse(version_string)
-    rescue OpenURI::HTTPError => e
-      @log.error("Could not find version file to download at '#{uri.to_s}'")
-      exit(1)
+    rescue *exceptions => e
+      @log.warn("Could not find version file to download at '#{uri.to_s}' - Retrying... Attempt: '#{retries.to_s}'")
+      if (retries < 5)
+        sleep 2 ** retries
+        retries += 1
+        retry
+      else
+        @log.error("Could not download CodeDeploy Agent version file. Exiting Install script.")
+        exit(1)
+      end
     end
   end