fog 1.19.0 → 1.20.0

data/lib/fog/aws/models/storage/file.rb

@@ -140,7 +140,7 @@ module Fog
         #     valid new_publics: public_read, private
         # 
         # @param [String] new_public
-        # @return [String] new_puplic 
+        # @return [String] new_public 
         # 
         def public=(new_public)
           if new_public

data/lib/fog/aws/parsers/compute/create_network_acl.rb

@@ -0,0 +1,28 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+        require 'fog/aws/parsers/compute/network_acl_parser'
+
+        class CreateNetworkAcl < NetworkAclParser
+          def reset
+            super
+            @response = { 'networkAcl' => {} }
+          end
+
+          def end_element(name)
+            case name
+            when 'requestId'
+              @response[name] = value
+            when 'networkAcl'
+              @response['networkAcl'] = @network_acl
+              reset_nacl
+            else
+              super
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/compute/create_subnet.rb

@@ -7,7 +7,7 @@ module Fog
 
           def reset
             @subnet = { 'tagSet' => {} }
-            @response = { 'subnetSet' => [] }
+            @response = { 'subnet' => [] }
             @tag = {}
           end
 
@@ -35,8 +35,7 @@ module Fog
               when 'subnetId', 'state', 'vpcId', 'cidrBlock', 'availableIpAddressCount', 'availabilityZone'
                 @subnet[name] = value
               when 'subnet'
-                @response['subnetSet'] << @subnet
-                @subnet = { 'tagSet' => {} }
+                @response['subnet'] = @subnet
               when 'requestId'
                 @response[name] = value
               end

data/lib/fog/aws/parsers/compute/describe_network_acls.rb

@@ -0,0 +1,42 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+        require 'fog/aws/parsers/compute/network_acl_parser'
+
+        class DescribeNetworkAcls < NetworkAclParser
+          def reset
+            super
+            @response = { 'networkAclSet' => [] }
+            @item_level = 0
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'item'
+              @item_level += 1
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'requestId'
+              @response[name] = value
+            when 'item'
+              @item_level -= 1
+              if @item_level == 0
+                @response['networkAclSet'] << @network_acl
+                reset_nacl
+              else
+                super
+              end
+            else
+              super
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/compute/describe_reserved_instances.rb

@@ -5,9 +5,25 @@ module Fog
 
         class DescribeReservedInstances < Fog::Parsers::Base
 
+          def get_default_item
+            {'tagSet' => {}, 'recurringCharges' => {}}
+          end
+
           def reset
-            @reserved_instance = {}
+            @context = []
+            # Note:  <recurringCharges> should also be handled as a set, but do not want to disrupt anyone relying on
+            # it currently being flatted
+            @contexts = ['reservedInstancesSet', 'tagSet']
+            @reserved_instance = get_default_item
             @response = { 'reservedInstancesSet' => [] }
+            @tag = {}
+          end
+
+          def start_element(name, attrs = [])
+            super
+            if @contexts.include?(name)
+              @context.push(name)
+            end
           end
 
           def end_element(name)
@@ -18,9 +34,19 @@ module Fog
               @reserved_instance[name] = value.to_i
             when 'fixedPrice', 'amount', 'usagePrice'
               @reserved_instance[name] = value.to_f
+            when *@contexts
+              @context.pop
             when 'item'
-              @response['reservedInstancesSet'] << @reserved_instance
-              @reserved_instance = {}
+              case @context.last
+              when 'reservedInstancesSet'
+                @response['reservedInstancesSet'] << @reserved_instance
+                @reserved_instance = get_default_item
+              when 'tagSet'
+                @reserved_instance['tagSet'][@tag['key']] = @tag['value']
+                @tag = {}
+              end
+            when 'key', 'value'
+              @tag[name] = value
             when 'requestId'
               @response[name] = value
             when 'start','end'

data/lib/fog/aws/parsers/compute/network_acl_parser.rb

