Changes to get the host-agent working in BJS

Author: ambareesha

bin/install

@@ -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

lib/instance_agent/plugins/codedeploy/codedeploy_control.rb

@@ -92,7 +92,11 @@ def verify_cert
         # Do minimal cert pinning
         def verify_subject
           InstanceAgent::Log.debug("#{self.class.to_s}: Actual certificate subject is '#{@cert.subject.to_s}'")
-          @cert.subject.to_s == "/C=US/ST=Washington/L=Seattle/O=Amazon.com, Inc./CN=codedeploy-commands."+@region+".amazonaws.com"
+          if "cn" == @region.split("-")[0]
+            @cert.subject.to_s == "/C=CN/ST=Beijing/L=Beijing/O=Amazon Connect Technology Services (Beijing) Co., Ltd./CN=codedeploy-commands."+@region+".amazonaws.com.cn"
+          else
+            @cert.subject.to_s == "/C=US/ST=Washington/L=Seattle/O=Amazon.com, Inc./CN=codedeploy-commands."+@region+".amazonaws.com"
+          end
         end
 
       end

lib/instance_agent/plugins/codedeploy/deployment_specification.rb

@@ -135,7 +135,11 @@ def self.verify_pkcs7_signer_cert(cert)
           when 'beta', 'gamma'
             cert.subject.to_s == "/C=US/ST=Washington/L=Seattle/O=Amazon.com, Inc./CN=codedeploy-signer-integ.amazonaws.com"
           when 'prod'
-            cert.subject.to_s == "/C=US/ST=Washington/L=Seattle/O=Amazon.com, Inc./CN=codedeploy-signer-"+@@region+".amazonaws.com"
+            if (@@region.split("-")[0] == "cn")
+              cert.subject.to_s == "/C=CN/ST=Beijing/L=Beijing/O=Amazon Connect Technology Services (Beijing) Co., Ltd./CN=codedeploy-signer-"+@@region+".amazonaws.com.cn"
+            else
+              cert.subject.to_s == "/C=US/ST=Washington/L=Seattle/O=Amazon.com, Inc./CN=codedeploy-signer-"+@@region+".amazonaws.com"
+            end
           else
             raise "Unknown profile '#{Config.config()[:codedeploy_test_profile]}'"
           end

lib/instance_metadata.rb

@@ -8,8 +8,13 @@ class InstanceMetadata
   PORT = 80
 
   def self.host_identifier
+    country = region.split('-')[0]
     doc = JSON.parse(http_get('/latest/dynamic/instance-identity/document').strip)
-    "arn:aws:ec2:#{doc['region']}:#{doc['accountId']}:instance/#{doc['instanceId']}"
+    if "cn" == country
+        "arn:aws-cn:ec2:#{doc['region']}:#{doc['accountId']}:instance/#{doc['instanceId']}"
+    else
+        "arn:aws:ec2:#{doc['region']}:#{doc['accountId']}:instance/#{doc['instanceId']}"
+    end
   end
 
   def self.region

test/instance_metadata_test.rb

@@ -19,15 +19,18 @@ def self.should_check_status_code(&blk)
       @instance_document = JSON.dump({"accountId" => account_id, "region" => region, "instanceId" => instance_id})
       @http = mock()
       @response = mock()
+      @instance_doc_response = mock()
       @response.stubs(:code).returns("200")
-      @http.stubs(:get).returns(@response)
+      @instance_doc_response.stubs(:code).returns("200")
+      @http.stubs(:get).returns(@response, @instance_doc_response)
       Net::HTTP.stubs(:start).yields(@http)
     end
 
     context 'getting the host identifier' do
 
       setup do
-        @response.stubs(:body).returns(@instance_document)
+        @response.stubs(:body).returns("us-east-1a")
+        @instance_doc_response.stubs(:body).returns(@instance_document)
       end
 
       should 'connect to the right host' do
@@ -38,7 +41,7 @@ def self.should_check_status_code(&blk)
       should 'call the correct URL' do
         @http.expects(:get).
           with("/latest/dynamic/instance-identity/document").
-          returns(@response)
+          returns(@instance_doc_response)
         InstanceMetadata.host_identifier
       end
 
@@ -47,7 +50,7 @@ def self.should_check_status_code(&blk)
       end
 
       should 'strip whitesace in the body' do
-        @response.stubs(:body).returns(" \t#{@instance_document}   ")
+        @instance_doc_response.stubs(:body).returns(" \t#{@instance_document}   ")
         assert_equal(@host_identifier, InstanceMetadata.host_identifier)
       end
 

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

@@ -7,6 +7,9 @@ class DeployControlEndpoint < Seahorse::Client::Plugin
         url = ENV['AWS_DEPLOY_CONTROL_ENDPOINT']
         if url.nil?
           url = "https://codedeploy-commands.#{cfg.region}.amazonaws.com"
+          if "cn" == cfg.region.split("-")[0]
+            url.concat(".cn")
+          end
         end
         url
       end