lib/iam/iam.rb in aws-2.4.5 vs lib/iam/iam.rb in aws-2.5.0

@@ -4,20 +4,26 @@
 
   class Iam < AwsBase
 
     include AwsBaseInterface
 
-    API_VERSION      = "2010-05-08"
-    DEFAULT_HOST     = "iam.amazonaws.com"
-    DEFAULT_PATH     = '/'
+    API_VERSION = "2010-05-08"
+    DEFAULT_HOST = "iam.amazonaws.com"
+    DEFAULT_PATH = '/'
     DEFAULT_PROTOCOL = 'https'
-    DEFAULT_PORT     = 443
+    DEFAULT_PORT = 443
 
-    @@bench          = AwsBenchmarkingBlock.new
- def self.bench
+    def self.connection_name
+      :iam_connection
+    end
+
+    @@bench = AwsBenchmarkingBlock.new
+
+    def self.bench
       @@bench
     end
+
     def self.bench_xml
       @@bench.xml
     end
 
     def self.bench_ec2
@@ -31,38 +37,38 @@
       @@api
     end
 
 
     def initialize(aws_access_key_id=nil, aws_secret_access_key=nil, params={})
-      init({:name             => 'IAM',
-            :default_host     => ENV['IAM_URL'] ? URI.parse(ENV['IAM_URL']).host : DEFAULT_HOST,
-            :default_port     => ENV['IAM_URL'] ? URI.parse(ENV['IAM_URL']).port : DEFAULT_PORT,
-            :default_service  => ENV['IAM_URL'] ? URI.parse(ENV['IAM_URL']).path : DEFAULT_PATH,
+      init({:name => 'IAM',
+            :default_host => ENV['IAM_URL'] ? URI.parse(ENV['IAM_URL']).host : DEFAULT_HOST,
+            :default_port => ENV['IAM_URL'] ? URI.parse(ENV['IAM_URL']).port : DEFAULT_PORT,
+            :default_service => ENV['IAM_URL'] ? URI.parse(ENV['IAM_URL']).path : DEFAULT_PATH,
             :default_protocol => ENV['IAM_URL'] ? URI.parse(ENV['IAM_URL']).scheme : DEFAULT_PROTOCOL,
-            :api_version      => API_VERSION},
+            :api_version => API_VERSION},
            aws_access_key_id || ENV['AWS_ACCESS_KEY_ID'],
            aws_secret_access_key|| ENV['AWS_SECRET_ACCESS_KEY'],
            params)
     end
 
     def do_request(action, params, options={})
       link = generate_request(action, params)
       p link[:request]
       resp = request_info_xml_simple(:iam_connection, @params, link, @logger,
-                                     :group_tags     =>{"LoadBalancersDescriptions"=>"LoadBalancersDescription",
-                                                        "DBParameterGroups"        =>"DBParameterGroup",
-                                                        "DBSecurityGroups"         =>"DBSecurityGroup",
-                                                        "EC2SecurityGroups"        =>"EC2SecurityGroup",
-                                                        "IPRanges"                 =>"IPRange"},
-                                     :force_array    =>["DBInstances",
-                                                        "DBParameterGroups",
-                                                        "DBSecurityGroups",
-                                                        "EC2SecurityGroups",
-                                                        "IPRanges"],
+                                     :group_tags =>{"LoadBalancersDescriptions"=>"LoadBalancersDescription",
+                                                    "DBParameterGroups" =>"DBParameterGroup",
+                                                    "DBSecurityGroups" =>"DBSecurityGroup",
+                                                    "EC2SecurityGroups" =>"EC2SecurityGroup",
+                                                    "IPRanges" =>"IPRange"},
+                                     :force_array =>["DBInstances",
+                                                     "DBParameterGroups",
+                                                     "DBSecurityGroups",
+                                                     "EC2SecurityGroups",
+                                                     "IPRanges"],
                                      :pull_out_array =>options[:pull_out_array],
                                      :pull_out_single=>options[:pull_out_single],
-                                     :wrapper        =>options[:wrapper])
+                                     :wrapper =>options[:wrapper])
     end
 
 
     #-----------------------------------------------------------------
     #      REQUESTS
@@ -94,13 +100,13 @@
     # private_key: private key in PEM-encoded format
     # options:
     #    :path => specify a path you want it stored in
     #    :certificate_chain => contents of certificate chain
     def upload_server_certificate(name, public_key, private_key, options={})
-      params                          = {}
+      params = {}
       params['ServerCertificateName'] = name
-      params['PrivateKey']            = private_key
-      params['CertificateBody']       = public_key
+      params['PrivateKey'] = private_key
+      params['CertificateBody'] = public_key
 
       params['CertificateChain'] = options[:certificate_chain] if options[:certificate_chain]
       params['Path'] = options[:path] if options[:path]
 
       p params
\ No newline at end of file