Merge pull request #361 from aws/1.6.0

1.6.0

Author: t0shiii

.github/workflows/ruby.yml

@@ -9,16 +9,16 @@ name: Ruby
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7']
+        ruby-version: ['2.7']
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
@@ -28,7 +28,3 @@ jobs:
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: Run tests
       run: bundle exec rake
-    - name: Coveralls
-      uses: coverallsapp/github-action@master
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}

.ruby-version

@@ -7,6 +7,7 @@ source 'http://rubygems.org'
 gemspec
 gem "process_manager", "0.0.13", :path => "#{File.expand_path(__FILE__)}/../vendor/gems/process_manager-0.0.13"
 gem "codedeploy-commands", "1.0.0", :path => "#{File.expand_path(__FILE__)}/../vendor/gems/codedeploy-commands-1.0.0"
+gem "simple_pid", "0.2.1", :path => "#{File.expand_path(__FILE__)}/../vendor/gems/simple_pid-0.2.1"
 
 group :test do
   gem 'test-unit'

Gemfile

@@ -11,14 +11,15 @@ Rake::TestTask.new(:test) do |t|
   t.libs << ['test', 'lib', 'test/helpers']
 
   test_files = FileList.new("test/**/*_test.rb")
+  test_files.exclude("test/instance_agent/plugins/windows/*_test.rb")
   t.test_files = test_files
   t.verbose = true
 end
 task :default => [:version_tracking, :test]
 task :release => [:version_tracking, :test]
 
 desc "Run unit tests in spec/"
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new({:exclude_pattern =>'spec/aws/codedeploy/local/deployer_spec.rb'})
 task :test => :spec
 
 begin

Rakefile

@@ -2,7 +2,7 @@
 
 $:.unshift File.join(File.dirname(File.expand_path('..', __FILE__)), 'lib')
 
