aws 2.3.25 → 2.3.26

data/lib/acf/right_acf_interface.rb

@@ -195,6 +195,11 @@ module Aws
       request_cache_or_info :list_distributions, request_hash,  AcfDistributionListParser, @@bench
     end
 
+    def list_streaming_distributions
+      request_hash = generate_request('GET', 'streaming-distribution')
+      request_cache_or_info :list_streaming_distributions, request_hash,  AcfStreamingDistributionListParser, @@bench
+    end
+
     # Create a new distribution.
     # Returns the just created distribution or Aws::AwsError exception.
     #
@@ -210,26 +215,38 @@ module Aws
     #     :last_modified_time => Wed Sep 10 17:00:54 UTC 2008,
     #     :caller_reference   => "200809102100536497863003"}
     #
-    def create_distribution(origin, comment='', enabled=true, cnames=[], caller_reference=nil)
+    def create_distribution(origin, comment='', enabled=true, cnames=[], caller_reference=nil, default_root_object=nil)
+      body = distribution_config_for(origin, comment, enabled, cnames, caller_reference, false, default_root_object)
+      request_hash = generate_request('POST', 'distribution', body.strip)
+      merge_headers(request_info(request_hash, AcfDistributionParser.new))
+    end
+
+    def create_streaming_distribution(origin, comment='', enabled=true, cnames=[], caller_reference=nil, default_root_object=nil)
+      body = distribution_config_for(origin, comment, enabled, cnames, caller_reference, true, default_root_object)
+      request_hash = generate_request('POST', 'streaming-distribution', body.strip)
+      merge_headers(request_info(request_hash, AcfDistributionParser.new))
+    end
+    
+    def distribution_config_for(origin, comment='', enabled=true, cnames=[], caller_reference=nil, streaming = false, default_root_object=nil)
+      rootElement = streaming ? "StreamingDistributionConfig" : "DistributionConfig"
       # join CNAMES
       cnames_str = ''
       unless cnames.blank?
         cnames.to_a.each { |cname| cnames_str += "\n           <CNAME>#{cname}</CNAME>" }
       end
-      # reference
       caller_reference ||= generate_call_reference
+      root_ob = default_root_object ? "<DefaultRootObject>#{config[:default_root_object]}</DefaultRootObject>" : ""
       body = <<-EOXML
         <?xml version="1.0" encoding="UTF-8"?>
-        <DistributionConfig xmlns=#{xmlns}>
+        <#{rootElement} xmlns=#{xmlns}>
            <Origin>#{origin}</Origin>
            <CallerReference>#{caller_reference}</CallerReference>
            #{cnames_str.lstrip}
            <Comment>#{AcfInterface::escape(comment.to_s)}</Comment>
            <Enabled>#{enabled}</Enabled>
-        </DistributionConfig>
+           #{root_ob}
+        </#{rootElement}>
       EOXML
-      request_hash = generate_request('POST', 'distribution', body.strip)
-      merge_headers(request_info(request_hash, AcfDistributionParser.new))
     end
 
     # Get a distribution's information.
@@ -252,6 +269,11 @@ module Aws
       merge_headers(request_info(request_hash, AcfDistributionParser.new))
     end
 
+    def get_streaming_distribution(aws_id)
+      request_hash = generate_request('GET', "streaming-distribution/#{aws_id}")
+      merge_headers(request_info(request_hash, AcfDistributionParser.new))
+    end
+
     # Get a distribution's configuration.
     # Returns a distribution's configuration or Aws::AwsError exception.
     #
@@ -286,25 +308,15 @@ module Aws
     #  acf.set_distribution_config('E2REJM3VUN5RSI', config) #=> true
     #
     def set_distribution_config(aws_id, config)
