Ruby - All Services: Fixing merge conflicts

ruby/example_code/cloudwatch/alarm_actions.rb

@@ -127,13 +127,8 @@ def run_me
   statistic = 'Average'
   dimensions = [
     {
-<<<<<<< HEAD
       name: "BucketName",
       value: "amzn-s3-demo-bucket"
-=======
-      name: 'BucketName',
-      value: 'doc-example-bucket'
->>>>>>> 999c6133e (fixes)
     },
     {
       name: 'StorageType',

ruby/example_code/cloudwatch/alarm_basics.rb

@@ -148,13 +148,8 @@ def run_me
   statistic = 'Average'
   dimensions = [
     {
-<<<<<<< HEAD
       name: "BucketName",
       value: "amzn-s3-demo-bucket"
-=======
-      name: 'BucketName',
-      value: 'doc-example-bucket'
->>>>>>> 999c6133e (fixes)
     },
     {
       name: 'StorageType',

ruby/example_code/cloudwatch/create_alarm.rb

@@ -99,13 +99,8 @@ def run_me
   statistic = 'Average'
   dimensions = [
     {
-<<<<<<< HEAD
       name: "BucketName",
       value: "amzn-s3-demo-bucket"
-=======
-      name: 'BucketName',
-      value: 'doc-example-bucket'
->>>>>>> 999c6133e (fixes)
     },
     {
       name: 'StorageType',

ruby/example_code/cloudwatch/spec/alarm_actions_spec.rb

@@ -14,13 +14,8 @@
   let(:dimensions) do
     [
       {
-<<<<<<< HEAD
         name: "BucketName",
         value: "amzn-s3-demo-bucket"
-=======
-        name: 'BucketName',
-        value: 'doc-example-bucket'
->>>>>>> 999c6133e (fixes)
       },
       {
         name: 'StorageType',

ruby/example_code/cloudwatch/spec/alarm_basics_spec.rb

@@ -34,13 +34,8 @@
   let(:dimensions) do
     [
       {
-<<<<<<< HEAD
         name: "BucketName",
         value: "amzn-s3-demo-bucket"
-=======
-        name: 'BucketName',
-        value: 'doc-example-bucket'
->>>>>>> 999c6133e (fixes)
       },
       {
         name: 'StorageType',

ruby/example_code/cloudwatch/spec/create_alarm_spec.rb

@@ -14,13 +14,8 @@
   let(:dimensions) do
     [
       {
-<<<<<<< HEAD
         name: "BucketName",
         value: "amzn-s3-demo-bucket"
-=======
-        name: 'BucketName',
-        value: 'doc-example-bucket'
->>>>>>> 999c6133e (fixes)
       },
       {
         name: 'StorageType',

ruby/example_code/cloudwatch/spec/show_alarms_spec.rb

@@ -33,13 +33,8 @@
               ],
               dimensions: [
                 {
-<<<<<<< HEAD
                   name: "BucketName",
                   value: "amzn-s3-demo-bucket"
-=======
-                  name: 'BucketName',
-                  value: 'doc-example-bucket'
->>>>>>> 999c6133e (fixes)
                 },
                 {
                   name: 'StorageType',

ruby/example_code/s3/auth_federation_token_request_test.rb

@@ -104,15 +104,9 @@ def list_objects_in_bucket?(s3_client, bucket_name)
 
 # Example usage:
 def run_me
-<<<<<<< HEAD
   region = "us-west-2"
   user_name = "my-user"
   bucket_name = "amzn-s3-demo-bucket"
-=======
-  region = 'us-west-2'
-  user_name = 'my-user'
-  bucket_name = 'doc-example-bucket'
->>>>>>> 999c6133e (fixes)
 
   iam = Aws::IAM::Client.new(region: region)
   user = get_user(iam, user_name)

ruby/example_code/s3/auth_session_token_request_test.rb

@@ -176,11 +176,7 @@ def run_me
   role_session_name = 'ReadAmazonS3Bucket'
   duration_seconds = 3600
   sts_client = Aws::STS::Client.new(region: region)
-<<<<<<< HEAD
   bucket_name = "amzn-s3-demo-bucket"
-=======
-  bucket_name = 'doc-example-bucket'
->>>>>>> 999c6133e (fixes)
 
   puts "Getting or creating user '#{user_name}'..."
 

ruby/example_code/s3/bucket_cors.rb

@@ -75,11 +75,7 @@ def delete_cors
 
 # Example usage:
 def run_demo
-<<<<<<< HEAD
   bucket_name = "amzn-s3-demo-bucket"
-=======
-  bucket_name = 'doc-example-bucket'
->>>>>>> 999c6133e (fixes)
   allowed_methods = %w[GET PUT]
   allowed_origins = %w[http://www.example.com]
 

ruby/example_code/s3/bucket_create.rb

@@ -46,13 +46,8 @@ def location
 
 # Example usage:
 def run_demo
-<<<<<<< HEAD
   region = "us-west-2"
   wrapper = BucketCreateWrapper.new(Aws::S3::Bucket.new("amzn-s3-demo-bucket-#{Random.uuid}"))
-=======
-  region = 'us-west-2'
-  wrapper = BucketCreateWrapper.new(Aws::S3::Bucket.new("doc-example-bucket-#{Random.uuid}"))
->>>>>>> 999c6133e (fixes)
   return unless wrapper.create?(region)
 
   puts "Created bucket #{wrapper.bucket.name}."

ruby/example_code/s3/bucket_list_objects.rb

@@ -38,11 +38,7 @@ def list_objects(max_objects)
 
 # Example usage:
 def run_demo
-<<<<<<< HEAD
   bucket_name = "amzn-s3-demo-bucket"
-=======
-  bucket_name = 'doc-example-bucket'
->>>>>>> 999c6133e (fixes)
 
   wrapper = BucketListObjectsWrapper.new(Aws::S3::Bucket.new(bucket_name))
   count = wrapper.list_objects(25)

ruby/example_code/s3/bucket_policy.rb

@@ -60,13 +60,8 @@ def delete_policy
 
 # Example usage:
 def run_demo
-<<<<<<< HEAD
   bucket_name = "amzn-s3-demo-bucket"
   policy_user = "arn:aws:iam::111122223333:user/Martha"
-=======
-  bucket_name = 'doc-example-bucket'
-  policy_user = 'arn:aws:iam::111122223333:user/Martha'
->>>>>>> 999c6133e (fixes)
   policy = {
     'Version': '2012-10-17',
     'Id': 'DemoBucketPolicy',

ruby/example_code/s3/bucket_put_encryption.rb

@@ -41,11 +41,7 @@ def encryption(bucket_name)
 
 # Example usage:
 def run_demo
-<<<<<<< HEAD
   bucket_name = "amzn-s3-demo-bucket"
-=======
-  bucket_name = 'doc-example-bucket'
->>>>>>> 999c6133e (fixes)
   wrapper = BucketEncryptionWrapper.new(Aws::S3::Client.new)
   return unless wrapper.set_encryption(bucket_name)
 

ruby/example_code/s3/bucket_put_website.rb

@@ -38,15 +38,9 @@ def set_website(index_document, error_document)
 
 # Example usage:
 def run_demo
-<<<<<<< HEAD
   bucket_name = "amzn-s3-demo-bucket"
   index_document = "index.html"
   error_document = "404.html"
-=======
-  bucket_name = 'doc-example-bucket'
-  index_document = 'index.html'
-  error_document = '404.html'
->>>>>>> 999c6133e (fixes)
 
   wrapper = BucketWebsiteWrapper.new(Aws::S3::BucketWebsite.new(bucket_name))
   return unless wrapper.set_website(index_document, error_document)

ruby/example_code/s3/encryption_v2/s3_add_csaes_encrypt_item.rb

@@ -83,15 +83,9 @@ def random_aes_256_gcm_key
 
 # Example usage:
 def run_me
-<<<<<<< HEAD
   bucket_name = "amzn-s3-demo-bucket"
   object_key = "my-file.txt"
   region = "us-west-2"
-=======
-  bucket_name = 'doc-example-bucket'
-  object_key = 'my-file.txt'
-  region = 'us-west-2'
->>>>>>> 999c6133e (fixes)
   object_content = File.read(object_key)
 
   # The following call generates a random AES256-GCM key. Alternatively, you can

ruby/example_code/s3/encryption_v2/s3_add_cskms_encrypt_item.rb

@@ -57,17 +57,10 @@ def encrypted_object_uploaded?(
 
 # Example usage:
 def run_me
-<<<<<<< HEAD
   bucket_name = "amzn-s3-demo-bucket"
   object_key = "my-file.txt"
   region = "us-west-2"
   kms_key_id = "9041e78c-7a20-4db3-929e-828abEXAMPLE"
-=======
-  bucket_name = 'doc-example-bucket'
-  object_key = 'my-file.txt'
-  region = 'us-west-2'
-  kms_key_id = '9041e78c-7a20-4db3-929e-828abEXAMPLE'
->>>>>>> 999c6133e (fixes)
   object_content = File.read(object_key)
 
   # Note that in the following call:

ruby/example_code/s3/encryption_v2/s3_get_csaes_decrypt_item.rb

@@ -53,15 +53,9 @@ def get_decrypted_object_content(
 
 # Example usage:
 def run_me
-<<<<<<< HEAD
   bucket_name = "amzn-s3-demo-bucket"
   object_key = "my-file.txt"
   region = "us-west-2"
-=======
-  bucket_name = 'doc-example-bucket'
-  object_key = 'my-file.txt'
-  region = 'us-west-2'
->>>>>>> 999c6133e (fixes)
 
   # Provide a base64-encoded string representation of the key that
   # was originally used to encrypt the object. For example:

ruby/example_code/s3/encryption_v2/s3_get_cskms_decrypt_item.rb

@@ -51,17 +51,10 @@ def get_decrypted_object_content(
 
 # Example usage:
 def run_me
-<<<<<<< HEAD
   bucket_name = "amzn-s3-demo-bucket"
   object_key = "my-file.txt"
   region = "us-west-2"
   kms_key_id = "9041e78c-7a20-4db3-929e-828abEXAMPLE"
-=======
-  bucket_name = 'doc-example-bucket'
-  object_key = 'my-file.txt'
-  region = 'us-west-2'
-  kms_key_id = '9041e78c-7a20-4db3-929e-828abEXAMPLE'
->>>>>>> 999c6133e (fixes)
 
   # Note that in the following call:
   # - key_wrap_schema must be kms_context for AWS KMS.

ruby/example_code/s3/encryption_v2/s3_ruby_example_add_cspk_item.rb

@@ -55,19 +55,11 @@ def object_uploaded_with_public_key_encryption?(
 
 # Example usage:
 def run_me
-<<<<<<< HEAD
   bucket_name = "amzn-s3-demo-bucket"
   object_key = "my-file.txt"
   object_content = "This is the content of my-file.txt."
   region = "us-west-2"
   public_key_file = "my-public-key.pem"
-=======
-  bucket_name = 'doc-example-bucket'
-  object_key = 'my-file.txt'
-  object_content = 'This is the content of my-file.txt.'
-  region = 'us-west-2'
-  public_key_file = 'my-public-key.pem'
->>>>>>> 999c6133e (fixes)
   public_key = OpenSSL::PKey::RSA.new(File.read(public_key_file))
 
   # When initializing this Amazon S3 encryption client, note:

ruby/example_code/s3/encryption_v2/s3_ruby_example_get_cspk_item.rb

@@ -50,17 +50,10 @@ def download_object_with_private_key_encryption(
 
 # Example usage:
 def run_me
-<<<<<<< HEAD
   bucket_name = "amzn-s3-demo-bucket"
   object_key = "my-file.txt"
   region = "us-west-2"
   private_key_file = "my-private-key.pem"
-=======
-  bucket_name = 'doc-example-bucket'
-  object_key = 'my-file.txt'
-  region = 'us-west-2'
-  private_key_file = 'my-private-key.pem'
->>>>>>> 999c6133e (fixes)
   private_key = OpenSSL::PKey::RSA.new(File.read(private_key_file))
 
   # When initializing this Amazon S3 encryption client, note:

ruby/example_code/s3/encryption_v2/spec/test_s3_add_csaes_encrypt_item.rb

@@ -3,17 +3,10 @@
 
 require_relative '../s3_add_csaes_encrypt_item'
 
-<<<<<<< HEAD
 describe "#encrypted_object_uploaded?" do
   let(:bucket_name) { "amzn-s3-demo-bucket" }
   let(:object_key) { "my-file.txt" }
   let(:object_content) { "This is the content of my-file.txt." }
-=======
-describe '#encrypted_object_uploaded?' do
-  let(:bucket_name) { 'doc-example-bucket' }
-  let(:object_key) { 'my-file.txt' }
-  let(:object_content) { 'This is the content of my-file.txt.' }
->>>>>>> 999c6133e (fixes)
   let(:encryption_key) { get_random_aes_256_gcm_key }
   # Note that Aws::S3::EncryptionV2::Client is a wrapper around
   #   Aws::S3::Client. So you must first stub Aws::S3::Client

ruby/example_code/s3/encryption_v2/spec/test_s3_add_cskms_encrypt_item.rb

@@ -3,19 +3,11 @@
 
 require_relative '../s3_add_cskms_encrypt_item'
 
-<<<<<<< HEAD
 describe "#encrypted_object_uploaded?" do
   let(:bucket_name) { "amzn-s3-demo-bucket" }
   let(:object_key) { "my-file.txt" }
   let(:object_content) { "This is the content of my-file.txt." }
   let(:kms_key_id) { "9041e78c-7a20-4db3-929e-828abEXAMPLE" }
-=======
-describe '#encrypted_object_uploaded?' do
-  let(:bucket_name) { 'doc-example-bucket' }
-  let(:object_key) { 'my-file.txt' }
-  let(:object_content) { 'This is the content of my-file.txt.' }
-  let(:kms_key_id) { '9041e78c-7a20-4db3-929e-828abEXAMPLE' }
->>>>>>> 999c6133e (fixes)
   # Note that Aws::S3::EncryptionV2::Client is a wrapper around
   #   Aws::S3::Client. So you must first stub Aws::S3::Client
   #   and then pass it into Aws::S3::EncryptionV2::Client

ruby/example_code/s3/encryption_v2/spec/test_s3_get_csaes_decrypt_item.rb

@@ -36,19 +36,11 @@ def stub_get(s3_client, data, stub_auth_tag)
     )
   end
 
-<<<<<<< HEAD
   let(:bucket_name) { "amzn-s3-demo-bucket" }
   let(:object_key) { "my-file.txt" }
   let(:object_content) { "This is the content of my-file.txt." }
   let(:encryption_key_string) { "XSiKrmzhtDKR9tTwJRSLjgwLhiMA82TC2z3GEXAMPLE=" }
   let(:encryption_key) { encryption_key_string.unpack("m")[0] }
-=======
-  let(:bucket_name) { 'doc-example-bucket' }
-  let(:object_key) { 'my-file.txt' }
-  let(:object_content) { 'This is the content of my-file.txt.' }
-  let(:encryption_key_string) { 'XSiKrmzhtDKR9tTwJRSLjgwLhiMA82TC2z3GEXAMPLE=' }
-  let(:encryption_key) { encryption_key_string.unpack1('m') }
->>>>>>> 999c6133e (fixes)
   # Note that Aws::S3::EncryptionV2::Client is a wrapper around
   #   Aws::S3::Client. So you must first stub Aws::S3::Client
   #   and then pass it into Aws::S3::EncryptionV2::Client

ruby/example_code/s3/encryption_v2/spec/test_s3_get_cskms_decrypt_item.rb

@@ -52,21 +52,11 @@ def stub_decrypt(kms_client, opts)
     )
   end
 
-<<<<<<< HEAD
   let(:bucket_name) { "amzn-s3-demo-bucket" }
   let(:object_key) { "my-file.txt" }
   let(:object_content) { "This is the content of my-file.txt." }
   let(:kms_key_id) { "9041e78c-7a20-4db3-929e-828abEXAMPLE" }
   let(:kms_ciphertext_blob) { Base64.decode64("AQIDAHiWj6qDEnwihp7W7g6VZb1xqsat5jdSUdEaGhgZepHdLAGASCQI7LZz\nz7GzCpm6y4sHAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEH\nATAeBglghkgBZQMEAS4wEQQMJMJe6d8DkRTWwlvtAgEQgDtBCwiibCTS8pb7\n6BYKklVjy+CmO9q3r6y4u/9jJ8lk9eg5GwiskmcBtPMcWogMzx/vh+/65Cjb\nsQBpLQ==\n") }
-=======
-  let(:bucket_name) { 'doc-example-bucket' }
-  let(:object_key) { 'my-file.txt' }
-  let(:object_content) { 'This is the content of my-file.txt.' }
-  let(:kms_key_id) { '9041e78c-7a20-4db3-929e-828abEXAMPLE' }
-  let(:kms_ciphertext_blob) do
-    Base64.decode64("AQIDAHiWj6qDEnwihp7W7g6VZb1xqsat5jdSUdEaGhgZepHdLAGASCQI7LZz\nz7GzCpm6y4sHAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEH\nATAeBglghkgBZQMEAS4wEQQMJMJe6d8DkRTWwlvtAgEQgDtBCwiibCTS8pb7\n6BYKklVjy+CmO9q3r6y4u/9jJ8lk9eg5GwiskmcBtPMcWogMzx/vh+/65Cjb\nsQBpLQ==\n")
-  end
->>>>>>> 999c6133e (fixes)
   let(:kms_plaintext) { Base64.decode64("5V7JWe+UDRhv66TaDg+tP6JONf/GkTdXk6Jq61weM+w=\n") }
   # Note that Aws::S3::EncryptionV2::Client is a wrapper around
   #   Aws::S3::Client. So you must first stub Aws::S3::Client