fog 1.15.0 → 1.16.0

data/lib/fog/aws/models/compute/server.rb

@@ -12,6 +12,7 @@ module Fog
 
         attr_accessor :architecture
         attribute :ami_launch_index,         :aliases => 'amiLaunchIndex'
+        attribute :associate_public_ip,      :aliases => 'associatePublicIP'
         attribute :availability_zone,        :aliases => 'availabilityZone'
         attribute :block_device_mapping,     :aliases => 'blockDeviceMapping'
         attribute :network_interfaces,       :aliases => 'networkInterfaces'
@@ -172,6 +173,20 @@ module Fog
           # use of Security Group Ids when working in a VPC.
           if subnet_id
             options.delete('SecurityGroup')
+            if associate_public_ip
+              options['NetworkInterface.0.DeviceIndex'] = 0
+              options['NetworkInterface.0.AssociatePublicIpAddress'] = associate_public_ip
+              options['NetworkInterface.0.SubnetId'] = options['SubnetId']
+              options.delete('SubnetId')
+              if options['SecurityGroupId'].kind_of?(Array)
+                options['SecurityGroupId'].each {|id|
+                  options["NetworkInterface.0.SecurityGroupId.#{options['SecurityGroupId'].index(id)}"] = id
+                }
+              else
+                options["NetworkInterface.0.SecurityGroupId.0"] = options['SecurityGroupId']
+              end
+              options.delete('SecurityGroupId')              
+            end
           else
             options.delete('SubnetId')
           end

data/lib/fog/aws/models/compute/subnet.rb

@@ -43,7 +43,9 @@ module Fog
 
         def save
           requires :vpc_id, :cidr_block
-          data = service.create_subnet(vpc_id, cidr_block).body['subnetSet'].first
+          options = {}
+          options['AvailabilityZone'] = availability_zone if availability_zone
+          data = service.create_subnet(vpc_id, cidr_block, options).body['subnetSet'].first
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
           true

data/lib/fog/aws/models/elasticache/cluster.rb

@@ -29,6 +29,8 @@ module Fog
         attribute :notification_config,
           :aliases => 'NotificationConfiguration', :type => :hash
 
+        attr_accessor :parameter_group_name
+
         def ready?
           status == 'available'
         end
@@ -57,7 +59,7 @@ module Fog
               :port                         => port,
               :preferred_availablility_zone => zone,
               :preferred_maintenance_window => maintenance_window,
-              :parameter_group_name => parameter_group['CacheParameterGroupName'],
+              :parameter_group_name         => parameter_group_name || parameter_group['CacheParameterGroupName'],
             }
           )
         end

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

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

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

@@ -0,0 +1,75 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+
+        class CreateRouteTable < Fog::Parsers::Base
+
+          def reset
+            @in_route_set = false
+            @in_association_set = false
+            @route = {}
+            @association = {}
+            @route_table = { 'routeSet' => [], 'tagSet' => {}, 'associationSet' => [] }
+            @response = { 'routeTable' => [] }
+            @tag = {}
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'tagSet'
+              @in_tag_set = true
+            when 'routeSet'
+              @in_route_set = true
+            when 'associationSet'
+              @in_association_set = true
+            end
+          end
+
+          def end_element(name)
+            if @in_tag_set
+              case name
+                when 'item'
+                  @route_table['tagSet'][@tag['key']] = @tag['value']
+                  @tag = {}
+                when 'tagSet'
+                  @in_tag_set = false
+              end
+            elsif @in_route_set
+              case name
+              when 'routeSet'
+                @in_route_set = false
+              when 'destinationCidrBlock', 'gatewayId', 'state'
+                @route[name] = value
+              when 'item'
+                @route_table['routeSet'] << @route
+                @route = {}
+              end
+            elsif @in_association_set
+              case name
+              when 'routeTableAssociationId', 'routeTableId', 'main'
+                @association[name] = value
+              when 'associationSet'
+                @route_table['associationSet'] << @association
+                @in_association_set = false
+              end
+            else
+              case name
+              when 'routeTableId', 'vpcId'
+                @route_table[name] = value
+              when 'routeTable'
+                @response['routeTable'] << @route_table
+                @route_table = { 'routeSet' => {}, 'tagSet' => {}, 'associationSet' => {} }
+              when 'requestId'
+                @response[name] = value
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+

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

