fog 1.16.0 → 1.17.0

data/lib/fog/aws/requests/iam/update_access_key.rb

@@ -31,6 +31,28 @@ module Fog
         end
 
       end
+
+      class Mock
+        def update_access_key(access_key_id, status, options = {})
+          if user = options['UserName']
+            if data[:users].has_key? user
+              access_keys_data = data[:users][user][:access_keys]
+            else
+              raise Fog::AWS::IAM::NotFound.new('The user with name #{user_name} cannot be found.')
+            end
+          else
+            access_keys_data = data[:access_keys]
+          end
+          key = access_keys_data.detect{|k| k["AccessKeyId"] == access_key_id}
+          key["Status"] = status
+          Excon::Response.new.tap do |response|
+            response.status = 200
+            response.body = { 'AccessKey' => key,
+                              'RequestId' => Fog::AWS::Mock.request_id }
+          end
+        end
+      end
+
     end
   end
 end

data/lib/fog/aws/requests/storage/delete_bucket_tagging.rb

@@ -0,0 +1,46 @@
+module Fog
+  module Storage
+    class AWS
+      class Real
+
+        # Delete tagging for a bucket
+        #
+        # @param bucket_name [String] name of bucket to delete tagging from
+        #
+        # @return [Excon::Response] response:
+        #   * status [Integer] - 204
+        #
+        # @see http://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketDELETEtagging.html
+
+        def delete_bucket_tagging(bucket_name)
+          request({
+            :expects  => 204,
+            :headers  => {},
+            :bucket_name => bucket_name,
+            :method   => 'DELETE',
+            :query    => {'tagging' => nil}
+          })
+        end
+
+      end
+
+      class Mock # :nodoc:all
+
+        def delete_bucket_tagging(bucket_name)
+          response = Excon::Response.new
+          if self.data[:buckets][bucket_name]
+            self.data[:bucket_tagging].delete(bucket_name)
+            response.status = 204
+          else
+            response.status = 404
+            raise(Excon::Errors.status_error({:expects => 204}, response))
+          end
+
+          response
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/aws/requests/storage/get_bucket_tagging.rb

@@ -0,0 +1,53 @@
+module Fog
+  module Storage
+    class AWS
+      class Real
+
+        require 'fog/aws/parsers/storage/get_bucket_tagging'
+
+        # Get tags for an S3 bucket
+        #
+        # @param bucket_name [String] name of bucket to get tags for
+        #
+        # @return [Excon::Response] response:
+        #   * body [Hash]:
+        #     * BucketTagging [Hash]:
+        #       * Key [String] - tag key
+        #       * Value [String] - tag value
+        # @see http://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketGETtagging.html
+
+        def get_bucket_tagging(bucket_name)
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          request({
+            :expects    => 200,
+            :headers    => {},
+            :bucket_name => bucket_name,
+            :idempotent => true,
+            :method     => 'GET',
+            :parser     => Fog::Parsers::Storage::AWS::GetBucketTagging.new,
+            :query      => {'tagging' => nil}
+          })
+        end
+
+      end
+
+      class Mock # :nodoc:all
+
+        def get_bucket_tagging(bucket_name)
+          response = Excon::Response.new
+          if self.data[:buckets][bucket_name] && self.data[:bucket_tagging][bucket_name]
+            response.status = 200
+            response.body = {'BucketTagging' => self.data[:bucket_tagging][bucket_name]}
+          else
+            response.status = 404
+            raise(Excon::Errors.status_error({:expects => 200}, response))
+          end
+          response
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/aws/requests/storage/put_bucket_tagging.rb

@@ -0,0 +1,60 @@
+module Fog
+  module Storage
+    class AWS
+      class Real
+
+        # Change tag set for an S3 bucket
+        #
+        # @param bucket_name [String] name of bucket to modify
+        # @param tags [Hash]:
+        #   * Key [String]: tag key
+        #   * Value [String]: tag value
+        #
+        # @see http://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketPUTtagging.html
+
+        def put_bucket_tagging(bucket_name, tags)
+          tagging = tags.map do |k,v|
+            "<Tag><Key>#{k}</Key><Value>#{v}</Value></Tag>"
+          end.join("\n")
+          data =
+<<-DATA
+<Tagging xmlns="http://doc.s3.amazonaws.com/2006-03-01" >
+  <TagSet>
+    #{tagging}
+  </TagSet>
+</Tagging>
+DATA
+
+          request({
+            :body     => data,
+            :expects  => 204,
+            :headers  => {'Content-MD5' => Base64.encode64(Digest::MD5.digest(data)).chomp!, 'Content-Type' => 'application/xml'},
+            :bucket_name => bucket_name,
+            :method   => 'PUT',
+            :query    => {'tagging' => nil}
+          })
+        end
+
+      end
+
+      class Mock # :nodoc:all
+
+        def put_bucket_tagging(bucket_name, tags)
+          response = Excon::Response.new
+
+          if self.data[:buckets][bucket_name]
+            self.data[:bucket_tagging][bucket_name] = tags
+            response.status = 204
+          else
+            response.status = 404
+            raise(Excon::Errors.status_error({:expects => 204}, response))
+          end
+
+          response
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/aws/storage.rb