@@ -0,0 +1,105 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+
+        class NetworkAclParser < Fog::Parsers::Base
+          def reset_nacl
+            @network_acl = { 'associationSet' => [], 'entrySet' => [], 'tagSet' => {} }
+            @association = {}
+            @entry = { 'icmpTypeCode' => {}, 'portRange' => {} }
+            @tag = {}
+            
+            @in_entry_set       = false
+            @in_association_set = false
+            @in_tag_set         = false
+            @in_port_range      = false
+            @in_icmp_type_code  = false
+          end
+
+          def reset
+            reset_nacl
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'entrySet'
+              @in_entry_set = true
+            when 'associationSet'
+              @in_association_set = true
+            when 'tagSet'
+              @in_tag_set = true
+            when 'portRange'
+              @in_port_range = true
+            when 'icmpTypeCode'
+              @in_icmp_type_code = true
+            end
+          end
+
+          def end_element(name)
+            if @in_entry_set
+              if @in_port_range
+                case name
+                when 'portRange'
+                  @in_port_range = false
+                when 'from', 'to'
+                  @entry['portRange'][name] = value.to_i
+                end
+              elsif @in_icmp_type_code
+                case name
+                when 'icmpTypeCode'
+                  @in_icmp_type_code = false
+                when 'code', 'type'
+                  @entry['icmpTypeCode'][name] = value.to_i
+                end
+              else
+                case name
+                when 'entrySet'
+                  @in_entry_set = false
+                when 'item'
+                  @network_acl['entrySet'] << @entry
+                  @entry = { 'icmpTypeCode' => {}, 'portRange' => {} }
+                when 'ruleNumber', 'protocol'
+                  @entry[name] = value.to_i
+                when 'ruleAction', 'cidrBlock'
+                  @entry[name] = value
+                when 'egress'
+                  @entry[name] = value == 'true'
+                end
+              end
+            elsif @in_association_set
+              case name
+              when 'associationSet'
+                @in_association_set = false
+              when 'item'
+                @network_acl['associationSet'] << @association
+                @association = {}
+              when 'networkAclAssociationId', 'networkAclId', 'subnetId'
+                @association[name] = value
+              end
+            elsif @in_tag_set
+              case name
+              when 'tagSet'
+                @in_tag_set = false
+              when 'item'
+                @network_acl['tagSet'][@tag['key']] = @tag['value']
+                @tag = {}
+              when 'key', 'value'
+                @tag[name] = value
+              end
+            else
+              case name
+              when 'networkAclId', 'vpcId'
+                @network_acl[name] = value
+              when 'default'
+                @network_acl[name] = value == 'true'
+              end
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/compute/network_interface_parser.rb

@@ -11,6 +11,7 @@ module Fog
             @in_group_set   = false
             @in_attachment  = false
             @in_association = false
+            @in_private_ip_addresses = false
           end
 
           def reset
@@ -32,6 +33,10 @@ module Fog
             when 'association'
               @in_association = true
               @association    = {}
+            when 'privateIpAddressesSet'
+              @in_private_ip_addresses = true
+              @private_ip_addresses  = []
+              @private_ip_address = {}
             end
           end
 
@@ -72,6 +77,17 @@ module Fog
                 @nic['association'] = @association
                 @in_association     = false
               end
+            elsif @in_private_ip_addresses
+              case name
+              when 'item'
+                @private_ip_addresses << @private_ip_address
+                @private_ip_address = {}
+              when 'privateIpAddress', 'privateDnsName', 'primary'
+                @private_ip_address[name] = value
+              when 'privateIpAddressesSet'
+                @nic['privateIpAddresses'] = @private_ip_addresses
+                @in_private_ip_address = false
+              end
             else
               case name
               when 'networkInterfaceId', 'subnetId', 'vpcId', 'availabilityZone', 'description', 'ownerId', 'requesterId',