@@ -0,0 +1,85 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+
+        class DescribeRouteTables < Fog::Parsers::Base
+
+          def reset
+            @association = { 'routeTableAssociationId' => nil, 'routeTableId' => nil, 'subnetId' => nil, 'main' => false }
+            @in_association_set = false
+            @in_route_set = false
+            @route = { 'destinationCidrBlock' => nil, 'gatewayId' => nil, 'instanceId' => nil, 'instanceOwnerId' => nil, 'networkInterfaceId' => nil, 'state' => nil, 'origin' => nil }
+            @response = { 'routeTableSet' => [] }
+            @tag = {}
+            @route_table = { 'associationSet' => [], 'tagSet' => {}, 'routeSet' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'associationSet'
+              @in_association_set = true
+            when 'tagSet'
+              @in_tag_set = true
+            when 'routeSet'
+              @in_route_set = true
+            end
+          end
+
+          def end_element(name)
+            if @in_association_set
+              case name
+              when 'associationSet'
+                @in_association_set = false
+              when 'routeTableAssociationId', 'routeTableId', 'subnetId'
+                @association[name] = value
+              when 'main'
+                if value == 'true'
+                  @association[name] = true
+                else
+                  @association[name] = false
+                end
+              when 'item'
+                @route_table['associationSet'] << @association
+                @association = { 'routeTableAssociationId' => nil, 'routeTableId' => nil, 'subnetId' => nil, 'main' => false }
+              end
+            elsif @in_tag_set
+              case name
+              when 'key', 'value'
+                @tag[name] = value
+              when 'item'
+                @route_table['tagSet'][@tag['key']] = @tag['value']
+                @tag = {}
+              when 'tagSet'
+                @in_tag_set = false
+              end
+            elsif @in_route_set
+              case name
+              when 'destinationCidrBlock', 'gatewayId', 'instanceId', 'instanceOwnerId', 'networkInterfaceId', 'state', 'origin'
+                @route[name] = value
+              when 'item'
+                @route_table['routeSet'] << @route
+                @route = { 'destinationCidrBlock' => nil, 'gatewayId' => nil, 'instanceId' => nil, 'instanceOwnerId' => nil, 'networkInterfaceId' => nil, 'state' => nil, 'origin' => nil }
+              when 'routeSet'
+                @in_route_set = false
+              end
+            else
+              case name
+              when 'routeTableId', 'vpcId'
+                @route_table[name] = value
+              when 'item'
+                @response['routeTableSet'] << @route_table
+                @route_table = { 'associationSet' => [], 'tagSet' => {}, 'routeSet' => [] }
+              when 'requestId'
+                @response[name] = value
+              end
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -74,6 +74,8 @@ module Fog
               @response[name] = value
             when 'ebsOptimized'
               @instance['ebsOptimized'] = (value == 'true')
+            when 'associatePublicIP'
+              @instance['associatePublicIP'] = (value == 'true')              
             end
           end
 

data/lib/fog/aws/parsers/iam/get_group_policy.rb

@@ -7,15 +7,21 @@ module Fog
         # http://docs.amazonwebservices.com/IAM/latest/APIReference/API_GetGroupPolicy.html
 
           def reset
-            @response = {}
+            @response = { 'Policy' => {} }
           end
 
           def end_element(name)
             case name
-            when 'GroupName', 'PolicyName', 'PolicyDocument'
-              @response[name] = @value
+            when 'GroupName', 'PolicyName'
+              @response[name] = value
+            when 'PolicyDocument'
+              @response['Policy'][name] = if decoded_string = URI.decode(value)
+                                  Fog::JSON.decode(decoded_string) rescue value
+                                else
+                                  value
+                                end
             when 'RequestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 

data/lib/fog/aws/parsers/redshift/cluster.rb

@@ -0,0 +1,29 @@
+module Fog
+  module Parsers
+    module Redshift
+      module AWS
+        require 'fog/aws/parsers/redshift/cluster_parser'
+
+        class Cluster < ClusterParser
+          def reset
+            super
+            @response = {}
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            super
+            case name
+            when 'Cluster'
+              @response = {name => @cluster}
+            end
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/fog/aws/parsers/redshift/cluster_parser.rb

@@ -0,0 +1,144 @@
+module Fog
+  module Parsers
+    module Redshift
+      module AWS
+
+        class ClusterParser < Fog::Parsers::Base
+          # :cluster_identifier - (String)
+          # :node_type - (String)
+          # :cluster_status - (String)
+          # :modify_status - (String)
+          # :master_username - (String)
+          # :db_name - (String)
+          # :endpoint - (Hash)
+          #   :address - (String)
+          #   :port - (Integer)
+          # :cluster_create_time - (Time)
+          # :automated_snapshot_retention_period - (Integer)
+          # :cluster_security_groups - (Array)
+          #   :cluster_security_group_name - (String)
+          #   :status - (String)
+          # :vpc_security_groups - (Array)
+          #   :vpc_security_group_id - (String)
+          #   :status - (String)
+          # :cluster_parameter_groups - (Array)
+          #   :parameter_group_name - (String)
+          #   :parameter_apply_status - (String)
+          # :cluster_subnet_group_name - (String)
+          # :vpc_id - (String)
+          # :availability_zone - (String)
+          # :preferred_maintenance_window - (String)
+          # :pending_modified_values - (Hash)
+          #   :master_user_password - (String)
+          #   :node_type - (String)
+          #   :number_of_nodes - (Integer)
+          #   :cluster_type - (String)
+          #   :cluster_version - (String)
+          #   :automated_snapshot_retention_period - (Integer)
+          # :cluster_version - (String)
+          # :allow_version_upgrade - (Boolean)
+          # :number_of_nodes - (Integer)
+          # :publicly_accessible - (Boolean)
+          # :encrypted - (Boolean)
+          # :restore_status - (Hash)
+          #   :status - (String)
+          #   :current_restore_rate_in_mega_bytes_per_second - (Numeric)
+          #   :snapshot_size_in_mega_bytes - (Integer)
+          #   :progress_in_mega_bytes - (Integer)
+          #   :elapsed_time_in_seconds - (Integer)
+          #   :estimated_time_to_completion_in_seconds - (Integer)
+
+          def reset
+            @cluster = fresh_cluster
+          end
+
+          def fresh_cluster
+            { 'ClusterParameterGroups' => [], 'ClusterSecurityGroups' => [], 'VpcSecurityGroups' => [], 
+              'EndPoint' => {}, 'PendingModifiedValues'=> {}, 'RestoreStatus' => {}}
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'ClusterSecurityGroups'
+              @in_cluster_security_groups = true
+              @cluster_security_group = {}
+            when 'ClusterParameterGroups'
+              @cluster_parameter_group = {}
+            when 'VpcSecurityGroups'
+              @in_vpc_security_groups = true
+              @vpc_security_group = {}
+            when 'PendingModifiedValues'
+              @in_pending_modified_values = true
+            end
+          end
+
+          def end_element(name)            
+            case name
+            when 'AvailabilityZone', 'ClusterIdentifier', 'ClusterStatus', 'ClusterSubnetGroupName', 'DBName', 
+              'MasterUsername', 'ModifyStatus', 'PreferredMaintenanceWindow', 'VpcId'
+              @cluster[name] = value
+            when 'ClusterCreateTime'
+              @cluster[name] = Time.parse(value)
+            when 'AllowVersionUpgrade', 'Encrypted', 'PubliclyAccessible'
+              @cluster[name] = (value == "true")
+            when 'Address'
+              @cluster['EndPoint'][name] = value            
+            when 'Port'
+              @cluster['EndPoint'][name] = value.to_i
+            when 'NodeType', 'ClusterVersion'
+              if @in_pending_modified_values
+                @cluster['PendingModifiedValues'][name] = value
+              else
+                @cluster[name] = value
+              end
+            when 'NumberOfNodes', 'AutomatedSnapshotRetentionPeriod'
+              if @in_pending_modified_values
+                @cluster['PendingModifiedValues'][name] = value.to_i
+              else
+                @cluster[name] = value.to_i
+              end
+            when 'MasterUserPassword', 'ClusterType'
+              @cluster['PendingModifiedValues'][name] = value
+            when 'Status'
+              if @in_vpc_security_groups
+                @vpc_security_group[name] = value
+              elsif @in_cluster_security_groups
+                @cluster_security_group[name] = value
+              else
+                @cluster['RestoreStatus'][name] = value
+              end
+            when 'ParameterGroupName', 'ParameterApplyStatus'
+              @cluster_parameter_group[name] = value
+            when 'ClusterSecurityGroupName'
+              @cluster_security_group[name] = value
+            when 'VpcSecurityGroupId'
+              @vpc_security_group[name] = value
+            when 'SnapshotSizeInMegaBytes', 'ProgressInMegaBytes', 'ElapsedTimeInSeconds', 'EstimatedTimeToCompletionInSeconds'
+              @cluster['RestoreStatus'][name] = value.to_i
+            when 'CurrentRestoreRateInMegaBytesPerSecond'
+              @cluster['RestoreStatus'][name] = value.to_f
+
+            when 'ClusterSecurityGroups'
+              @in_cluster_security_groups = false
+            when 'VpcSecurityGroups'
+              @in_vpc_security_groups = false
+            when 'PendingModifiedValues'
+              @in_pending_modified_values = false
+
+            when 'ClusterParameterGroup'
+              @cluster['ClusterParameterGroups'] << {name => @cluster_parameter_group}
+              @cluster_parameter_group = {}
+            when 'ClusterSecurityGroup'
+              @cluster['ClusterSecurityGroups'] << {name => @cluster_security_group}
+              @cluster_security_group = {}
+            when 'VpcSecurityGroup'
+              @cluster['VpcSecurityGroups'] << {name => @vpc_security_group}
+              @vpc_security_group = {}
+            end
+          end
+        end
+      end
+    end
+  end
+end