Ruby - All Services: Fixing merge conflicts (#6997)

Author: ford-at-aws

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]