-      # join CNAMES
-      cnames_str = ''
-      unless config[:cnames].blank?
-        config[:cnames].to_a.each { |cname| cnames_str += "\n           <CNAME>#{cname}</CNAME>" }
-      end
-      root_ob = config[:default_root_object] ? "<DefaultRootObject>#{config[:default_root_object]}</DefaultRootObject>" : ""
-      # format request's XML body
-      body = <<-EOXML
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DistributionConfig xmlns=#{xmlns}>
-           <Origin>#{config[:origin]}</Origin>
-           <CallerReference>#{config[:caller_reference]}</CallerReference>
-           #{cnames_str.lstrip}
-           <Comment>#{AcfInterface::escape(config[:comment].to_s)}</Comment>
-           <Enabled>#{config[:enabled]}</Enabled>
-           #{root_ob}
-        </DistributionConfig>
-      EOXML
-      request_hash = generate_request('PUT', "distribution/#{aws_id}/config", body.strip,
+      body = distribution_config_for(config[:origin], config[:comment], config[:enabled], config[:cnames], config[:caller_reference], false)
+      request_hash = generate_request('PUT', "distribution/#{aws_id}/config", body.strip,      
+                                      'If-Match' => config[:e_tag])
+      request_info(request_hash, RightHttp2xxParser.new)
+    end
+
+    def set_streaming_distribution_config(aws_id, config)
+      body = distribution_config_for(config[:origin], config[:comment], config[:enabled], config[:cnames], config[:caller_reference], true)
+      request_hash = generate_request('PUT', "streaming-distribution/#{aws_id}/config", body.strip,
                                       'If-Match' => config[:e_tag])
       request_info(request_hash, RightHttp2xxParser.new)
     end
@@ -320,46 +332,52 @@ module Aws
       request_info(request_hash, RightHttp2xxParser.new)
     end
 
+    def delete_streaming_distribution(aws_id, e_tag)
+      request_hash = generate_request('DELETE', "streaming-distribution/#{aws_id}", nil,
+                                      'If-Match' => e_tag)
+      request_info(request_hash, RightHttp2xxParser.new)
+    end
+
     #-----------------------------------------------------------------
     #      PARSERS:
     #-----------------------------------------------------------------
 
-    class AcfDistributionListParser < AwsParser # :nodoc:
+    # Parses attributes common to many CF distribution API calls
+    class AcfBaseDistributionParser < AwsParser # :nodoc:
       def reset
+        @distribution = { :cnames => [] }
         @result = []
       end
-      def tagstart(name, attributes)
-        @distribution = { :cnames => [] } if name == 'DistributionSummary'
-      end
       def tagend(name)
         case name
-          when 'Id'                  then @distribution[:aws_id]             = @text
-          when 'Status'              then @distribution[:status]             = @text
-          when 'LastModifiedTime'    then @distribution[:last_modified_time] = Time.parse(@text)
-          when 'DomainName'          then @distribution[:domain_name]        = @text
-          when 'Origin'              then @distribution[:origin]             = @text
-          when 'Comment'             then @distribution[:comment]            = AcfInterface::unescape(@text)
-          when 'CNAME'               then @distribution[:cnames]            << @text
-          when 'DistributionSummary' then @result << @distribution
+          when 'Id'               then @distribution[:aws_id]             = @text
+          when 'Status'           then @distribution[:status]             = @text
+          when 'LastModifiedTime' then @distribution[:last_modified_time] = Time.parse(@text)
+          when 'DomainName'       then @distribution[:domain_name]        = @text
+          when 'Origin'           then @distribution[:origin]             = @text
+          when 'CallerReference'  then @distribution[:caller_reference]   = @text
+          when 'Comment'          then @distribution[:comment]            = AcfInterface::unescape(@text)
+          when 'Enabled'          then @distribution[:enabled]            = @text == 'true' ? true : false
+          when 'CNAME'            then @distribution[:cnames]            << @text
         end
       end
     end
 
-    class AcfDistributionParser < AwsParser # :nodoc:
-      def reset
-        @result = { :cnames => [] }
+    class AcfDistributionParser < AcfBaseDistributionParser # :nodoc:
+      def tagend(name)
+        super
+        @result = @distribution
+      end
+    end
+
+    class AcfDistributionListParser < AcfBaseDistributionParser # :nodoc:
+      def tagstart(name, attributes)
+        @distribution = { :cnames => [] } if name == 'DistributionSummary'
       end
       def tagend(name)
+        super(name)
         case name
-          when 'Id'               then @result[:aws_id]             = @text
-          when 'Status'           then @result[:status]             = @text
-          when 'LastModifiedTime' then @result[:last_modified_time] = Time.parse(@text)
-          when 'DomainName'       then @result[:domain_name]        = @text
-          when 'Origin'           then @result[:origin]             = @text
-          when 'CallerReference'  then @result[:caller_reference]   = @text
-          when 'Comment'          then @result[:comment]            = AcfInterface::unescape(@text)
-          when 'Enabled'          then @result[:enabled]            = @text == 'true' ? true : false
-          when 'CNAME'            then @result[:cnames]            << @text
+          when 'DistributionSummary' then @result << @distribution
         end
       end
     end
@@ -379,5 +397,17 @@ module Aws
       end
     end
 
+    class AcfStreamingDistributionListParser < AcfBaseDistributionParser # :nodoc:
+      def tagstart(name, attributes)
+        @distribution = { :cnames => [] } if name == 'StreamingDistributionSummary'
+      end
+      def tagend(name)
+        super(name)
+        case name
+          when 'StreamingDistributionSummary' then @result << @distribution
+        end
+      end
+    end
+
   end
 end

data/lib/aws.rb

@@ -27,4 +27,5 @@ require 'sdb/right_sdb_interface'
 require 'acf/right_acf_interface'
 require 'elb/elb_interface'
 require 'rds/rds'
+require 'iam/iam'
 

data/lib/ec2/right_ec2.rb

@@ -81,7 +81,7 @@ module Aws
     # Amazon EC2 Instance Types : http://www.amazon.com/b?ie=UTF8&node=370375011
     # Default EC2 instance type (platform)
     DEFAULT_INSTANCE_TYPE   =  'm1.small'
-    INSTANCE_TYPES          = ['m1.small','c1.medium','m1.large','m1.xlarge','c1.xlarge']
+    INSTANCE_TYPES          = ['t1.micro', 'm1.small','c1.medium','m1.large','m1.xlarge','c1.xlarge']
 
     @@bench = AwsBenchmarkingBlock.new
     def self.bench_xml
@@ -186,7 +186,10 @@ module Aws
       params.each do |list_by, list|
         request_hash.merge! hash_params(list_by, list.to_a)
       end
-      request_hash['ImageType'] = image_type if image_type
+      if image_type
+        request_hash['Filter.1.Name'] = "image-type"
+        request_hash['Filter.1.Value.1'] = image_type
+      end
       link = generate_request("DescribeImages", request_hash)
       request_cache_or_info cache_for, link,  QEc2DescribeImagesParser, @@bench, cache_for
     rescue Exception
@@ -1433,6 +1436,8 @@ module Aws
       def tagend(name)
         case name
           when 'imageId'       then @image[:aws_id]       = @text
+          when 'name'          then @image[:aws_name]     = @text
+          when 'description'    then @image[:aws_description] = @text
           when 'imageLocation' then @image[:aws_location] = @text
           when 'imageState'    then @image[:aws_state]    = @text
           when 'imageOwnerId'  then @image[:aws_owner]    = @text

data/lib/iam/iam.rb

@@ -0,0 +1,118 @@
+module Aws
+
+    require 'xmlsimple'
+
+    class Iam < AwsBase
+
+        include AwsBaseInterface
+
+        API_VERSION      = "2010-05-08"
+        DEFAULT_HOST     = "iam.amazonaws.com"
+        DEFAULT_PATH     = '/'
+        DEFAULT_PROTOCOL = 'https'
+        DEFAULT_PORT     = 443
+
+        @@bench          = AwsBenchmarkingBlock.new
+
+        def self.bench_xml
+            @@bench.xml
+        end
+
+        def self.bench_ec2
+            @@bench.service
+        end
+
+        # Current API version (sometimes we have to check it outside the GEM).
+        @@api            = ENV['IAM_API_VERSION'] || API_VERSION
+
+        def self.api
+            @@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,
+                  :default_protocol => ENV['IAM_URL'] ? URI.parse(ENV['IAM_URL']).scheme : DEFAULT_PROTOCOL,
+                  :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"],
+                                           :pull_out_array =>options[:pull_out_array],
+                                           :pull_out_single=>options[:pull_out_single],
+                                           :wrapper        =>options[:wrapper])
+        end
+
+
+        #-----------------------------------------------------------------
+        #      REQUESTS
+        #-----------------------------------------------------------------
+
+
+        # options:
+        #    :marker => value received from previous response if IsTruncated = true
+        #    :max_items => number of items you want returned
+        #    :path_previx => for filtering results, default is /
+        def list_server_certificates(options={})
+            @logger.info("Listing server certificates...")
+
+            params = {}
+            params['Marker'] = options[:marker] if options[:marker]
+            params['MaxItems'] = options[:max_items] if options[:max_items]
+            params['PathPrefix'] = options[:path_prefix] if options[:path_prefix]
+
+            resp   = do_request("ListServerCertificates", params, :pull_out_array=>[:list_server_certificates_result, :server_certificate_metadata_list])
+
+
+        rescue Exception
+            on_exception
+        end
+
+        #
+        # name: name of certificate
+        # public_key: public key certificate in PEM-encoded format
+        # 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['ServerCertificateName'] = name
+            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
+
+            resp                            = do_request("UploadServerCertificate", params, :pull_out_array=>[:list_server_certificates_result, :server_certificate_metadata_list])
+
+
+        rescue Exception
+            on_exception
+        end
+
+
+    end
+
+
+end

