brightbox-cli 0.17.1 → 0.17.2

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/emr.rb

@@ -26,10 +26,10 @@ module Fog
       # collection  :snapshots
       # model       :parameter_group
       # collection  :parameter_groups
-      # 
+      #
       # model       :parameter
       # collection  :parameters
-      # 
+      #
       # model       :security_group
       # collection  :security_groups
 
@@ -57,7 +57,7 @@ module Fog
         #
         # ==== Parameters
         # * options<~Hash> - config arguments for connection.  Defaults to {}.
-        #   * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'ap-southeast-1']
+        #   * region<~String> - optional region to use. For instance, in 'eu-west-1', 'us-east-1' and etc.
         #
         # ==== Returns
         # * EMR object with connection to AWS.
@@ -68,12 +68,13 @@ module Fog
           @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
 
           options[:region] ||= 'us-east-1'
-          @host = options[:host] || 'elasticmapreduce.amazonaws.com'
+          @host = options[:host] || "elasticmapreduce.#{options[:region]}.amazonaws.com"
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @region = options[:region]
         end
 
         def reload

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/iam.rb

@@ -61,7 +61,22 @@ module Fog
           @data ||= Hash.new do |hash, key|
             hash[key] = {
               :owner_id => Fog::AWS::Mock.owner_id,
-              :server_certificates => {}
+              :server_certificates => {},
+              :users => Hash.new do |uhash, ukey|
+                uhash[ukey] = {
+                  :user_id     => Fog::AWS::Mock.key_id,
+                  :arn         => "arn:aws:iam::#{Fog::AWS::Mock.owner_id}:user/#{ukey}",
+                  :access_keys => [],
+                  :policies    => {}
+                }
+              end,
+              :groups => Hash.new do |ghash, gkey|
+                ghash[gkey] = {
+                  :group_id   => Fog::AWS::Mock.key_id,
+                  :arn        => "arn:aws:iam::#{Fog::AWS::Mock.owner_id}:group/#{gkey}",
+                  :members    => []
+                }
+              end
             }
           end
         end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/models/auto_scaling/group.rb

@@ -65,9 +65,9 @@ module Fog
           reload
         end
 
-        def enable_metrics_collection(metrics = {})
+        def enable_metrics_collection(granularity = '1Minute', metrics = {})
           requires :id
-          connection.enable_metrics_collection(id, 'Metrics' => metrics)
+          connection.enable_metrics_collection(id, granularity, 'Metrics' => metrics)
           reload
         end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/models/cloud_watch/metric_statistic.rb

@@ -25,7 +25,6 @@ module Fog
 
           put_opts = {'MetricName' => metric_name, 'Unit' => unit}
           put_opts.merge!('Dimensions' => dimensions) if dimensions
-          put_opts.merge!('Timestamp' => dimensions) if timestamp
           if value
             put_opts.merge!('Value' => value)
           else
@@ -43,4 +42,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/models/compute/security_group.rb

@@ -7,10 +7,11 @@ module Fog
       class SecurityGroup < Fog::Model
 
         identity  :name,            :aliases => 'groupName'
-
         attribute :description,     :aliases => 'groupDescription'
+        attribute :group_id,        :aliases => 'groupId'
         attribute :ip_permissions,  :aliases => 'ipPermissions'
         attribute :owner_id,        :aliases => 'ownerId'
+        attribute :vpc_id,          :aliases => 'vpcId'
 
         # Authorize access by another security group
         #
@@ -193,8 +194,7 @@ module Fog
 
         def save
           requires :description, :name
-
-          data = connection.create_security_group(name, description).body
+          data = connection.create_security_group(name, description, vpc_id).body
           true
         end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/models/compute/security_groups.rb

@@ -25,6 +25,7 @@ module Fog
         #    description=nil,
         #    ip_permissions=nil,
         #    owner_id=nil
+        #    vpc_id=nil
         #  >
         #
         
@@ -50,6 +51,7 @@ module Fog
         #        description="default group",
         #        ip_permissions=[{"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>-1, "toPort"=>-1, "ipRanges"=>[], "ipProtocol"=>"icmp"}, {"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>0, "toPort"=>65535, "ipRanges"=>[], "ipProtocol"=>"tcp"}, {"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>0, "toPort"=>65535, "ipRanges"=>[], "ipProtocol"=>"udp"}],
         #        owner_id="312571045469"
+        #        vpc_id=nill
         #      >
         #    ]
         #  >
@@ -79,6 +81,7 @@ module Fog
         #    description="default group",
         #    ip_permissions=[{"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>-1, "toPort"=>-1, "ipRanges"=>[], "ipProtocol"=>"icmp"}, {"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>0, "toPort"=>65535, "ipRanges"=>[], "ipProtocol"=>"tcp"}, {"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>0, "toPort"=>65535, "ipRanges"=>[], "ipProtocol"=>"udp"}],
         #    owner_id="312571045469"
