Merge pull request #415 from aws/1.8.1

1.8.1

Author: splokhikh

certs/windows-ca-bundle.crt

@@ -3924,3 +3924,19 @@ ONFLAzkopR6RctR9q5czxNM+4Gm2KHmgCY0c0f9BckgG/Jou5yD5m6Leie2uPAmvylezkolwQOQv
 T8Jwg0DXJCxr5wkf09XHwQj02w47HAcLQxGEIYbpgNR12KvxAmLBsX5VYc8T1yaw15zLKYs4SgsO
 kI26oQ==
 -----END CERTIFICATE-----
+
+Sectigo Public Server Authentication Root E46
+=============================================
+-----BEGIN CERTIFICATE-----
+MIICOjCCAcGgAwIBAgIQQvLM2htpN0RfFf51KBC49DAKBggqhkjOPQQDAzBfMQswCQYDVQQGEwJH
+QjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQDEy1TZWN0aWdvIFB1YmxpYyBTZXJ2
+ZXIgQXV0aGVudGljYXRpb24gUm9vdCBFNDYwHhcNMjEwMzIyMDAwMDAwWhcNNDYwMzIxMjM1OTU5
+WjBfMQswCQYDVQQGEwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQDEy1TZWN0
+aWdvIFB1YmxpYyBTZXJ2ZXIgQXV0aGVudGljYXRpb24gUm9vdCBFNDYwdjAQBgcqhkjOPQIBBgUr
+gQQAIgNiAAR2+pmpbiDt+dd34wc7qNs9Xzjoq1WmVk/WSOrsfy2qw7LFeeyZYX8QeccCWvkEN/U0
+NSt3zn8gj1KjAIns1aeibVvjS5KToID1AZTc8GgHHs3u/iVStSBDHBv+6xnOQ6OjQjBAMB0GA1Ud
+DgQWBBTRItpMWfFLXyY4qp3W7usNw/upYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
+/zAKBggqhkjOPQQDAwNnADBkAjAn7qRaqCG76UeXlImldCBteU/IvZNeWBj7LRoAasm4PdCkT0RH
+lAFWovgzJQxC36oCMB3q4S6ILuH5px0CMk7yn2xVdOOurvulGu7t0vzCAxHrRVxgED1cf5kDW21U
+SAGKcw==
+-----END CERTIFICATE-----

codedeploy_agent.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'aws_codedeploy_agent'
-  spec.version       = '1.8.0'
+  spec.version       = '1.8.1'
   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'

lib/instance_agent/plugins/codedeploy/command_executor.rb

@@ -364,6 +364,9 @@ def s3_options
           options[:signature_version] = 'v4'
 
           region = ENV['AWS_REGION'] || InstanceMetadata.region
+          if region == "eusc-de-east-1"
+            options[:endpoint] = 'https://s3.eusc-de-east-1.amazonaws.eu'
+          end
           options[:region] = region
 
           if !InstanceAgent::Config.config[:s3_endpoint_override].to_s.empty?

test/instance_agent/plugins/codedeploy/codedeploy_control_test.rb

@@ -122,10 +122,20 @@ class CodeDeployControlTest < InstanceAgentTestCase
           assert_equal "codedeploy-commands.us-east-1.amazonaws.com", codedeploy_control_client.get_client.config.endpoint.host
         end
 
-        should "resolve non .com domains" do
+        should "resolve China (Beijing) domain" do
           codedeploy_control_client = CodeDeployControl.new :region => "cn-north-1"
           assert_equal "codedeploy-commands.cn-north-1.amazonaws.com.cn", codedeploy_control_client.get_client.config.endpoint.host
         end
+
+        should "resolve China (Ningxia) domain" do
+          codedeploy_control_client = CodeDeployControl.new :region => "cn-northwest-1"
+          assert_equal "codedeploy-commands.cn-northwest-1.amazonaws.com.cn", codedeploy_control_client.get_client.config.endpoint.host
+        end
+
+        should "resolve eu gov cloud domain" do
+          codedeploy_control_client = CodeDeployControl.new :region => "eusc-de-east-1"
+          assert_equal "codedeploy-commands.eusc-de-east-1.amazonaws.eu", codedeploy_control_client.get_client.config.endpoint.host
+        end
       end
 
       context "common config" do

