fog-aws 0.11.0 → 3.18.0

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Image < Fog::Model
         identity :id,                     :aliases => 'imageId'
 
@@ -22,6 +22,8 @@ module Fog
         attribute :tags,                  :aliases => 'tagSet'
         attribute :name
         attribute :virtualization_type,   :aliases => 'virtualizationType'
+        attribute :creation_date,         :aliases => 'creationDate'
+        attribute :ena_support,           :aliases => 'enaSupport'
 
         def deregister(delete_snapshot = false)
           service.deregister_image(id)

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

@@ -1,12 +1,12 @@
 require 'fog/aws/models/compute/image'
 
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Images < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::Image
+        model Fog::AWS::Compute::Image
 
         # Creates a new Amazon machine image
         #
@@ -32,7 +32,9 @@ module Fog
         #    ramdisk_id=nil,
         #    root_device_type=nil,
         #    root_device_name=nil,
-        #    tags=nil
+        #    tags=nil,
+        #    creation_date=nil,
+        #    ena_support=nil
         #  >
         #
 

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class InternetGateway < Fog::Model
         identity  :id,                          :aliases => 'internetGatewayId'
         attribute :attachment_set,              :aliases => 'attachmentSet'

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

@@ -1,12 +1,12 @@
 require 'fog/aws/models/compute/internet_gateway'
 
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class InternetGateways < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::InternetGateway
+        model Fog::AWS::Compute::InternetGateway
 
         # Creates a new internet gateway
         #
@@ -17,7 +17,7 @@ module Fog
         # Returns the details of the new InternetGateway
         #
         #>> AWS.internet_gateways.new
-        #=>   <Fog::Compute::AWS::InternetGateway
+        #=>   <Fog::AWS::Compute::InternetGateway
         #id=nil,
         #attachment_set=nil,
         #tag_set=nil
@@ -38,10 +38,10 @@ module Fog
         # Returns an array of all InternetGateways
         #
         #>> AWS.internet_gateways.all
-        #<Fog::Compute::AWS::InternetGateways
+        #<Fog::AWS::Compute::InternetGateways
         #filters={}
         #[
-        #<Fog::Compute::AWS::InternetGateway
+        #<Fog::AWS::Compute::InternetGateway
         #id="igw-some-id",
         #attachment_set={"vpcId"=>"vpc-some-id", "state"=>"available"},
         #tag_set={}
@@ -68,7 +68,7 @@ module Fog
         # ==== Returns
         #
         #>> AWS.internet_gateways.get("igw-12345678")
-        #=>   <Fog::Compute::AWS::InternetGateway
+        #=>   <Fog::AWS::Compute::InternetGateway
         #id="igw-12345678",
         #attachment_set={"vpcId"=>"vpc-12345678", "state"=>"available"},
         #tag_set={}

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class KeyPair < Fog::Model
         identity  :name,        :aliases => 'keyName'
 

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

@@ -1,13 +1,13 @@
 require 'fog/aws/models/compute/key_pair'
 
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class KeyPairs < Fog::Collection
         attribute :filters
         attribute :key_name
 
-        model Fog::Compute::AWS::KeyPair
+        model Fog::AWS::Compute::KeyPair
 
         # Used to create a key pair.  There are 3 arguments and only name is required.  You can generate a new key_pair as follows:
         # AWS.key_pairs.create(:name => "test", :fingerprint => "123", :private_key => '234234')

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class NetworkAcl < Fog::Model
         ICMP = 1
         TCP  = 6
@@ -25,7 +25,7 @@ module Fog
 
         # Add a new rule
         #
-        # network_acl.add_rule(100, Fog::Compute::AWS::NetworkAcl::TCP, 'allow', '0.0.0.0/0', true, 'PortRange.From' => 22, 'PortRange.To' => 22)
+        # network_acl.add_rule(100, Fog::AWS::Compute::NetworkAcl::TCP, 'allow', '0.0.0.0/0', true, 'PortRange.From' => 22, 'PortRange.To' => 22)
         #
         # ==== Parameters
         # * rule_number<~Integer>   - The rule number for the entry, between 100 and 32766
@@ -91,7 +91,7 @@ module Fog
 
         # Update a specific rule number
         #
-        # network_acl.update_rule(100, Fog::Compute::AWS::NetworkAcl::TCP, 'allow', '0.0.0.0/0', true, 'PortRange.From' => 22, 'PortRange.To' => 22)
+        # network_acl.update_rule(100, Fog::AWS::Compute::NetworkAcl::TCP, 'allow', '0.0.0.0/0', true, 'PortRange.From' => 22, 'PortRange.To' => 22)
         #
         # ==== Parameters
         # * rule_number<~Integer>   - The rule number for the entry, between 100 and 32766

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

