Merge branch 'master' into master

Author: Eric Hayes

.gitignore

@@ -3,3 +3,8 @@ Gemfile.lock
 deployment/
 coverage/
 .version
+.metadata/
+RemoteSystemsTempFiles/
+codedeploy-local.log*
+codedeploy-local.*.log
+deployment/

.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.3.0
 after_success: coveralls
 notifications:
   email:

README.md

@@ -30,8 +30,8 @@ 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.
 
-Update the features/AwsCredentials.yml file with AWS access key and secret key. The access key should have permission to create the above mentioned resources. You can also change the default region and ami id if you want. To run the integration test execute
-  
+Update the features/AwsCredentials.yml file with AWS access key, secret key, and optionally your session token. The access key should have permission to create the above mentioned resources. You can also change the default region and ami id if you want. To run the integration test execute
+
 ```
 rake test-integration
 ```

Rakefile

@@ -1,5 +1,6 @@
 require 'rake'
 require 'rake/testtask'
+require 'rspec/core/rake_task'
 require 'rubygems'
 
 # Run all units tests in test/
@@ -14,6 +15,10 @@ end
 task :default => [:version_tracking, :test]
 task :release => [:version_tracking, :test]
 
+desc "Run unit tests in spec/"
+RSpec::Core::RakeTask.new(:spec)
+task :test => :spec
+
 begin
   require 'cucumber'
   require 'cucumber/rake/task'
@@ -41,7 +46,7 @@ def getAgentTrackingInfo
   begin
     commit_id = `git rev-parse HEAD`.chop!
     tracking = "COMMIT_#{commit_id}"
-  rescue 
+  rescue
     tracking = "UNKNOWN_VERSION"
   end
 end

bin/codedeploy-agent

@@ -1,88 +1,27 @@
-# 1.9 adds realpath to resolve symlinks; 1.8 doesn't
-# have this method, so we add it so we get resolved symlinks
-# and compatibility
-unless File.respond_to? :realpath
-  class File #:nodoc:
-    def self.realpath path
-      return realpath(File.readlink(path)) if symlink?(path)
-      path
-    end
-  end
-end
-
-# Set the environment variables for ruby libs and vendor provided gems
-# This is required so that the agent can run without requiring an init script
-# if installed as a gem
-
-agent_dir = File.join(File.dirname(__FILE__), "..")
-$:.unshift "#{agent_dir}/lib"
-
-require 'instance_agent'
-require 'gli'
+#!/usr/bin/env ruby
 
-include GLI::App
+$:.unshift File.join(File.dirname(File.expand_path('..', __FILE__)), 'lib')
 
