strip ARNs - AWS is sensitive to leading and trailing whitespace/cr/lf.

jwang · Feb 27, 2012 · 4d81b86 · 4d81b86
1 parent 80ca32b
commit 4d81b86
Show file tree

Hide file tree

Showing 22 changed files with 26 additions and 26 deletions.
diff --git a/lib/fog/aws/models/elasticache/cluster.rb b/lib/fog/aws/models/elasticache/cluster.rb
@@ -53,7 +53,7 @@ def save
               :auto_minor_version_upgrade   => auto_upgrade,
               :engine                       => engine,
               :engine_version               => engine_version,
-              :notification_topic_arn       => notification_config['TopicArn'],
+              :notification_topic_arn       => (notification_config['TopicArn']).strip,
               :port                         => port,
               :preferred_availablility_zone => zone,
               :preferred_maintenance_window => maintenance_window,

diff --git a/lib/fog/aws/parsers/sns/confirm_subscription.rb b/lib/fog/aws/parsers/sns/confirm_subscription.rb
@@ -12,7 +12,7 @@ def reset
           def end_element(name)
             case name
             when 'SubscriptionArn', 'RequestId'
-              @response[name] = @value.rstrip
+              @response[name] = @value.strip
             end
           end
 

diff --git a/lib/fog/aws/parsers/sns/create_topic.rb b/lib/fog/aws/parsers/sns/create_topic.rb
@@ -12,7 +12,7 @@ def reset
           def end_element(name)
             case name
             when 'TopicArn', 'RequestId'
-              @response[name] = @value.rstrip
+              @response[name] = @value.strip
             end
           end
 

diff --git a/lib/fog/aws/parsers/sns/list_subscriptions.rb b/lib/fog/aws/parsers/sns/list_subscriptions.rb
@@ -13,12 +13,12 @@ def reset
           def end_element(name)
             case name
             when "TopicArn", "Protocol", "SubscriptionArn", "Owner", "Endpoint"
-              @subscription[name] = @value.rstrip
+              @subscription[name] = @value.strip
             when "member"
               @response['Subscriptions'] << @subscription
               @subscription = {}
             when 'RequestId', 'NextToken'
-              @response[name] = @value.rstrip
+              @response[name] = @value.strip
             end
           end
         end

diff --git a/lib/fog/aws/parsers/sns/list_topics.rb b/lib/fog/aws/parsers/sns/list_topics.rb
@@ -12,7 +12,7 @@ def reset
           def end_element(name)
             case name
             when 'TopicArn'
-              @response['Topics'] << @value
+              @response['Topics'] << @value.strip
             when 'NextToken', 'RequestId'
               response[name] = @value
             end

diff --git a/lib/fog/aws/parsers/sns/subscribe.rb b/lib/fog/aws/parsers/sns/subscribe.rb
@@ -12,7 +12,7 @@ def reset
           def end_element(name)
             case name
             when 'SubscriptionArn', 'RequestId'
-              @response[name] = @value.rstrip
+              @response[name] = @value.strip
             end
           end
 

diff --git a/lib/fog/aws/parsers/sts/get_session_token.rb b/lib/fog/aws/parsers/sts/get_session_token.rb
@@ -15,7 +15,7 @@ def end_element(name)
             when 'SessionToken', 'SecretAccessKey', 'Expiration', 'AccessKeyId'
               @response[name] = @value.strip
             when 'Arn', 'FederatedUserId'
-              @response[name] = @value
+              @response[name] = @value.strip
             when 'PackedPolicySize'
               @response[name] = @value
             when 'RequestId'