data/test/iam/test_iam.rb

@@ -0,0 +1,36 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../lib/aws'
+require 'pp'
+require File.dirname(__FILE__) + '/../test_credentials.rb'
+
+class TestElb < Test::Unit::TestCase
+
+    # Some of RightEc2 instance methods concerning instance launching and image registration
+    # are not tested here due to their potentially risk.
+
+    def setup
+        TestCredentials.get_credentials
+
+        @iam = Aws::Iam.new(TestCredentials.aws_access_key_id,
+                            TestCredentials.aws_secret_access_key)
+
+    end
+
+    def test_01_list_server_certificates
+
+        ret = @iam.list_server_certificates
+        p ret
+        assert_true(ret.size == 0)
+    end
+
+    def test_02_upload_server_certificate
+        ret = @iam.upload_server_certificate("test_cert",
+                                             IO.read('x').strip,
+                                             IO.read('y').strip,
+                                             :certificate_chain=>IO.read('z').strip)
+
+        p ret
+    end
+
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 3
-  - 25
-  version: 2.3.25
+  - 26
+  version: 2.3.26
 platform: ruby
 authors: 
 - Travis Reeder
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 -07:00
+date: 2010-11-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,6 +89,7 @@ files:
 - lib/ec2/right_ec2.rb
 - lib/ec2/right_mon_interface.rb
 - lib/elb/elb_interface.rb
+- lib/iam/iam.rb
 - lib/rds/rds.rb
 - lib/right_aws.rb
 - lib/s3/right_s3.rb
@@ -105,6 +106,7 @@ files:
 - test/ec2/test_mon.rb
 - test/elb/test_elb.rb
 - test/http_connection.rb
+- test/iam/test_iam.rb
 - test/rds/test_rds.rb
 - test/s3/test_helper.rb
 - test/s3/test_s3.rb
@@ -156,6 +158,7 @@ test_files:
 - test/ec2/test_mon.rb
 - test/elb/test_elb.rb
 - test/http_connection.rb
+- test/iam/test_iam.rb
 - test/rds/test_rds.rb
 - test/s3/test_helper.rb
 - test/s3/test_s3.rb