-program_desc 'AWS CodeDeploy Agent'
+ruby_versions = ["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
 
-conf_default_dir = "/etc/codedeploy-agent/conf/codedeployagent.yml"
-conf_repo_dir = "#{agent_dir}/conf/codedeployagent.yml"
-desc 'Path to agent config file'
-if File.file?(conf_default_dir)
-  default_value conf_default_dir
+if (actual_ruby_version <=> left_bound) > -1
+  ruby_bin = "ruby"
 else
-  default_value conf_repo_dir
-end
-arg_name "conf_dir"
-flag [:config_file,:config_file]
-
-desc 'start the AWS CodeDeploy agent'
-command :start do |c|
-  c.action do |global_options,options,args|
-    InstanceAgent::Runner::Master.start
-  end
-end
-
-desc 'stop the AWS CodeDeploy agent'
-command :stop do |c|
-  c.action do |global_options,options,args|
-    InstanceAgent::Runner::Master.stop
-    if pid = InstanceAgent::Runner::Master.status
-      raise 'AWS CodeDeploy agent is still running'
+  ruby_versions.each do |i|
+    ruby_dir = "/usr/bin/ruby#{i}"
+    if File.file?(ruby_dir)
+      ruby_bin = ruby_dir
+      break
     end
   end
 end
 
-desc 'restart the AWS CodeDeploy agent'
-command :restart do |c|
-  c.action do |global_options,options,args|
-    InstanceAgent::Runner::Master.restart
-  end
-end
-
-desc 'Report running status of the AWS CodeDeploy agent'
-command :status do |c|
-  c.action do |global_options,options,args|
-    if pid = InstanceAgent::Runner::Master.status
-      puts "The AWS CodeDeploy agent is running as PID #{pid}"
-    else
-      raise 'No AWS CodeDeploy agent running'
-    end
-  end
-end
-
-pre do |global,command,options,args|
-  InstanceAgent::Config.config.keys.each do |config_key|
-    InstanceAgent::Config.config(config_key => global[config_key]) if global[config_key].present?
-  end
-
-  InstanceAgent::Platform.util = InstanceAgent::LinuxUtil
-
-  InstanceAgent::Config.load_config
-  true
-end
-
-on_error do |exception|
-  true
+if ruby_bin
+  exec("#{ruby_bin} #{File.join(File.expand_path(File.dirname(__FILE__)), "../lib/codedeploy-agent.rb")} #{ARGV.join(' ')}")
 end
 
-exit run(ARGV)
+STDERR.puts "No supported ruby version found. Code Deploy Host Agent supports Ruby version 2.0.x and greater."
+exit(1)

bin/codedeploy-agent-wrapper

@@ -0,0 +1,70 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(File.expand_path('..', __FILE__)), 'lib')
+require 'docopt'
+
+require 'aws/codedeploy/local/deployer'
+
+# Initialize the deployer first to initialize the configuration values so they can be used as part of the help message
+begin
+  AWS::CodeDeploy::Local::Deployer.new
+rescue
+  # If we fail to initialize all the configuration values correctly just grab the default location for the config for the help message
+  InstanceAgent::Config.config[:root_dir] = AWS::CodeDeploy::Local::Deployer::CONF_DEFAULT_LOCATION
+end
+
+doc = <<DOCOPT
+CodeDeploy Local Deployments.
+
+Usage:
+  #{__FILE__} [--bundle-location <location>] [--type <type>] [--application-folder <application-folder>|--deployment-group-id <deployment-group-id>] [--configuration-file <configuration-file>] [--event <event>]...
+  #{__FILE__} -h | --help
+  #{__FILE__} -v | --version
+
+Options:
+  -l, --bundle-location <location>                 Optional Bundle Location. The prefix and suffix determine whether this location is locally accessible or online (s3 or github). Defaults to current directory [default: #{Dir.pwd}]
+  -t, --type <type>                                Optional Bundle type choice from tgz, tar, zip, or directory [default: directory]
+  -g, --application-folder <application-folder>    Optional application folder specifies the folder in which the local deployments will be executed [default: #{AWS::CodeDeploy::Local::Deployer::DEFAULT_DEPLOYMENT_GROUP_ID}]. Your configuration shows it would be placed in #{InstanceAgent::Config.config[:root_dir]}/<application-folder>. To configure a custom deployment-root folder see https://docs.aws.amazon.com/codedeploy/latest/userguide/reference-agent-configuration.html. If you want to target a previously deployed revision make sure to use the correct deployment group id by looking it up using the AWS CLI: https://docs.aws.amazon.com/cli/latest/reference/deploy/get-deployment-group.html
+  -g, --deployment-group-id <deployment-group-id>  Optional Deployment Group Id - an alternative to application-folder. The application-folder used during a CodeDeploy deployment is the deployment group's id. Only one can be specified.
+  -e, --event <event>                              Optional set of override lifecycle events to run. Any number of lifecycle events can be provided one after another (order matters). If none specificed runs only default events found in the Appspec file using CodeDeploy's ordering. Please note if you don't specify DownloadBundle and Install events they will always precede all your custom events. Those events extract your local bundle / download it as well as install the revision in the correct location. The only events that can run before them are the ones that do so today. See https://docs.aws.amazon.com/codedeploy/latest/userguide/reference-appspec-file-structure-hooks.html
+  -c, --configuration-file <configuration-file>    Optional agent configuration file location which is by default set to /etc/codedeploy-agent/conf/codedeployagent.yml for linux hosts and C:/ProgramData/Amazon/CodeDeploy/conf.yml for Windows. See https://docs.aws.amazon.com/codedeploy/latest/userguide/reference-agent-configuration.html
+  -h, --help                                       Show this message.
+  -v, --version                                    Show version.
+
+Examples:
+  #{__FILE__}
+  #{__FILE__} --bundle-location /path/to/local/bundle/dir
+  #{__FILE__} --bundle-location s3://mybucket/bundle.tgz --type tgz
+  #{__FILE__} --bundle-location /path/to/local/bundle.tgz --type tgz --application-folder local-deployments
+  #{__FILE__} --bundle-location /path/to/local/bundle.zip --type zip --deployment-group-id 217ba5c8-5dd1-4774-89c6-30b107ac5dca
+  #{__FILE__} --bundle-location s3://mybucket/bundle.zip?versionId=1234&etag=47e8 --type tgz
+  #{__FILE__} --bundle-location https://api.github.com/repos/awslabs/aws-codedeploy-sample-tomcat/zipball/master --type zip
+  #{__FILE__} --bundle-location /path/to/local/bundle.tgz --type tgz -e ApplicationStop -e DownloadBundle -e Install -e ApplicationStart -e HealthCheck -e CustomHook
+
+  Stop Previously Deployed Application:
+    #{__FILE__} --bundle-location s3://mybucket/bundle.tgz --type tgz --deployment-group-id 217ba5c8-5dd1-4774-89c6-30b107ac5dca -e ApplicationStop
+    #{__FILE__} --bundle-location /path/to/local/bundle.zip --type zip --deployment-group-id 217ba5c8-5dd1-4774-89c6-30b107ac5dca -e ApplicationStop
+
+Specifying AWS Credentials:
+  #{__FILE__} allows you to provide your aws access key, secret key, and region in multiple ways. It uses the AWS SDK.
+  This means that if you're using an ec2 host with proper roles configured for the host with proper permissions you don't need to do anything else
+  to give permission for this host to download your bundle from S3. See https://docs.aws.amazon.com/codedeploy/latest/userguide/getting-started-create-iam-instance-profile.html
+  The AWS SDK also provides a few other ways to provide credentials. See https://docs.aws.amazon.com/sdkforruby/api/index.html
+
+DOCOPT
+
+begin
+  args = Docopt::docopt(doc, version: '1.0')
+  AWS::CodeDeploy::Local::Deployer.new(args['--configuration-file']).execute_events(args)
+rescue Docopt::Exit => e
+  puts e.message
+  exit(false)
+rescue AWS::CodeDeploy::Local::CLIValidator::ValidationError,InstanceAgent::Plugins::CodeDeployPlugin::ScriptError,InstanceMetadata::InstanceMetadataError,SystemCallError => e
+  puts "ERROR: #{e.message}"
+  exit(false)
+rescue Aws::Errors::MissingCredentialsError => e
+  puts "ERROR: Unable to download from S3 without AWS Credentials set. Please see help message for how to set AWS Credentials (#{__FILE__} --help)"
+  exit(false)
+end
+
+puts "Successfully deployed your bundle locally"

bin/codedeploy-local

@@ -230,6 +230,8 @@ EOF
   def get_s3_uri(region, bucket, key)
     if (region == 'us-east-1')
       URI.parse("https://#{bucket}.s3.amazonaws.com/#{key}")
+    elsif (region.split("-")[0] == 'cn')
+      URI.parse("https://#{bucket}.s3.#{region}.amazonaws.com.cn/#{key}")
     else
       URI.parse("https://#{bucket}.s3-#{region}.amazonaws.com/#{key}")
     end