data/lib/fog/aws/parsers/compute/replace_network_acl_association.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+        class ReplaceNetworkAclAssociation < Fog::Parsers::Base
+          def reset
+            @response = {}
+          end
+
+          def end_element(name)
+            case name
+            when 'requestId', 'newAssociationId'
+              @response[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/compute/run_instances.rb

@@ -75,7 +75,7 @@ module Fog
             when 'ebsOptimized'
               @instance['ebsOptimized'] = (value == 'true')
             when 'associatePublicIP'
-              @instance['associatePublicIP'] = (value == 'true')              
+              @instance['associatePublicIP'] = (value == 'true')
             end
           end
 

data/lib/fog/aws/parsers/elasticache/cache_cluster_parser.rb

@@ -51,8 +51,8 @@ module Fog
               @cache_cluster[name] = DateTime.parse(value)
             when 'CacheSecurityGroup'
               @cache_cluster["#{name}s"] << @security_group unless @security_group.empty?
-            when 'CacheSecurityGroupName', 'Status'
-              @security_group[name] = value
+            when 'CacheSecurityGroupName', 'Status', 'CacheSubnetGroupName'
+              @cache_cluster[name] = value
             when 'CacheNode'
               @cache_cluster["#{name}s"] << @cache_node unless @cache_node.empty?
               @cache_node = nil

data/lib/fog/aws/parsers/elasticache/create_cache_subnet_group.rb

@@ -0,0 +1,38 @@
+module Fog
+  module Parsers
+    module AWS
+      module Elasticache
+
+        require 'fog/aws/parsers/elasticache/subnet_group_parser'
+
+        class CreateCacheSubnetGroup < Fog::Parsers::AWS::Elasticache::SubnetGroupParser
+
+          def reset
+            @response = { 'CreateCacheSubnetGroupResult' => {}, 'ResponseMetadata' => {} }
+            super
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'DBSubnetGroup' then
+              @response['CreateCacheSubnetGroupResult']['CacheSubnetGroup'] = @cache_subnet_group
+              @cache_subnet_group = fresh_subnet_group
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+            else
+              super
+            end
+
+          end
+
+        end
+
+      end
+    end
+  end
+end
+

data/lib/fog/aws/parsers/elasticache/describe_cache_subnet_groups.rb

@@ -0,0 +1,38 @@
+module Fog
+  module Parsers
+    module AWS
+      module Elasticache
+
+        require 'fog/aws/parsers/elasticache/subnet_group_parser'
+
+        class DescribeCacheSubnetGroups < Fog::Parsers::AWS::Elasticache::SubnetGroupParser
+
+          def reset
+            @response = { 'DescribeCacheSubnetGroupsResult' => {'CacheSubnetGroups' => []}, 'ResponseMetadata' => {} }
+            super
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'CacheSubnetGroup'
+              @response['DescribeCacheSubnetGroupsResult']['CacheSubnetGroups'] << @cache_subnet_group
+              @cache_subnet_group = fresh_subnet_group
+            when 'Marker'
+              @response['DescribeCacheSubnetGroupsResult']['Marker'] = value
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+            else
+              super
+            end
+
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/elasticache/subnet_group_parser.rb

@@ -0,0 +1,38 @@
+module Fog
+  module Parsers
+    module AWS
+      module Elasticache
+
+        class SubnetGroupParser < Fog::Parsers::Base
+
+          def reset
+            @cache_subnet_group = fresh_subnet_group
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'VpcId' then @cache_subnet_group['VpcId'] = value
+            when 'SubnetGroupStatus' then @cache_subnet_group['SubnetGroupStatus'] = value
+            when 'CacheSubnetGroupDescription' then @cache_subnet_group['CacheSubnetGroupDescription'] = value
+            when 'CacheSubnetGroupName' then @cache_subnet_group['CacheSubnetGroupName'] = value
+            when 'SubnetIdentifier' then @cache_subnet_group['Subnets'] << value
+            when 'Marker'
+              @response['DescribeCacheSubnetGroupsResult']['Marker'] = value
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+            end
+          end
+
+          def fresh_subnet_group
+            {'Subnets' => []}
+          end
+
+        end
+      end
+    end
+  end
+end