@@ -1,12 +1,12 @@
 require 'fog/aws/models/compute/network_acl'
 
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class NetworkAcls < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::NetworkAcl
+        model Fog::AWS::Compute::NetworkAcl
 
         # Creates a new network ACL
         #
@@ -16,7 +16,7 @@ module Fog
         #
         # Returns the details of the new network ACL
         #
-        #>> <Fog::Compute::AWS::NetworkAcl
+        #>> <Fog::AWS::Compute::NetworkAcl
         #     network_acl_id=nil,
         #     vpc_id=nil,
         #     default=nil,
@@ -42,7 +42,7 @@ module Fog
         #  <Fog::AWS::Compute::NetworkAcls
         #    filters={}
         #    [
-        #      <Fog::Compute::AWS::NetworkAcl
+        #      <Fog::AWS::Compute::NetworkAcl
         #        network_acl_id="acl-abcdefgh",
         #        vpc_id="vpc-abcdefgh",
         #        default=true,
@@ -93,7 +93,7 @@ module Fog
         # ==== Returns
         #
         #>> AWS.network_acls.get("acl-abcdefgh")
-        #  <Fog::Compute::AWS::NetworkAcl
+        #  <Fog::AWS::Compute::NetworkAcl
         #    network_acl_id="acl-abcdefgh",
         #    vpc_id="vpc-abcdefgh",
         #    default=true,

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class NetworkInterface < Fog::Model
         identity  :network_interface_id,        :aliases => 'networkInterfaceId'
         attribute :state

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

@@ -1,12 +1,12 @@
 require 'fog/aws/models/compute/network_interface'
 
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class NetworkInterfaces < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::NetworkInterface
+        model Fog::AWS::Compute::NetworkInterface
 
         # Creates a new network interface
         #
@@ -58,7 +58,7 @@ module Fog
         #  <Fog::AWS::Compute::NetworkInterfaces
         #    filters={}
         #    [
-        #      <Fog::Compute::AWS::NetworkInterface
+        #      <Fog::AWS::Compute::NetworkInterface
         #        network_interface_id="eni-da5dc7ca",
         #        state=nil,
         #        request_id=nil,

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class RouteTable < Fog::Model
         identity :id,                :aliases => 'routeTableId'
 

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

@@ -1,12 +1,12 @@
 require 'fog/aws/models/compute/route_table'
 
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class RouteTables < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::RouteTable
+        model Fog::AWS::Compute::RouteTable
 
         # Creates a new route table
         #
@@ -17,7 +17,7 @@ module Fog
         # Returns the details of the new route table
         #
         #>> AWS.route_tables.new
-        # <Fog::Compute::AWS::RouteTable
+        # <Fog::AWS::Compute::RouteTable
         # id=nil,
         # vpc_id=nil,
         # routes=nil,
@@ -40,10 +40,10 @@ module Fog
         # Returns an array of all route tables
         #
         #>> AWS.route_tables.all
-        # <Fog::Compute::AWS::RouteTables
+        # <Fog::AWS::Compute::RouteTables
         # filters={}
         # [
-        # <Fog::Compute::AWS::RouteTable
+        # <Fog::AWS::Compute::RouteTable
         # id="rtb-41e8552f",
         # TODO
         # >
@@ -70,7 +70,7 @@ module Fog
         # ==== Returns
         #
         #>> AWS.route_tables.get("rtb-41e8552f")
-        # <Fog::Compute::AWS::RouteTable
+        # <Fog::AWS::Compute::RouteTable
         # id="rtb-41e8552f",
         # TODO
         # >

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class SecurityGroup < Fog::Model
         identity  :name,            :aliases => 'groupName'
         attribute :description,     :aliases => 'groupDescription'
@@ -62,7 +62,8 @@ module Fog
         # options::
         #   A hash that can contain any of the following keys:
         #    :cidr_ip (defaults to "0.0.0.0/0")
-        #    :group - ("account:group_name" or "account:group_id"), cannot be used with :cidr_ip
+        #    :cidr_ipv6 cannot be used with :cidr_ip
+        #    :group - ("account:group_name" or "account:group_id"), cannot be used with :cidr_ip or :cidr_ipv6
         #    :ip_protocol (defaults to "tcp")
         #
         # == Returns:
@@ -82,22 +83,16 @@ module Fog
         def authorize_port_range(range, options = {})
           requires_one :name, :group_id
 