test/instance_agent/plugins/codedeploy/command_executor_test.rb

@@ -501,7 +501,7 @@ def github_env_vars()
               assert_equal "https://example.override.endpoint.com", @command_executor.s3_options[:endpoint].to_s
             end
           end
-
+ 
           context "when no override endpoint provided and not using fips" do
             setup do
               InstanceAgent::Config.config[:s3_endpoint_override] = nil
@@ -523,6 +523,31 @@ def github_env_vars()
               assert_true @command_executor.s3_options.include? :endpoint
             end
           end
+
+          context "when region is EU GovCloud with instance metadata" do
+            setup do
+              InstanceAgent::Config.config[:s3_endpoint_override] = nil
+              InstanceAgent::Config.config[:use_fips_mode] = false
+              ENV['AWS_REGION'] = nil
+              InstanceMetadata.stubs(:region).returns('eusc-de-east-1')
+            end
+            should "use S3 EU GovCloud specific endpoint" do
+              assert_equal 'eusc-de-east-1', @command_executor.s3_options[:region]
+              assert_equal 'https://s3.eusc-de-east-1.amazonaws.eu', @command_executor.s3_options[:endpoint]
+            end
+          end
+
+          context "when region is EU GovCloud" do
+            setup do
+              InstanceAgent::Config.config[:s3_endpoint_override] = nil
+              InstanceAgent::Config.config[:use_fips_mode] = false
+              ENV['AWS_REGION'] = 'eusc-de-east-1'
+            end
+            should "use S3 EU GovCloud specific endpoint" do
+              assert_equal 'eusc-de-east-1', @command_executor.s3_options[:region]
+              assert_equal 'https://s3.eusc-de-east-1.amazonaws.eu', @command_executor.s3_options[:endpoint]
+            end
+          end
         end
 
         context "downloading bundle from S3" do

vendor/gems/codedeploy-commands-1.0.0/lib/aws/plugins/deploy_control_endpoint.rb

@@ -25,13 +25,13 @@ class DeployControlEndpoint < Seahorse::Client::Plugin
             if is_on_prem?
               partitions_region_pattern = File.read(File.join(File.dirname(__FILE__), 'partition-region-pattern.json'))
               partitions_region_pattern_hash = JSON.parse(partitions_region_pattern)
-              
+
               unless partitions_region_pattern_hash.include?(domain)
                 raise "Unknown domain: #{domain}"
               end
-              
+
               known_region_pattern = partitions_region_pattern_hash[domain]["regionRegex"]
-              
+
               unless region.match(known_region_pattern)
                 raise "Invalid region: #{region}"
               end
@@ -40,8 +40,13 @@ class DeployControlEndpoint < Seahorse::Client::Plugin
             ProcessManager::Log.info("Creating client url from IMDS region and domain")
           else
             region = cfg.region
-            domain = 'amazonaws.com'
-            domain += '.cn' if region.split("-")[0] == 'cn'
+            suffix = case
+                     when region == 'eusc-de-east-1' then 'eu' # Special region has special domain
+                     when region.split("-")[0] == 'cn' then 'com.cn'
+                     else 'com'
+                     end
+
+            domain = "amazonaws.#{suffix}"
 
             ProcessManager::Log.info("Creating client url from configurations")
           end

vendor/gems/codedeploy-commands-1.0.0/lib/aws/plugins/partition-region-pattern.json

@@ -3,7 +3,11 @@
         "regionRegex" : "^[0-9a-z-]{1,20}$"
     },
 
-    "amazonaws.com.cn": {   
+    "amazonaws.eu": {
+      "regionRegex" : "^[0-9a-z-]{1,20}$"
+    },
+
+   "amazonaws.com.cn": {
         "regionRegex" : "^cn\\-\\w+\\-\\d+$"
     }
 }