@@ -34,6 +34,7 @@ module Fog
         response-content-type
         response-expires
         restore
+        tagging
         torrent
         uploadId
         uploads
@@ -44,7 +45,7 @@ module Fog
       ]
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :path_style
+      recognizes :endpoint, :region, :host, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :path_style
 
       secrets    :aws_secret_access_key, :hmac
 
@@ -65,6 +66,7 @@ module Fog
       request :delete_bucket_website
       request :delete_object
       request :delete_multiple_objects
+      request :delete_bucket_tagging
       request :get_bucket
       request :get_bucket_acl
       request :get_bucket_cors
@@ -73,6 +75,7 @@ module Fog
       request :get_bucket_logging
       request :get_bucket_object_versions
       request :get_bucket_policy
+      request :get_bucket_tagging
       request :get_bucket_versioning
       request :get_bucket_website
       request :get_object
@@ -95,6 +98,7 @@ module Fog
       request :put_bucket_lifecycle
       request :put_bucket_logging
       request :put_bucket_policy
+      request :put_bucket_tagging
       request :put_bucket_versioning
       request :put_bucket_website
       request :put_object
@@ -168,9 +172,9 @@ module Fog
           "/#{escape(bucket_name.to_s)}#{path}"
         end
 
-        # NOTE: differs fram Fog::AWS.escape by NOT escaping `/`
+        # NOTE: differs from Fog::AWS.escape by NOT escaping `/`
         def escape(string)
-          string = Unicode::normalize_C(string)
+          string = defined?(::UNF::Normalizer) ? ::UNF::Normalizer.normalize(string, :nfc) : string
           string.gsub(/([^a-zA-Z0-9_.\-~\/]+)/) {
             "%" + $1.unpack("H2" * $1.bytesize).join("%").upcase
           }
@@ -184,9 +188,9 @@ module Fog
 
           if params[:scheme]
             scheme = params[:scheme]
-            port   = params[:port]
+            port   = params[:port] || DEFAULT_SCHEME_PORT[scheme]
           else
-            scheme = @scheme || DEFAULT_SCHEME
+            scheme = @scheme
             port   = @port
           end
           if DEFAULT_SCHEME_PORT[scheme] == port
@@ -225,7 +229,7 @@ module Fog
             :host         => host,
             :port         => port,
             :path         => path,
-            :headers      => headers,
+            :headers      => headers
           })
 
           #
@@ -332,7 +336,8 @@ module Fog
                 :buckets => {},
                 :cors => {
                   :bucket => {}
-                }
+                },
+                :bucket_tagging => {}
               }
             end
           end
@@ -403,27 +408,19 @@ module Fog
           if @endpoint = options[:endpoint]
             endpoint = URI.parse(@endpoint)
             @host = endpoint.host
-            @path = if endpoint.path.empty?
-              '/'
-            else
-              endpoint.path
-            end
             @scheme = endpoint.scheme
             @port = endpoint.port
           else
             @region     = options[:region]      || DEFAULT_REGION
             @host       = options[:host]        || region_to_host(@region)
-            @path       = options[:path]        || '/'
             @scheme     = options[:scheme]      || DEFAULT_SCHEME
             @port       = options[:port]        || DEFAULT_SCHEME_PORT[@scheme]
             @path_style = options[:path_style]  || false
           end
-
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
 
         def reload
-          @connection.reset
+          @connection.reset if @connection
         end
 
         def signature(params, expires)
@@ -493,6 +490,20 @@ DATA
           @hmac = Fog::HMAC.new('sha1', @aws_secret_access_key)
         end
 
+        def connection(scheme, host, port)
+          uri = "#{scheme}://#{host}:#{port}"
+          if @persistent
+            unless uri == @connection_uri
+              @connection_uri = uri
+              reload
+              @connection = nil
+            end
+          else
+            @connection = nil
+          end
+          @connection ||= Fog::Connection.new(uri, @persistent, @connection_options)
+        end
+
         def request(params, &block)
           refresh_credentials_if_expired
 
