Merge branch 'master' into mri2.5.0

Author: pmzara

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,6 @@
+*Issue #, if available:*
+
+*Description of changes:*
+
+
+By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

.gitignore

@@ -8,3 +8,5 @@ RemoteSystemsTempFiles/
 codedeploy-local.log*
 codedeploy-local.*.log
 deployment/
+.idea/
+.DS_STORE

CODE_OF_CONDUCT.md

@@ -0,0 +1,4 @@
+## Code of Conduct
+This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct). 
+For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact 
+[email protected] with any additional questions or comments.

CONTRIBUTING.md

@@ -0,0 +1,61 @@
+# Contributing Guidelines
+
+Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional 
+documentation, we greatly value feedback and contributions from our community.
+
+Please read through this document before submitting any issues or pull requests to ensure we have all the necessary 
+information to effectively respond to your bug report or contribution.
+
+
+## Reporting Bugs/Feature Requests
+
+We welcome you to use the GitHub issue tracker to report bugs or suggest features.
+
+When filing an issue, please check [existing open](https://github.com/aws/aws-codedeploy-agent/issues), or [recently closed](https://github.com/aws/aws-codedeploy-agent/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already 
+reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
+
+* A reproducible test case or series of steps
+* The version of our code being used
+* Any modifications you've made relevant to the bug
+* Anything unusual about your environment or deployment
+
+
+## Contributing via Pull Requests
+Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
+
+1. You are working against the latest source on the *master* branch.
+2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
+3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
+
+To send us a pull request, please:
+
+1. Fork the repository.
+2. Modify the source; please focus on the specific change you are contributing. If you also reformat all the code, it will be hard for us to focus on your change.
+3. Ensure local tests pass.
+4. Commit to your fork using clear commit messages.
+5. Send us a pull request, answering any default questions in the pull request interface.
+6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
+
+GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and 
+[creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
+
+
+## Finding contributions to work on
+Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels ((enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/aws/aws-codedeploy-agent/labels/help%20wanted) issues is a great place to start. 
+
+
+## Code of Conduct
+This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct). 
+For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact 
+[email protected] with any additional questions or comments.
+
+
+## Security issue notifications
+If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue.
+
+
+## Licensing
+
+See the [LICENSE](https://github.com/aws/aws-codedeploy-agent/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
+
+We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.

README.md

@@ -37,7 +37,17 @@ The integration test creates the following
 It terminates the test ec2 instance and deletes the CodeDeploy application at the end of each test run.
 It also terminates any test ec2 instances before starting up the test.
 
-Create your default aws credentials file in the default location (~/.aws/credentials on linux/mac and %USERPROFILE%.awscredentials on windows). Add your AWS access key, secret key, and optionally your session token there. The access key should have permission to create the above mentioned resources. You can also change the default region. To run the integration test execute
+Create your default aws credentials file in the default location (~/.aws/credentials on linux/mac and %USERPROFILE%.awscredentials on windows). Add your AWS access key, secret key, and optionally your session token there. The access key should have permission to create the above mentioned resources. You can also change the default region. Note that temporary credentials won't work. 
+
+Sample format of the credentials file:
+
+```
+[default]
+aws_access_key_id=<keyID>
+aws_secret_access_key=<key>
+```
+
+To run the integration test execute:
 
 ```
 rake test-integration

bin/codedeploy-agent

@@ -2,7 +2,7 @@
 
 $:.unshift File.join(File.dirname(File.expand_path('..', __FILE__)), 'lib')
 
-ruby_versions = ["2.4", "2.3", "2.2", "2.1", "2.0"]
+ruby_versions = ["2.5", "2.4", "2.3", "2.2", "2.1", "2.0"]
 actual_ruby_version = RUBY_VERSION.split('.').map{|s|s.to_i}
 left_bound = '2.0.0'.split('.').map{|s|s.to_i}
 ruby_bin = nil

bin/codedeploy-local

@@ -50,6 +50,8 @@ Synopsis
   [--type <value>]
   [--file-exists-behavior <value>]
   [--deployment-group <value>]
+  [--deployment-group-name <value>]
+  [--application-name <value>]
   [--events <value>]
   [--agent-configuration-file <value>]
 
@@ -69,6 +71,12 @@ Options
   The path to the folder that is the target location for the content to be deployed. If you do not specify a folder, the tool creates one named default-local-deployment-group inside your deployment root directory. For each local deployment you create, the tool creates a subdirectory inside this folder with names like d-98761234-local. Your configuration shows it would be placed in #{InstanceAgent::Config.config[:root_dir]}/<deployment-group>. You can use the :root_dir: variable in an agent configuration file to configure a custom deployment root folder. If you want to deploy to a location previously deployed to by AWS CodeDeploy, you must specify its deployment group ID, which you can look up by using the AWS CLI. [default: #{AWS::CodeDeploy::Local::Deployer::DEFAULT_DEPLOYMENT_GROUP_ID}].
   See also: "get-deployment-group” in the AWS CLI Reference for AWS CodeDeploy.
 
+  -d, --deployment-group-name <value>
+  Indicates the deployment group name to be used during the CodeDeploy hook execution, can be accessed on the DEPLOYMENT_GROUP_NAME environment variable. If you do not specify a name, "LocalFleet" will be used.
+
+  -a, --application-name <value>
+  Indicates the application name to be used during the CodeDeploy hook execution, can be accessed on the APPLICATION_NAME environment variable. If you do not specify a name, the "bundle-location" will be used.
+
   -e, --events <comma-separated-values>
   A set of lifecycle event hooks you want to run, in order, instead of the events listed in the AppSpec file. Multiple hook names must be separated by commas. If you don't specify DownloadBundle and Install events in the --events list, they will run before all the event hooks you do specify. If you include DownloadBundle and Install in the --events list, they can be preceded only by events that normally run before them in AWS CodeDeploy deployments.
 

bin/install

@@ -243,15 +243,24 @@ EOF
     uri = get_s3_uri(region, bucket, key)
 
     # stream package file to disk
+    retries ||= 0
+    exceptions = [OpenURI::HTTPError, OpenSSL::SSL::SSLError]
     begin
       uri.open(:ssl_verify_mode => OpenSSL::SSL::VERIFY_PEER, :redirect => true, :read_timeout => 120, :proxy => @http_proxy) do |s3|
-        package_file.write(s3.read)
+         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}'")
+      if (retries < 5)
+        sleep 2 ** retries
+        retries += 1
+        retry
+      else
+        @log.error("Could not download CodeDeploy Agent Package. Exiting Install script.")
+        exit(1)
       end
-    rescue OpenURI::HTTPError => e
-      @log.error("Could not find package to download at '#{uri.to_s}'")
-      exit(1)
     end
-  end
+end
 
   def get_version_file_from_s3(region, bucket, key)
     @log.info("Downloading version file from bucket #{bucket} and key #{key}...")

buildspec-agent-rake.yml

@@ -0,0 +1,25 @@
+version: 0.2
+
+phases:
+  install:
+    commands:
+      - echo Installing bundler
+      - gem install bundler
+      - echo Using bundler to install remaining gems
+      - bundle install
+  pre_build:
+    commands:
+      - echo Build started on `date`
+      - echo Running rake  - unit tests
+      - rake
+  build:
+    commands:
+      - echo Build completed on `date`
+      - echo Running rake test-integration - integ tests
+      - rake test-integration
+  post_build:
+    commands:
+      - echo $CODEBUILD_SOURCE_VERSION > codebuild_source_commit_id
+artifacts:
+  files:
+    - codebuild_source_commit_id

codedeploy_agent-1.1.0.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency('aws-sdk-core', '~> 2.9')
   spec.add_dependency('simple_pid', '~> 0.2.1')
   spec.add_dependency('docopt', '~> 0.5.0')
+  spec.add_dependency('concurrent-ruby', '~> 1.0.5')
 
   spec.add_development_dependency('rake', '~> 10.0')
   spec.add_development_dependency('rspec', '~> 3.2.0')