+        #    vpc_id=nil
         #  > 
         #
         
@@ -88,6 +91,28 @@ module Fog
           end
         end
 
+        # Used to retreive a security group
+        # group id is required to get the associated flavor information.
+        #
+        # You can run the following command to get the details:
+        # AWS.security_groups.get_by_id("default")
+        #
+        # ==== Returns
+        #
+        #>> AWS.security_groups.get_by_id("sg-123456")
+        #  <Fog::AWS::Compute::SecurityGroup
+        #    name="default",
+        #    description="default group",
+        #    ip_permissions=[{"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>-1, "toPort"=>-1, "ipRanges"=>[], "ipProtocol"=>"icmp"}, {"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>0, "toPort"=>65535, "ipRanges"=>[], "ipProtocol"=>"tcp"}, {"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>0, "toPort"=>65535, "ipRanges"=>[], "ipProtocol"=>"udp"}],
+        #    owner_id="312571045469"
+        #  > 
+        #
+        
+        def get_by_id(group_id)
+          if group_id
+            self.class.new(:connection => connection).all('group-id' => group_id).first
+          end
+        end
       end
 
     end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/models/compute/server.rb

@@ -34,18 +34,20 @@ module Fog
         attribute :reason
         attribute :root_device_name,      :aliases => 'rootDeviceName'
         attribute :root_device_type,      :aliases => 'rootDeviceType'
+        attribute :security_group_ids,    :aliases => 'securityGroupIds'
         attribute :state,                 :aliases => 'instanceState', :squash => 'name'
         attribute :state_reason,          :aliases => 'stateReason'
         attribute :subnet_id,             :aliases => 'subnetId'
         attribute :tenancy
         attribute :tags,                  :aliases => 'tagSet'
         attribute :user_data
+        attribute :vpc_id,                :aliases => 'vpcId'
 
         attr_accessor :password
         attr_writer   :private_key, :private_key_path, :public_key, :public_key_path, :username
 
         def initialize(attributes={})
-          self.groups     ||= ["default"] unless attributes[:subnet_id]
+          self.groups     ||= ["default"] unless (attributes[:subnet_id] || attributes[:security_group_ids])
           self.flavor_id  ||= 't1.micro'
           self.image_id   ||= begin
             self.username = 'ubuntu'
@@ -152,6 +154,7 @@ module Fog
             'Placement.Tenancy'           => tenancy,
             'RamdiskId'                   => ramdisk_id,
             'SecurityGroup'               => groups,
+            'SecurityGroupId'             => security_group_ids,
             'SubnetId'                    => subnet_id,
             'UserData'                    => user_data
           }

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/models/dns/records.rb

@@ -20,9 +20,9 @@ module Fog
 
         def all(options = {})
           requires :zone
-          options['MaxItems'] ||= max_items
-          options['Name']     ||= name
-          options['Type']     ||= type
+          options['maxitems'] ||= max_items
+          options['name']     ||= name
+          options['type']     ||= type
           data = connection.list_resource_record_sets(zone.id, options).body
           merge_attributes(data.reject {|key, value| !['IsTruncated', 'MaxItems', 'NextRecordName', 'NextRecordType'].include?(key)})
           # leave out the default, read only records

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/models/elb/listener.rb

@@ -4,20 +4,21 @@ module Fog
     class ELB
       class Listener < Fog::Model
 
-        attribute :policy_names,  :aliases => 'PolicyNames'
-        attribute :instance_port, :aliases => 'InstancePort'
-        attribute :lb_port,       :aliases => 'LoadBalancerPort'
-        attribute :protocol,      :aliases => 'Protocol'
-        attribute :ssl_id,        :aliases => 'SSLCertificateId'
+        attribute :policy_names,      :aliases => 'PolicyNames'
+        attribute :instance_port,     :aliases => 'InstancePort'
+        attribute :instance_protocol, :aliases => 'InstanceProtocol'
+        attribute :lb_port,           :aliases => 'LoadBalancerPort'
+        attribute :protocol,          :aliases => 'Protocol'
+        attribute :ssl_id,            :aliases => 'SSLCertificateId'
 
         def initialize(attributes={})
           # set defaults, which may be overridden in super
-          merge_attributes(:policy_names => [], :instance_port => 80, :lb_port => 80, :protocol => 'HTTP')
+          merge_attributes(:policy_names => [], :instance_port => 80, :instance_protocol => 'HTTP', :lb_port => 80, :protocol => 'HTTP')
           super
         end
 
         def save