@@ -502,7 +513,9 @@ DATA
           signature = signature(params, expires)
 
           params = request_params(params)
-          params.delete(:port) unless params[:port]
+          scheme = params.delete(:scheme)
+          host   = params.delete(:host)
+          port   = params.delete(:port) || DEFAULT_SCHEME_PORT[scheme]
 
           params[:headers]['Date'] = expires
           params[:headers]['Authorization'] = "AWS #{@aws_access_key_id}:#{signature}"
@@ -510,12 +523,12 @@ DATA
           original_params = params.dup
 
           begin
-            response = @connection.request(params, &block)
+            response = connection(scheme, host, port).request(params, &block)
           rescue Excon::Errors::TemporaryRedirect => error
             headers = (error.response.is_a?(Hash) ? error.response[:headers] : error.response.headers)
             uri = URI.parse(headers['Location'])
             Fog::Logger.warning("fog: followed redirect to #{uri.host}, connecting to the matching region will be more performant")
-            response = Fog::Connection.new("#{@scheme}://#{uri.host}:#{@port}", false, @connection_options).request(original_params, &block)
+            response = Fog::Connection.new("#{uri.scheme}://#{uri.host}:#{uri.port}", false, @connection_options).request(original_params, &block)
           end
 
           response

data/lib/fog/brightbox/models/compute/load_balancer.rb

@@ -18,6 +18,14 @@ module Fog
         attribute :healthcheck
         attribute :listeners
 
+        # These SSL attributes act only as setters. You can not read certs or keys via the API
+        attribute :certificate_pem
+        attribute :certificate_private_key
+
+        # These SSL attributes act only as getters for metadata
+        attribute :certificate_expires_at
+        attribute :certificate_subject
+
         # Times
         attribute :created_at, :type => :time
         attribute :deleted_at, :type => :time
@@ -39,7 +47,9 @@ module Fog
             :listeners => listeners,
             :healthcheck => healthcheck,
             :policy => policy,
-            :name => name
+            :name => name,
+            :certificate_pem => certificate_pem,
+            :certificate_private_key => certificate_private_key
           }.delete_if {|k,v| v.nil? || v == "" }
           data = service.create_load_balancer(options)
           merge_attributes(data)
@@ -52,8 +62,43 @@ module Fog
           true
         end
 
-      end
+        # SSL cert metadata for expiration of certificate
+        def certificate_expires_at
+          attributes[:certificate_expires_at]
+        end
+
+        # SSL cert metadata for subject
+        def certificate_subject
+          attributes[:certificate_subject]
+        end
 
+        # Sets the certificate metadata from the JSON object that contains it.
+        #
+        # It is used by fog's attribute setting and should not be used for attempting to set a
+        # certificate on a load balancer.
+        #
+        # @private
+        def certificate=(cert_metadata)
+          if cert_metadata
+            attributes[:certificate_expires_at] = time_or_original(cert_metadata["expires_at"])
+            attributes[:certificate_subject] = cert_metadata["subject"]
+          else
+            attributes[:certificate_expires_at] = nil
+            attributes[:certificate_subject] = nil
+          end
+        end
+
+      private
+
+        def time_or_original(value)
+          begin
+            Time.parse(value)
+          rescue TypeError, ArgumentError
+            value
+          end
+        end
+
+      end
     end
   end
 end

data/lib/fog/core/logger.rb

@@ -5,7 +5,7 @@ module Fog
       :deprecation  => ::STDOUT,
       :warning      => ::STDOUT
     }
-    
+
     @channels[:debug] = ::STDOUT if ENV['DEBUG']
 
     def self.[](channel)
@@ -17,20 +17,19 @@ module Fog
     end
 
     def self.debug(message)
-      self.write(:debug, "[light_black][DEBUG] #{message}[/]\n")
+      self.write(:debug, "[light_black][fog][DEBUG] #{message}[/]\n")
     end
 
     def self.deprecation(message)
-      self.write(:deprecation, "[yellow][DEPRECATION] #{message}[/]\n")
+      self.write(:deprecation, "[yellow][fog][DEPRECATION] #{message}[/]\n")
     end
 
     def self.warning(message)
-      self.write(:warning, "[yellow][WARNING] #{message}[/]\n")
+      self.write(:warning, "[yellow][fog][WARNING] #{message}[/]\n")
     end
 
     def self.write(key, value)
       if channel = @channels[key]
-        value.gsub(Formatador::INDENT_REGEX, '')
         message = if channel.tty?
           value.gsub(Formatador::PARSE_REGEX) { "\e[#{Formatador::STYLES[$1.to_sym]}m" }.gsub(Formatador::INDENT_REGEX, '')
         else