fog-aws 3.5.2 → 3.6.6

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

@@ -14,6 +14,7 @@ module Fog
         attribute :associate_public_ip,      :aliases => 'associatePublicIP'
         attribute :availability_zone,        :aliases => 'availabilityZone'
         attribute :block_device_mapping,     :aliases => 'blockDeviceMapping'
+        attribute :hibernation_options,      :aliases => 'hibernationOptions'
         attribute :network_interfaces,       :aliases => 'networkInterfaces'
         attribute :client_token,             :aliases => 'clientToken'
         attribute :disable_api_termination,  :aliases => 'disableApiTermination'
@@ -144,6 +145,7 @@ module Fog
 
           options = {
             'BlockDeviceMapping'          => block_device_mapping,
+            'HibernationOptions'          => hibernation_options,
             'NetworkInterfaces'           => network_interfaces,
             'ClientToken'                 => client_token,
             'DisableApiTermination'       => disable_api_termination,
@@ -227,9 +229,9 @@ module Fog
           true
         end
 
-        def stop(force = false)
+        def stop(options = {})
           requires :id
-          service.stop_instances(id, force)
+          service.stop_instances(id, options)
           true
         end
 

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

@@ -22,6 +22,7 @@ module Fog
         #    ami_launch_index=nil,
         #    availability_zone=nil,
         #    block_device_mapping=nil,
+        #    hibernation_options=nil,
         #    network_interfaces=nil,
         #    client_token=nil,
         #    dns_name=nil,
@@ -119,6 +120,7 @@ module Fog
         #    ami_launch_index=0,
         #    availability_zone="us-east-1b",
         #    block_device_mapping=[],
+        #    hibernation_options=[],
         #    client_token=nil,
         #    dns_name="ec2-25-2-474-44.compute-1.amazonaws.com",
         #    groups=["default"],

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

@@ -7,12 +7,13 @@ module Fog
         attribute :description
         attribute :encrypted
         attribute :progress
-        attribute :created_at,  :aliases => 'startTime'
-        attribute :owner_id,    :aliases => 'ownerId'
-        attribute :state,       :aliases => 'status'
-        attribute :tags,        :aliases => 'tagSet'
-        attribute :volume_id,   :aliases => 'volumeId'
-        attribute :volume_size, :aliases => 'volumeSize'
+        attribute :created_at,     :aliases => 'startTime'
+        attribute :owner_id,       :aliases => 'ownerId'
+        attribute :state,          :aliases => 'status'
+        attribute :tags,           :aliases => 'tagSet'
+        attribute :volume_id,      :aliases => 'volumeId'
+        attribute :volume_size,    :aliases => 'volumeSize'
+        attribute :status_message, :aliases => 'statusMessage'
 
         def destroy
           requires :id

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

@@ -39,7 +39,7 @@ module Fog
         end
 
         def is_default?
-          require :is_default
+          requires :is_default
           is_default
         end
 
@@ -106,7 +106,13 @@ module Fog
 
         def save
           requires :cidr_block
-          data = service.create_vpc(cidr_block, { 'AmazonProvidedIpv6CidrBlock' => amazon_provided_ipv_6_cidr_block }).body['vpcSet'].first
+
+          options = {
+            'AmazonProvidedIpv6CidrBlock' => amazon_provided_ipv_6_cidr_block,
+            'InstanceTenancy' => tenancy
+          }
+
+          data = service.create_vpc(cidr_block, options).body['vpcSet'].first
           new_attributes = data.reject {|key,value| key == 'requestId'}
           new_attributes = data.reject {|key,value| key == 'requestId' || key == 'tagSet' }
           merge_attributes(new_attributes)

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

@@ -12,7 +12,6 @@ module Fog
         identity  :key,           :aliases => ['Name', 'name']
 
         attribute :creation_date, :aliases => 'CreationDate', :type => 'time'
-        attribute :location,      :aliases => 'LocationConstraint', :type => 'string'
 
         def acl=(new_acl)
           unless VALID_ACLS.include?(new_acl)

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

@@ -25,6 +25,7 @@ module Fog
         attribute :encryption_key,      :aliases => 'x-amz-server-side-encryption-customer-key'
         attribute :version,             :aliases => 'x-amz-version-id'
         attribute :kms_key_id,          :aliases => 'x-amz-server-side-encryption-aws-kms-key-id'
+        attribute :tags,                :aliases => 'x-amz-tagging'
 
         # @note Chunk size to use for multipart uploads.
         #     Use small chunk sizes to minimize memory. E.g. 5242880 = 5mb
@@ -192,6 +193,7 @@ module Fog
         # @option options [String] expires sets number of seconds before AWS Object expires.
         # @option options [String] storage_class sets x-amz-storage-class HTTP header. Defaults to 'STANDARD'. Or, 'REDUCED_REDUNDANCY'
         # @option options [String] encryption sets HTTP encryption header. Set to 'AES256' to encrypt files at rest on S3
+        # @option options [String] tags sets x-amz-tagging HTTP header. For example, 'Org-Id=1' or 'Org-Id=1&Service=MyService'
         # @return [Boolean] true if no errors
         #
         def save(options = {})
@@ -208,6 +210,7 @@ module Fog
           options['Expires'] = expires if expires
           options.merge!(metadata)
           options['x-amz-storage-class'] = storage_class if storage_class
+          options['x-amz-tagging'] = tags if tags
           options.merge!(encryption_headers)
 
           # With a single PUT operation you can upload objects up to 5 GB in size. Automatically set MP for larger objects.

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

@@ -5,7 +5,7 @@ module Fog
         class CreateSnapshot < Fog::Parsers::Base
           def end_element(name)
             case name
-            when 'description', 'ownerId', 'progress', 'snapshotId', 'status', 'volumeId'
+            when 'description', 'ownerId', 'progress', 'snapshotId', 'status', 'volumeId', 'statusMessage'
               @response[name] = value
             when 'requestId'
               @response[name] = value

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

@@ -7,6 +7,10 @@ module Fog
             @subnet = { 'tagSet' => {} }
             @response = { 'subnet' => [] }
             @tag = {}
+            @ipv6_cidr_block_association = {}
+            @in_tag_set = false
+            @in_ipv6_cidr_block_association_set = false
+            @in_cidr_block_state = false
           end
 
           def start_element(name, attrs = [])
@@ -14,19 +18,42 @@ module Fog
             case name
             when 'tagSet'
               @in_tag_set = true
+            when 'ipv6CidrBlockAssociationSet'
+              @in_ipv6_cidr_block_association_set = true
+            when 'ipv6CidrBlockState'
+              @in_cidr_block_state = true
             end
           end
 
           def end_element(name)
             if @in_tag_set
               case name
+              when 'item'
+                @subnet['tagSet'][@tag['key']] = @tag['value']
+                @tag = {}
+              when 'key', 'value'
+                @tag[name] = value
+              when 'tagSet'
+                @in_tag_set = false
+              end
+            elsif @in_ipv6_cidr_block_association_set
+              if @in_cidr_block_state
+                case name
+                when 'state'
+                  @ipv6_cidr_block_association['ipv6CidrBlockState'] = { name => value }
+                when 'ipv6CidrBlockState'
+                  @in_cidr_block_state = false
+                end
+              else
+                case name
                 when 'item'
-                  @subnet['tagSet'][@tag['key']] = @tag['value']
-                  @tag = {}
-                when 'key', 'value'
-                  @tag[name] = value
-                when 'tagSet'
-                  @in_tag_set = false
+                  @subnet['ipv6CidrBlockAssociationSet'] = @ipv6_cidr_block_association
+                  @ipv6_cidr_block_association = {}
+                when 'ipv6CidrBlock', 'associationId'
+                  @ipv6_cidr_block_association[name] = value
+                when 'ipv6CidrBlockAssociationSet'
+                  @in_ipv6_cidr_block_association_set = false
+                end
               end
             else
               case name

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

@@ -7,6 +7,10 @@ module Fog
             @subnet = { 'tagSet' => {} }
             @response = { 'subnetSet' => [] }
             @tag = {}
+            @ipv6_cidr_block_association = {}
+            @in_tag_set = false
+            @in_ipv6_cidr_block_association_set = false
+            @in_cidr_block_state = false
           end
 
           def start_element(name, attrs = [])
@@ -14,19 +18,42 @@ module Fog
             case name
             when 'tagSet'
               @in_tag_set = true
+            when 'ipv6CidrBlockAssociationSet'
+              @in_ipv6_cidr_block_association_set = true
+            when 'ipv6CidrBlockState'
+              @in_cidr_block_state = true
             end
           end
 
           def end_element(name)
             if @in_tag_set
               case name
+              when 'item'
+                @subnet['tagSet'][@tag['key']] = @tag['value']
+                @tag = {}
+              when 'key', 'value'
+                @tag[name] = value
+              when 'tagSet'
+                @in_tag_set = false
+              end
+            elsif @in_ipv6_cidr_block_association_set
+              if @in_cidr_block_state
+                case name
+                when 'state'
+                  @ipv6_cidr_block_association['ipv6CidrBlockState'] = { name => value }
+                when 'ipv6CidrBlockState'
+                  @in_cidr_block_state = false
+                end
+              else
+                case name
                 when 'item'
-                  @subnet['tagSet'][@tag['key']] = @tag['value']
-                  @tag = {}
-                when 'key', 'value'
-                  @tag[name] = value
-                when 'tagSet'
-                  @in_tag_set = false
+                  @subnet['ipv6CidrBlockAssociationSet'] = @ipv6_cidr_block_association
+                  @ipv6_cidr_block_association = {}
+                when 'ipv6CidrBlock', 'associationId'
+                  @ipv6_cidr_block_association[name] = value
+                when 'ipv6CidrBlockAssociationSet'
+                  @in_ipv6_cidr_block_association_set = false
+                end
               end
             else
               case name

data/lib/fog/aws/parsers/dns/create_hosted_zone.rb

@@ -16,7 +16,7 @@ module Fog
               case name
               when 'Id'
                 @hosted_zone[name] = value.sub('/hostedzone/', '')
-              when 'Name', 'CallerReference', 'Comment'
+              when 'Name', 'CallerReference', 'Comment', 'PrivateZone'
                 @hosted_zone[name]= value
               when 'HostedZone'
                 @response['HostedZone'] = @hosted_zone

data/lib/fog/aws/parsers/dns/get_hosted_zone.rb

@@ -17,14 +17,14 @@ module Fog
               case name
               when 'Id'
                 @hosted_zone[name]= value.sub('/hostedzone/', '')
-              when 'Name', 'CallerReference', 'Comment', 'PrivateZone', 'Config', 'ResourceRecordSetCount'
+              when 'Name', 'CallerReference', 'Comment', 'PrivateZone', 'Config'
                 @hosted_zone[name]= value
+              when 'ResourceRecordSetCount'
+                @hosted_zone['ResourceRecordSetCount'] = value.to_i
               when 'HostedZone'
                 @response['HostedZone'] = @hosted_zone
                 @hosted_zone = {}
                 @section = :name_servers
-              when 'ResourceRecordSetCount'
-                @response['ResourceRecordSetCount'] = value.to_i
               end
             elsif @section == :name_servers
               case name

data/lib/fog/aws/parsers/dns/list_hosted_zones.rb

@@ -13,8 +13,10 @@ module Fog
             case name
             when 'Id'
               @zone[name] = value.sub('/hostedzone/', '')
-            when 'Name', 'CallerReference', 'Comment'
+            when 'Name', 'CallerReference', 'Comment', 'PrivateZone'
               @zone[name] = value
+            when 'ResourceRecordSetCount'
+              @zone['ResourceRecordSetCount'] = value.to_i
             when 'HostedZone'
               @hosted_zones << @zone
               @zone = {}

data/lib/fog/aws/parsers/elbv2/create_load_balancer.rb

@@ -0,0 +1,88 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELBV2
+        class CreateLoadBalancer < Fog::Parsers::Base
+          def reset
+            reset_load_balancer
+            reset_availability_zone
+            @load_balancer_addresses = {}
+            @state = {}
+            @results = { 'LoadBalancers' => [] }
+            @response = { 'CreateLoadBalancerResult' => {}, 'ResponseMetadata' => {} }
+          end
+
+          def reset_load_balancer
+            @load_balancer = { 'SecurityGroups' => [], 'AvailabilityZones' => [] }
+          end
+
+          def reset_availability_zone
+            @availability_zone = { 'LoadBalancerAddresses' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'AvailabilityZones'
+              @in_availability_zones = true
+            when 'LoadBalancerAddresses'
+              @in_load_balancer_addresses = true
+            when 'SecurityGroups'
+              @in_security_groups = true
+            when 'State'
+              @in_state = true
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'member'
+              if @in_availability_zones && @in_load_balancer_addresses
+                @availability_zone['LoadBalancerAddresses'] << @load_balancer_addresses
+              elsif @in_availability_zones
+                @load_balancer['AvailabilityZones'] << @availability_zone
+                reset_availability_zone
+              elsif @in_security_groups
+                @load_balancer['SecurityGroups'] << value
+              else
+                @results['LoadBalancers'] << @load_balancer
+                reset_load_balancer
+              end
+            when 'SubnetId', 'ZoneName'
+              @availability_zone[name] = value
+            when 'IpAddress', 'AllocationId'
+              @load_balancer_addresses[name] = value
+
+            when 'CanonicalHostedZoneName', 'CanonicalHostedZoneNameID', 'LoadBalancerName', 'DNSName', 'Scheme', 'Type',
+                 'LoadBalancerArn', 'IpAddressType', 'CanonicalHostedZoneId', 'VpcId'
+              @load_balancer[name] = value
+            when 'CreatedTime'
+              @load_balancer[name] = Time.parse(value)
+
+            when 'LoadBalancerAddresses'
+              @in_load_balancer_addresses = false
+            when 'AvailabilityZones'
+              @in_availability_zones = false
+            when 'SecurityGroups'
+              @in_security_groups = false
+            when 'State'
+              @in_state = false
+              @load_balancer[name] = @state
+              @state = {}
+            when 'Code'
+              @state[name] = value
+
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+
+            when 'NextMarker'
+              @results['NextMarker'] = value
+            when 'CreateLoadBalancerResponse'
+              @response['CreateLoadBalancerResult'] = @results
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/elbv2/describe_listeners.rb

@@ -0,0 +1,110 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELBV2
+        class DescribeListeners < Fog::Parsers::Base
+          def reset
+            reset_listener
+            @default_action = {}
+            @certificate = {}
+            @config = {}
+            @target_groups = []
+            @target_group = {}
+            @target_group_stickiness_config = {}
+            @results = { 'Listeners' => [] }
+            @response = { 'DescribeListenersResult' => {}, 'ResponseMetadata' => {} }
+          end
+
+          def reset_listener
+            @listener= { 'DefaultActions' => [], 'Certificates' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'DefaultActions'
+              @in_default_actions = true
+            when 'Certificates'
+              @in_certificates = true
+            when 'TargetGroups'
+              @in_target_groups = true
+            when 'TargetGroupStickinessConfig'
+              @in_target_group_stickiness_config = true
+            end
+          end
+
+          def end_element(name)
+            if @in_default_actions
+              case name
+              when 'member'
+                if @in_target_groups
+                  @target_groups << @target_group
+                  @target_group = {}
+                else
+                  @listener['DefaultActions'] << @default_action
+                  @default_action = {}
+                end
+              when 'TargetGroupArn'
+                if @in_target_groups
+                  @target_group[name] = value
+                else
+                  @default_action[name] = value
+                end
+              when 'Weight'
+                @target_group[name] = value
+              when 'Type', 'Order'
+                @default_action[name] = value
+              when 'Path', 'Protocol', 'Port', 'Query', 'Host', 'StatusCode', 'ContentType',
+                   'MessageBody', 'StatusCode'
+                @config[name] = value
+              when 'RedirectConfig', 'ForwardConfig', 'FixedResponseConfig'
+                @default_action[name] = @config
+                @config = {}
+              when 'DurationSeconds', 'Enabled'
+                @target_group_stickiness_config[name] = value
+              when 'DefaultActions'
+                @in_default_actions = false
+              when 'TargetGroupStickinessConfig'
+                if @in_target_group_stickiness_config
+                  @config['TargetGroupStickinessConfig'] = @target_group_stickiness_config
+                  @in_target_group_stickiness_config = false
+                  @target_group_stickiness_config = {}
+                end
+              when 'TargetGroups'
+                @config['TargetGroups'] = @target_groups
+                @in_target_groups = false
+                @target_groups = []
+              end
+            else
+              case name
+              when 'member'
+                if @in_certificates
+                  @listener['Certificates'] << @certificate
+                  @certificate = {}
+                else
+                  @results['Listeners'] << @listener
+                  reset_listener
+                end
+              when 'LoadBalancerArn', 'Protocol', 'Port', 'ListenerArn', 'SslPolicy'
+                @listener[name] = value
+              when 'CertificateArn'
+                @certificate[name] = value
+              when 'Certificates'
+                @in_certificates = false
+
+              when 'RequestId'
+                @response['ResponseMetadata'][name] = value
+
+              when 'NextMarker'
+                @results['NextMarker'] = value
+
+              when 'DescribeListenersResponse'
+                @response['DescribeListenersResult'] = @results
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end