-          requires :load_balancer, :instance_port, :lb_port, :protocol
+          requires :load_balancer, :instance_port, :lb_port, :protocol, :instance_protocol
           connection.create_load_balancer_listeners(load_balancer.id, [to_params])
           reload
         end
@@ -44,6 +45,7 @@ module Fog
         def to_params
           {
             'InstancePort'     => instance_port,
+            'InstanceProtocol' => instance_protocol,
             'LoadBalancerPort' => lb_port,
             'Protocol'         => protocol,
             'SSLCertificateId' => ssl_id

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/models/elb/load_balancer.rb

@@ -96,6 +96,12 @@ module Fog
           reload
         end
 
+        def set_listener_ssl_certificate(port, ssl_certificate_id)
+          requires :id
+          connection.set_load_balancer_listener_ssl_certificate(id, port, ssl_certificate_id)
+          reload
+        end
+
         def unset_listener_policy(port)
           set_listener_policy(port, [])
         end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/models/storage/directory.rb

@@ -1,5 +1,6 @@
 require 'fog/core/model'
 require 'fog/aws/models/storage/files'
+require 'fog/aws/models/storage/versions'
 
 module Fog
   module Storage
@@ -58,6 +59,26 @@ module Fog
           @payer = new_payer
         end
 
+        def versioning?
+          requires :key
+          data = connection.get_bucket_versioning(key)
+          data.body['VersioningConfiguration']['Status'] == 'Enabled'
+        end
+
+        def versioning=(new_versioning)
+          requires :key
+          connection.put_bucket_versioning(key, new_versioning ? 'Enabled' : 'Suspended')
+        end
+
+        def versions
+          @versions ||= begin
+            Fog::Storage::AWS::Versions.new(
+                :directory    => self,
+                :connection   => connection
+            )
+          end
+        end
+
         def public=(new_public)
           if new_public
             @acl = 'public-read'

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/models/storage/file.rb

@@ -1,4 +1,5 @@
 require 'fog/core/model'
+require 'fog/aws/models/storage/versions'
 
 module Fog
   module Storage
@@ -21,6 +22,8 @@ module Fog
         attribute :metadata
         attribute :owner,               :aliases => 'Owner'
         attribute :storage_class,       :aliases => ['x-amz-storage-class', 'StorageClass']
+        attribute :encryption,          :aliases => 'x-amz-server-side-encryption'
+        attribute :version,             :aliases => 'x-amz-version-id'
 
         def acl=(new_acl)
           valid_acls = ['private', 'public-read', 'public-read-write', 'authenticated-read']
@@ -50,12 +53,13 @@ module Fog
           requires :directory, :key
           connection.copy_object(directory.key, key, target_directory_key, target_file_key, options)
           target_directory = connection.directories.new(:key => target_directory_key)
-          target_directory.files.get(target_file_key)
+          target_directory.files.head(target_file_key)
         end
 
-        def destroy
+        def destroy(options = {})
           requires :directory, :key
-          connection.delete_object(directory.key, key)
+          attributes[:body] = nil if options['versionId'] == version
+          connection.delete_object(directory.key, key, options)
           true
         end
 
@@ -115,6 +119,7 @@ module Fog
           options['Expires'] = expires if expires
           options.merge!(metadata)
           options['x-amz-storage-class'] = storage_class if storage_class
+          options['x-amz-server-side-encryption'] = encryption if encryption
 
           data = connection.put_object(directory.key, key, body, options)
           data.headers['ETag'].gsub!('"','')
@@ -123,9 +128,18 @@ module Fog
           true
         end
 
-        def url(expires)
+        def url(expires, options = {})
           requires :key
-          collection.get_https_url(key, expires)
+          collection.get_https_url(key, expires, options)
+        end
+
+        def versions
+          @versions ||= begin
+            Fog::Storage::AWS::Versions.new(
+              :file         => self,
+              :connection   => connection
+            )
+          end
         end
 
         private

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/models/storage/files.rb

@@ -78,14 +78,14 @@ module Fog
           end
         end
 
-        def get_http_url(key, expires)
+        def get_http_url(key, expires, options = {})
           requires :directory
-          connection.get_object_http_url(directory.key, key, expires)
+          connection.get_object_http_url(directory.key, key, expires, options)
         end
 
-        def get_https_url(key, expires)
+        def get_https_url(key, expires, options = {})
           requires :directory
-          connection.get_object_https_url(directory.key, key, expires)
+          connection.get_object_https_url(directory.key, key, expires, options)
         end
 
         def head(key, options = {})

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/parsers/compute/describe_instances.rb

@@ -31,7 +31,7 @@ module Fog
             when 'architecture', 'clientToken', 'dnsName', 'imageId',
                   'instanceId', 'instanceType', 'ipAddress', 'kernelId',
                   'keyName', 'platform', 'privateDnsName', 'privateIpAddress', 'ramdiskId',
-                  'reason', 'rootDeviceType'
+                  'reason', 'rootDeviceType',  'subnetId', 'vpcId'
               @instance[name] = value
             when 'attachTime'
               @block_device_mapping[name] = Time.parse(value)
@@ -46,7 +46,7 @@ module Fog
             when 'groupId', 'groupName'
               case @context.last
               when 'groupSet'
-                @reservation['groupSet'] << value
+                @reservation['groupSet'] << value if @context.first != "instancesSet"
               when 'placement'
                 @instance['placement'][name] = value
               end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/parsers/compute/describe_security_groups.rb

@@ -40,9 +40,9 @@ module Fog
               end
             when 'groups'
               @in_groups = false
-            when 'groupDescription', 'ownerId'
+            when 'groupDescription', 'ownerId', 'vpcId'
               @security_group[name] = value
-            when 'groupName'
+            when 'groupId','groupName'
               if @in_groups
                 @group[name] = value
               else

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/parsers/sqs/receive_message.rb

@@ -24,7 +24,7 @@ module Fog
             when 'Value'
               case @current_attribute_name
               when 'ApproximateFirstReceiveTimestamp', 'SentTimestamp'
-                @message['Attributes'][@current_attribute_name] = Time.at(@value.to_i)
+                @message['Attributes'][@current_attribute_name] = Time.at(@value.to_i / 1000.0)
               when 'ApproximateReceiveCount'
                 @message['Attributes'][@current_attribute_name] = @value.to_i
               else

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/rds.rb

@@ -5,6 +5,8 @@ module Fog
     class RDS < Fog::Service
 
       class IdentifierTaken < Fog::Errors::Error; end
+      
+      class AuthorizationAlreadyExists < Fog::Errors::Error; end
 
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :region, :host, :path, :port, :scheme, :persistent
@@ -57,9 +59,43 @@ module Fog
 
       class Mock
 
+        def self.data
+          @data ||= Hash.new do |hash, region|
+            owner_id = Fog::AWS::Mock.owner_id
+            hash[region] = Hash.new do |region_hash, key|
+              region_hash[key] = {
+                :servers => {},
+                :security_groups => {}
+              }
+            end
+          end
+        end
+        
+        def self.reset
+          @data = nil
+        end
+        
         def initialize(options={})
-          Fog::Mock.not_implemented
+        
+          @aws_access_key_id = options[:aws_access_key_id]
+        
+          @region = options[:region] || 'us-east-1'
+        
+          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
+            raise ArgumentError, "Unknown region: #{@region.inspect}"
+          end
+        
+        end
+        
+        def data
+          self.class.data[@region][@aws_access_key_id]
         end
+        
+        def reset_data
+          self.class.data[@region].delete(@aws_access_key_id)
+        end
+        
+        
 
       end
 
@@ -79,7 +115,7 @@ module Fog
         #
         # ==== Parameters
         # * options<~Hash> - config arguments for connection.  Defaults to {}.
-        #   * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'ap-southeast-1']
+        #   * region<~String> - optional region to use. For instance, 'eu-west-1', 'us-east-1' and etc.
         #
         # ==== Returns
         # * ELB object with connection to AWS.
@@ -90,22 +126,7 @@ module Fog
           @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
 
           options[:region] ||= 'us-east-1'
-          @host = options[:host] || case options[:region]
-          when 'ap-northeast-1'
-            'rds.ap-northeast-1.amazonaws.com'
-          when 'ap-southeast-1'
-            'rds.ap-southeast-1.amazonaws.com'
-          when 'eu-west-1'
-            'rds.eu-west-1.amazonaws.com'
-          when 'us-east-1'
-            'rds.us-east-1.amazonaws.com'
-          when 'us-west-1'
-            'rds.us-west-1.amazonaws.com'
-          when 'us-west-2'
-            'rds.us-west-2.amazonaws.com'
-          else
-            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
-          end
+          @host = options[:host] || "rds.#{options[:region]}.amazonaws.com"
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
@@ -152,6 +173,8 @@ module Fog
                 raise Fog::AWS::RDS::NotFound.slurp(error, match[2])
               when 'DBParameterGroupAlreadyExists'
                 raise Fog::AWS::RDS::IdentifierTaken.slurp(error, match[2])
+              when 'AuthorizationAlreadyExists'
+                raise Fog::AWS::RDS::AuthorizationAlreadyExists.slurp(error, match[2])
               else
                 raise
               end