-          ip_permission = {
-            'FromPort'   => range.begin,
-            'ToPort'     => range.end,
-            'IpProtocol' => options[:ip_protocol] || 'tcp'
-          }
+          ip_permission = fetch_ip_permission(range, options)
 
-          if options[:group].nil?
-            ip_permission['IpRanges'] = [
-              { 'CidrIp' => options[:cidr_ip] || '0.0.0.0/0' }
-            ]
-          else
-            ip_permission['Groups'] = [
-              group_info(options[:group])
-            ]
+          if options[:direction].nil? || options[:direction] == 'ingress'
+            authorize_port_range_ingress group_id, ip_permission
+          elsif options[:direction] == 'egress'
+            authorize_port_range_egress group_id, ip_permission
           end
+        end
 
+        def authorize_port_range_ingress(group_id, ip_permission)
           service.authorize_security_group_ingress(
             name,
             'GroupId'       => group_id,
@@ -105,6 +100,14 @@ module Fog
           )
         end
 
+        def authorize_port_range_egress(group_id, ip_permission)
+          service.authorize_security_group_egress(
+            name,
+            'GroupId'       => group_id,
+            'IpPermissions' => [ ip_permission ]
+          )
+        end
+
         # Removes an existing security group
         #
         # security_group.destroy
@@ -176,7 +179,8 @@ module Fog
         # options::
         #   A hash that can contain any of the following keys:
         #    :cidr_ip (defaults to "0.0.0.0/0")
-        #    :group - ("account:group_name" or "account:group_id"), cannot be used with :cidr_ip
+        #    :cidr_ipv6 cannot be used with :cidr_ip
+        #    :group - ("account:group_name" or "account:group_id"), cannot be used with :cidr_ip or :cidr_ipv6
         #    :ip_protocol (defaults to "tcp")
         #
         # == Returns:
@@ -196,22 +200,16 @@ module Fog
         def revoke_port_range(range, options = {})
           requires_one :name, :group_id
 
-          ip_permission = {
-            'FromPort'   => range.begin,
-            'ToPort'     => range.end,
-            'IpProtocol' => options[:ip_protocol] || 'tcp'
-          }
+          ip_permission = fetch_ip_permission(range, options)
 
-          if options[:group].nil?
-            ip_permission['IpRanges'] = [
-              { 'CidrIp' => options[:cidr_ip] || '0.0.0.0/0' }
-            ]
-          else
-            ip_permission['Groups'] = [
-              group_info(options[:group])
-            ]
+          if options[:direction].nil? || options[:direction] == 'ingress'
+            revoke_port_range_ingress group_id, ip_permission
+          elsif options[:direction] == 'egress'
+            revoke_port_range_egress group_id, ip_permission
           end
+        end
 
+        def revoke_port_range_ingress(group_id, ip_permission)
           service.revoke_security_group_ingress(
             name,
             'GroupId'       => group_id,
@@ -219,6 +217,14 @@ module Fog
           )
         end
 
+        def revoke_port_range_egress(group_id, ip_permission)
+          service.revoke_security_group_egress(
+            name,
+            'GroupId'       => group_id,
+            'IpPermissions' => [ ip_permission ]
+          )
+        end
+
         # Reload a security group
         #
         #  >> g = AWS.security_groups.get(:name => "some_name")
@@ -314,6 +320,31 @@ module Fog
 
           info
         end
+
+        def fetch_ip_permission(range, options)
+          ip_permission = {
+            'FromPort'   => range.begin,
+            'ToPort'     => range.end,
+            'IpProtocol' => options[:ip_protocol] || 'tcp'
+          }
+
+          if options[:group].nil?
+            if options[:cidr_ipv6].nil?
+              ip_permission['IpRanges'] = [
+                { 'CidrIp' => options[:cidr_ip] || '0.0.0.0/0' }
+              ]
+            else
+              ip_permission['Ipv6Ranges'] = [
+                { 'CidrIpv6' => options[:cidr_ipv6] }
+              ]
+            end
+          else
+            ip_permission['Groups'] = [
+              group_info(options[:group])
+            ]
+          end
+          ip_permission
+        end
       end
     end
   end

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

@@ -1,12 +1,12 @@
 require 'fog/aws/models/compute/security_group'
 
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class SecurityGroups < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::SecurityGroup
+        model Fog::AWS::Compute::SecurityGroup
 
         # Creates a new security group
         #

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

@@ -1,8 +1,8 @@
 require 'fog/compute/models/server'
 
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Server < Fog::Compute::Server
         extend Fog::Deprecation
         deprecate :ip_address, :public_ip_address
@@ -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'
@@ -49,6 +50,7 @@ module Fog
         attribute :subnet_id,                :aliases => 'subnetId'
         attribute :tenancy
         attribute :tags,                     :aliases => 'tagSet'