diff --git a/lib/fog/aws/requests/elasticache/create_cache_cluster.rb b/lib/fog/aws/requests/elasticache/create_cache_cluster.rb
@@ -36,14 +36,14 @@ def create_cache_cluster(id, options = {})
           # Merge the Cache Security Group parameters with the normal options
           request(sec_group_params.merge(
             'Action'          => 'CreateCacheCluster',
-            'CacheClusterId'  => id,
+            'CacheClusterId'  => id.strip,
             'CacheNodeType'   => options[:node_type]  || 'cache.m1.large',
             'Engine'          => options[:engine]     || 'memcached',
             'NumCacheNodes'   => options[:num_nodes]  || 1,
             'AutoMinorVersionUpgrade'     => options[:auto_minor_version_upgrade],
             'CacheParameterGroupName'     => options[:parameter_group_name],
             'EngineVersion'               => options[:engine_version],
-            'NotificationTopicArn'        => options[:notification_topic_arn],
+            'NotificationTopicArn'        => (options[:notification_topic_arn]).strip,
             'Port'                        => options[:port],
             'PreferredAvailabilityZone'   => options[:preferred_availablility_zone],
             'PreferredMaintenanceWindow'  => options[:preferred_maintenance_window],

diff --git a/lib/fog/aws/requests/elasticache/modify_cache_cluster.rb b/lib/fog/aws/requests/elasticache/modify_cache_cluster.rb
@@ -45,13 +45,13 @@ def modify_cache_cluster(id, options = {})
           # Merge the Cache Security Group parameters with the normal options
           request(node_id_params.merge(sec_group_params.merge(
             'Action'                      => 'ModifyCacheCluster',
-            'CacheClusterId'              => id,
+            'CacheClusterId'              => id.strip,
             'ApplyImmediately'            => options[:apply_immediately],
             'NumCacheNodes'               => options[:num_nodes],
             'AutoMinorVersionUpgrade'     => options[:auto_minor_version_upgrade],
             'CacheParameterGroupName'     => options[:parameter_group_name],
             'EngineVersion'               => options[:engine_version],
-            'NotificationTopicArn'        => options[:notification_topic_arn],
+            'NotificationTopicArn'        => (options[:notification_topic_arn]).strip,
             'NotificationTopicStatus'     => options[:notification_topic_status],
             'PreferredMaintenanceWindow'  => options[:preferred_maintenance_window],
             :parser => Fog::Parsers::AWS::Elasticache::SingleCacheCluster.new

diff --git a/lib/fog/aws/requests/iam/create_group.rb b/lib/fog/aws/requests/iam/create_group.rb
@@ -44,10 +44,10 @@ def create_group(group_name, path = '/')
             data[:groups][group_name][:path] = path
             Excon::Response.new.tap do |response|
               response.body = { 'Group' => {
-                                             'GroupId'   => data[:groups][group_name][:group_id],
+                                             'GroupId'   => (data[:groups][group_name][:group_id]).strip,
                                              'GroupName' => group_name,
                                              'Path'      => path,
-                                             'Arn'       => data[:groups][group_name][:arn] },
+                                             'Arn'       => (data[:groups][group_name][:arn]).strip },
                                 'RequestId' => Fog::AWS::Mock.request_id }
               response.status = 200
             end

diff --git a/lib/fog/aws/requests/iam/create_user.rb b/lib/fog/aws/requests/iam/create_user.rb
@@ -47,7 +47,7 @@ def create_user(user_name, path='/')
                                            "UserId"   => data[:users][user_name][:user_id],
                                            "Path"     => path,
                                            "UserName" => user_name,
-                                           "Arn"      => data[:users][user_name][:arn]
+                                           "Arn"      => (data[:users][user_name][:arn]).strip
                                            },
                                 'RequestId' => Fog::AWS::Mock.request_id
                                }

diff --git a/lib/fog/aws/requests/iam/list_groups.rb b/lib/fog/aws/requests/iam/list_groups.rb
@@ -48,7 +48,7 @@ def list_groups(options = {} )
                                             { 'GroupId'   => group[:group_id],
                                               'GroupName' => name,
                                               'Path'      => group[:path],
-                                              'Arn'       => group[:arn] }
+                                              'Arn'       => (group[:arn]).strip }
                                           end,
                               'IsTruncated' => false,
                               'RequestId' => Fog::AWS::Mock.request_id }

diff --git a/lib/fog/aws/requests/iam/list_groups_for_user.rb b/lib/fog/aws/requests/iam/list_groups_for_user.rb
@@ -51,7 +51,7 @@ def list_groups_for_user(user_name, options = {})
                                                      { 'GroupId'   => group[:group_id],
                                                        'GroupName' => name,
                                                        'Path'      => group[:path],
-                                                       'Arn'       => group[:arn] }
+                                                       'Arn'       => (group[:arn]).strip }
                                                    end,
                                 'IsTruncated' => false,
                                 'RequestId' => Fog::AWS::Mock.request_id