-ruby_versions = ["3.0", "2.7", "2.6", "2.5", "2.4", "2.3", "2.2", "2.1", "2.0"]
+ruby_versions = ["3.2", "3.1", "3.0", "2.7", "2.6", "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-agent

@@ -131,7 +131,7 @@ begin
 rescue Docopt::Exit => e
   puts e.message
   exit(false)
-rescue AWS::CodeDeploy::Local::CLIValidator::ValidationError,InstanceMetadata::InstanceMetadataError,SystemCallError,ArgumentError => e
+rescue AWS::CodeDeploy::Local::CLIValidator::ValidationError,SystemCallError,ArgumentError => e
   puts "ERROR: #{e.message}"
   exit(false)
 rescue Aws::Errors::MissingCredentialsError => e

bin/codedeploy-local

@@ -5,31 +5,39 @@
 # than 2.0. Testing on multiple Ruby versions is required for
 # changes to this part of the code.
 ##################################################################
-class Proxy
-  instance_methods.each do |m|
-    undef_method m unless m =~ /(^__|^send$|^object_id$)/
+
+class LoggerWrapper
+  def initialize(loggers)
+    @loggers = loggers
   end
 
-  def initialize(*targets)
-    @targets = targets
+  def debug(message)
+    @loggers.each do |logger|
+      logger.debug(message)
+    end
   end
 
-  def path
-    @targets.map do |target|
-      if target.respond_to?(:path)
-        target.__send__(:path)
-      else
-        # default to to_s since it's just used as a label for log statements.
-        target.__send__(:to_s)
-      end
+  def error(message)
+    @loggers.each do |logger|
+      logger.error(message)
     end
   end
 
-  protected
+  def info(message)
+    @loggers.each do |logger|
+      logger.info(message)
+    end
+  end
 
-  def method_missing(name, *args, &block)
-    @targets.map do |target|
-      target.__send__(name, *args, &block)
+  def level(message)
+    @loggers.each do |logger|
+      logger.level = message
+    end
+  end
+
+  def warn(message)
+    @loggers.each do |logger|
+      logger.warn(message)
     end
   end
 end
@@ -40,17 +48,17 @@ require 'logger'
 
 if($stdout.isatty)
   # if we are being run in a terminal, log to stdout and the log file.
-  @log = Logger.new(Proxy.new(File.open(log_file_path, 'a+'), $stdout))
+  @log = LoggerWrapper.new([Logger.new(log_file_path), Logger.new($stdout)])
+  @log.level(Logger::INFO)
 else
   # keep at most 2MB of old logs rotating out 1MB at a time
   @log = Logger.new(log_file_path, 2, 1048576)
+  @log.level = Logger::INFO
   # make sure anything coming out of ruby ends up in the log file
   $stdout.reopen(log_file_path, 'a+')
   $stderr.reopen(log_file_path, 'a+')
 end
 
-@log.level = Logger::INFO
-
 require 'net/http'
 
 # This class is copied (almost directly) from lib/instance_metadata.rb
@@ -128,7 +136,7 @@ class IMDS
     Net::HTTP.start(IP_ADDRESS, 80, :read_timeout => 10, :open_timeout => 10) do |http|
       response = http.request(request)
       if block_given?
-        yield(response) 
+        yield(response)
       elsif response.kind_of? Net::HTTPSuccess
         response.body
       else
@@ -153,7 +161,7 @@ class IMDS
 end
 
 class S3Bucket
-  # Split out as older versions of ruby dont like multi entry attr 
+  # Split out as older versions of ruby dont like multi entry attr
   attr :domain
   attr :region
   attr :bucket
@@ -203,8 +211,8 @@ to check for a running agent.
 To use a HTTP proxy, specify --proxy followed by the proxy server
 defined by http://hostname:port
 
-This install script needs Ruby version 2.x installed as a prerequisite.
-Currently recommended Ruby versions are 2.0.0, 2.1.8, 2.2.4, 2.3, 2.4, 2.5, 2.6 and 2.7.
+This install script needs Ruby versions 2.x or 3.x installed as a prerequisite.
+Currently recommended Ruby versions are 2.0.0, 2.1.8, 2.2.4, 2.3, 2.4, 2.5, 2.6, 2.7, 3.0, 3.1, and 3.2
 If multiple Ruby versions are installed, the default ruby version will be used.
 If the default ruby version does not satisfy requirement, the newest version will be used.
 If you do not have a supported Ruby version installed, please install one of them first.
@@ -213,7 +221,7 @@ EOF
   end
 
   def supported_ruby_versions
-    ['3.0', '2.7', '2.6', '2.5', '2.4', '2.3', '2.2', '2.1', '2.0']
+    ['3.2','3.1','3.0', '2.7', '2.6', '2.5', '2.4', '2.3', '2.2', '2.1', '2.0']
   end
 
   # check ruby version, only version 2.x 3.x works
@@ -231,8 +239,8 @@ EOF
       if(File.exist?("/usr/bin/ruby#{version}"))
         return "/usr/bin/ruby#{version}"
       elsif (File.symlink?("/usr/bin/ruby#{version}"))
-          @log.error("The symlink /usr/bin/ruby#{version} exists, but it's linked to a non-existent directory or non-executable file.")
-          exit(1)
+        @log.error("The symlink /usr/bin/ruby#{version} exists, but it's linked to a non-existent directory or non-executable file.")
+        exit(1)
       end
     end
 
@@ -299,10 +307,10 @@ EOF
     # change interpreter when symlink /usr/bin/ruby2.x exists, but running with non-supported ruby version
     actual_ruby_version = RUBY_VERSION.split('.').map{|s|s.to_i}
     left_bound = '2.0.0'.split('.').map{|s|s.to_i}
-    right_bound = '3.0.0'.split('.').map{|s|s.to_i}
+    right_bound = '3.2.1'.split('.').map{|s|s.to_i}
     if (actual_ruby_version <=> left_bound) < 0
       if(!@reexeced)
-        @log.info("The current Ruby version is not 2.x or 3.0.x! Restarting the installer with #{ruby_interpreter_path}")
+        @log.info("The current Ruby version is not 2.x or 3.x! Restarting the installer with #{ruby_interpreter_path}")
         exec("#{ruby_interpreter_path}", __FILE__, '--re-execed' , *@args)
       else
         unsupported_ruby_version_error
@@ -393,7 +401,7 @@ EOF
     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.warn("Could not find package to download at '#{uri.to_s}' - Retrying... Attempt: '#{retries.to_s}'")
@@ -406,7 +414,7 @@ EOF
         exit(1)
       end
     end
-end
+  end
 
   def get_version_file_from_s3(s3_bucket, key)
     @log.info("Downloading version file from bucket #{s3_bucket.bucket} and key #{key}...")

bin/install

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'aws_codedeploy_agent'
-  spec.version       = '1.5.0'
+  spec.version       = '1.6.0'
   spec.summary       = 'Packages AWS CodeDeploy agent libraries'
   spec.description   = 'AWS CodeDeploy agent is responsible for doing the actual work of deploying software on an individual EC2 instance'
   spec.author        = 'Amazon Web Services'
@@ -9,16 +9,15 @@ Gem::Specification.new do |spec|
   spec.bindir        = ['bin']
   spec.require_paths = ['lib']
   spec.license        = 'Apache-2.0'
-  spec.required_ruby_version = '~> 2.0'
+  spec.required_ruby_version = '>= 2.7.0'
 
   spec.add_dependency('gli', '~> 2.5')
   spec.add_dependency('json_pure', '~> 1.6')
   spec.add_dependency('archive-tar-minitar', '~> 0.5.2')
   spec.add_dependency('rubyzip', '~> 1.3.0')
-  spec.add_dependency('logging', '~> 1.8')
+  spec.add_dependency('logging', '~> 2.2')
   spec.add_dependency('aws-sdk-core', '~> 3')
   spec.add_dependency('aws-sdk-s3', '~> 1')
-  spec.add_dependency('simple_pid', '~> 0.2.1')
   spec.add_dependency('docopt', '~> 0.5.0')
   spec.add_dependency('concurrent-ruby', '~> 1.1.9')
 

codedeploy_agent.gemspec

@@ -27,7 +27,7 @@ def validate(args)
             raise ValidationError.new("location #{location} cannot be http, only encrypted (https) url endpoints supported")
           end
 
-          if (uri.scheme != 'https' && uri.scheme != 's3' && !File.exists?(location))
+          if (uri.scheme != 'https' && uri.scheme != 's3' && !File.exist?(location))
               raise ValidationError.new("location #{location} is specified as a file or directory which does not exist")
           end
 
@@ -41,10 +41,10 @@ def validate(args)
 
           if (type == 'directory' && (uri.scheme != 'https' && uri.scheme != 's3' && File.directory?(location)))
             appspec_filename = args['--appspec-filename']
-            if !appspec_filename.nil? && !File.exists?("#{location}/#{appspec_filename}")
+            if !appspec_filename.nil? && !File.exist?("#{location}/#{appspec_filename}")
               raise ValidationError.new("Expecting appspec file at location #{location}/#{appspec_filename} but it is not found there. Please either run the CLI from within a directory containing the #{appspec_filename} file or specify a bundle location containing an #{appspec_filename} file in its root directory")
             end
-            if appspec_filename.nil? && !File.exists?("#{location}/appspec.yml") && !File.exists?("#{location}/appspec.yaml")
+            if appspec_filename.nil? && !File.exist?("#{location}/appspec.yml") && !File.exist?("#{location}/appspec.yaml")
               raise ValidationError.new("Expecting appspec file at location #{location}/appspec.yml or #{location}/appspec.yaml but it is not found there. Please either run the CLI from within a directory containing the appspec.yml or appspec.yaml file or specify a bundle location containing an appspec.yml or appspec.yaml file in its root directory")
             end
           end

lib/aws/codedeploy/local/cli_validator.rb

@@ -8,7 +8,7 @@ class InstanceAgent::DeploymentLog
 
   def initialize
     deployment_logs_dir = File.join(InstanceAgent::Config.config[:root_dir], 'deployment-logs')
-    FileUtils.mkdir_p(deployment_logs_dir) unless File.exists? deployment_logs_dir
+    FileUtils.mkdir_p(deployment_logs_dir) unless File.exist? deployment_logs_dir
     @deployment_log ||= Logger.new(File.join(deployment_logs_dir, "#{InstanceAgent::Config.config[:program_name]}-deployments.log"), 8, 64 * 1024 * 1024)
     @deployment_log.formatter = proc do |severity, datetime, progname, msg|
       "[#{datetime.strftime('%Y-%m-%d %H:%M:%S.%L')}] #{msg}\n"