+        attribute :tag_specifications,       :aliases => 'tagSpecifications'
         attribute :user_data
         attribute :virtualization_type,      :aliases => 'virtualizationType'
         attribute :vpc_id,                   :aliases => 'vpcId'
@@ -144,6 +146,7 @@ module Fog
 
           options = {
             'BlockDeviceMapping'          => block_device_mapping,
+            'HibernationOptions'          => hibernation_options,
             'NetworkInterfaces'           => network_interfaces,
             'ClientToken'                 => client_token,
             'DisableApiTermination'       => disable_api_termination,
@@ -164,6 +167,7 @@ module Fog
             'SecurityGroupId'             => security_group_ids,
             'SubnetId'                    => subnet_id,
             'UserData'                    => user_data,
+            'TagSpecifications'           => tag_specifications,
           }
           options.delete_if {|key, value| value.nil?}
 
@@ -227,9 +231,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

@@ -1,12 +1,12 @@
 require 'fog/aws/models/compute/server'
 
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Servers < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::Server
+        model Fog::AWS::Compute::Server
 
         # Creates a new server
         #
@@ -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"],
@@ -163,10 +165,13 @@ module Fog
             # expect eventual consistency
             if (tags = server.tags) && tags.size > 0
               Fog.wait_for { server.reload rescue nil }
-              service.create_tags(
-                server.identity,
-                tags
-              )
+              Fog.wait_for {
+                begin
+                  service.create_tags(server.identity, tags)
+                rescue Fog::AWS::Compute::NotFound
+                  false
+                end
+              }
             end
             server
           end
@@ -188,7 +193,7 @@ module Fog
 
           security_group = service.security_groups.get(server.groups.first)
           if security_group.nil?
-            raise Fog::Compute::AWS::Error, "The security group" \
+            raise Fog::AWS::Compute::Error, "The security group" \
               " #{server.groups.first} doesn't exist."
           end
 

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

@@ -1,18 +1,19 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Snapshot < Fog::Model
         identity  :id,          :aliases => 'snapshotId'
 
         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/snapshots.rb

@@ -1,13 +1,13 @@
 require 'fog/aws/models/compute/snapshot'
 
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Snapshots < Fog::Collection
         attribute :filters
         attribute :volume
 
-        model Fog::Compute::AWS::Snapshot
+        model Fog::AWS::Compute::Snapshot
 
         def initialize(attributes)
           self.filters ||= { 'RestorableBy' => 'self' }

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

@@ -1,8 +1,8 @@
 require 'fog/compute/models/server'
 
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class SpotRequest < Fog::Compute::Server
         identity :id,                          :aliases => 'spotInstanceRequestId'
 
@@ -21,6 +21,7 @@ module Fog
 
         attribute :ebs_optimized,              :aliases => 'LaunchSpecification.EbsOptimized'
         attribute :groups,                     :aliases => 'LaunchSpecification.SecurityGroup'
+        attribute :security_group_ids,         :aliases => 'LaunchSpecification.SecurityGroupId'
         attribute :key_name,                   :aliases => 'LaunchSpecification.KeyName'
         attribute :availability_zone,          :aliases => 'LaunchSpecification.Placement.AvailabilityZone'
         attribute :flavor_id,                  :aliases => 'LaunchSpecification.InstanceType'
@@ -37,7 +38,7 @@ module Fog
         attr_writer   :iam_instance_profile_name, :iam_instance_profile_arn
 
         def initialize(attributes={})
-          self.groups ||= ["default"]
+          self.groups ||= self.security_group_ids || ["default"]
           self.flavor_id ||= 't1.micro'
           self.image_id   ||= begin
             self.username ||= 'ubuntu'
@@ -93,7 +94,7 @@ module Fog
             'LaunchSpecification.KeyName'                    => key_name,
             'LaunchSpecification.Monitoring.Enabled'         => monitoring,
             'LaunchSpecification.Placement.AvailabilityZone' => availability_zone,
-            'LaunchSpecification.SecurityGroupId'            => groups,
+            'LaunchSpecification.SecurityGroupId'            => security_group_ids || groups,
             'LaunchSpecification.EbsOptimized'               => ebs_optimized,
             'LaunchSpecification.UserData'                   => user_data,
             'LaunchSpecification.SubnetId'                   => subnet_id,

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

@@ -1,12 +1,12 @@
 require 'fog/aws/models/compute/spot_request'
 
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class SpotRequests < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::SpotRequest
+        model Fog::AWS::Compute::SpotRequest
 
         def initialize(attributes)
           self.filters ||= {}