diff --git a/lib/fog/aws/requests/iam/list_users.rb b/lib/fog/aws/requests/iam/list_users.rb
@@ -46,7 +46,7 @@ def list_users(options = {})
                                           { 'UserId'   => data[:user_id],
                                             'Path'     => data[:path],
                                             'UserName' => user,
-                                            'Arn'      => data[:arn] }
+                                            'Arn'      => (data[:arn]).strip }
                                         end,
                              'IsTruncated' => false,
                              'RequestId'   => Fog::AWS::Mock.request_id }

diff --git a/lib/fog/aws/requests/sns/confirm_subscription.rb b/lib/fog/aws/requests/sns/confirm_subscription.rb
@@ -21,7 +21,7 @@ def confirm_subscription(arn, token, options = {})
           request({
             'Action'    => 'ConfirmSubscription',
             'Token'     => token,
-            'TopicArn'  => arn,
+            'TopicArn'  => arn.strip,
             :parser     => Fog::Parsers::AWS::SNS::ConfirmSubscription.new
           }.merge!(options))
         end

diff --git a/lib/fog/aws/requests/sns/delete_topic.rb b/lib/fog/aws/requests/sns/delete_topic.rb
@@ -17,7 +17,7 @@ class Real
         def delete_topic(arn)
           request({
             'Action'    => 'DeleteTopic',
-            'TopicArn'  => arn,
+            'TopicArn'  => arn.strip,
             :parser     => Fog::Parsers::AWS::SNS::DeleteTopic.new
           })
         end

diff --git a/lib/fog/aws/requests/sns/get_topic_attributes.rb b/lib/fog/aws/requests/sns/get_topic_attributes.rb
@@ -17,7 +17,7 @@ class Real
         def get_topic_attributes(arn)
           request({
             'Action'    => 'GetTopicAttributes',
-            'TopicArn'  => arn,
+            'TopicArn'  => arn.strip,
             :parser     => Fog::Parsers::AWS::SNS::GetTopicAttributes.new
           })
         end

diff --git a/lib/fog/aws/requests/sns/list_subscriptions_by_topic.rb b/lib/fog/aws/requests/sns/list_subscriptions_by_topic.rb
@@ -19,7 +19,7 @@ class Real
         def list_subscriptions_by_topic(arn, options = {})
           request({
             'Action'    => 'ListSubscriptionsByTopic',
-            'TopicArn'  => arn,
+            'TopicArn'  => arn.strip,
             :parser     => Fog::Parsers::AWS::SNS::ListSubscriptions.new
           }.merge!(options))
         end

diff --git a/lib/fog/aws/requests/sns/publish.rb b/lib/fog/aws/requests/sns/publish.rb
@@ -22,7 +22,7 @@ def publish(arn, message, options = {})
           request({
             'Action'    => 'Publish',
             'Message'   => message,
-            'TopicArn'  => arn,
+            'TopicArn'  => arn.strip,
             :parser     => Fog::Parsers::AWS::SNS::Publish.new
           }.merge!(options))
         end

diff --git a/lib/fog/aws/requests/sns/set_topic_attributes.rb b/lib/fog/aws/requests/sns/set_topic_attributes.rb
@@ -21,7 +21,7 @@ def set_topic_attributes(arn, attribute_name, attribute_value)
             'Action'          => 'SetTopicAttributes',
             'AttributeName'   => attribute_name,
             'AttributeValue'  => attribute_value,
-            'TopicArn'        => arn,
+            'TopicArn'        => arn.strip,
             :parser     => Fog::Parsers::AWS::SNS::SetTopicAttributes.new
           })
         end

diff --git a/lib/fog/aws/requests/sns/subscribe.rb b/lib/fog/aws/requests/sns/subscribe.rb
@@ -21,7 +21,7 @@ def subscribe(arn, endpoint, protocol)
             'Action'    => 'Subscribe',
             'Endpoint'  => endpoint,
             'Protocol'  => protocol,
-            'TopicArn'  => arn,
+            'TopicArn'  => arn.strip,
             :parser     => Fog::Parsers::AWS::SNS::Subscribe.new
           })
         end

diff --git a/lib/fog/aws/requests/sns/unsubscribe.rb b/lib/fog/aws/requests/sns/unsubscribe.rb
@@ -17,7 +17,7 @@ class Real
         def unsubscribe(arn)
           request({
             'Action'          => 'Unsubscribe',
-            'SubscriptionArn' => arn,
+            'SubscriptionArn' => arn.strip,
             :parser           => Fog::Parsers::AWS::SNS::Unsubscribe.new
           })
         end