aliyun_sls_sdk 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a5379de759aaffcc2806796c3ac6352cea1baac
-  data.tar.gz: 15cd324d103afaf804110ef26c4789ebe3cd7993
+  metadata.gz: 9966f404993efd0e805ec1883d5fbdd512bbe26a
+  data.tar.gz: 8a2607f56f847a7b894960b1d12cd4d21d9e3253
 SHA512:
-  metadata.gz: 783c03b3c249d078068076784ee53939147e70abd1734f97e2ffd26ac71880ed607ccc7354908d71730d2714d3fae6b66468e9b63aa4aaec9f1854d34af27ff6
-  data.tar.gz: 131b92443f4108ea49a3abf69f49876a1194e2c1b253707f47f5b579bc1db34576c5bf1c72cb65bc4902df5b253dfdafcf4cfbff3bd9aedda735e0a4b456207f
+  metadata.gz: 6c062dda63f2dc64cffc5791293f084bac9a51e1901d6581bee4abef369cbac8cce8d0c20bb4b7a5edb134325e8aee56e8f6d8279c549221b5cac0580ca60ce9
+  data.tar.gz: ee7c6902e27d82de45e32d1904357fa53078dd3b78fe1a1669d88072f0f4fb840bb78513f7bc8930b8eba91327a006356402192aaa16e5caabddad2977d77725

data/lib/aliyun_sls_sdk/connection.rb

@@ -4,13 +4,14 @@ require "base64"
 require "zlib"
 require "time"
 require "net/http/persistent"
+require "json"
 
 module AliyunSlsSdk
   class Connection
 
     def initialize(project, region_endpoint,  aliyun_access_key_id, aliyun_access_key_secret, opts={})
       default_headers = {
-          "x-sls-apiversion" => "0.4.0",
+          "x-sls-apiversion" => "0.6.0",
           "x-sls-signaturemethod" => "hmac-sha1"
       }
       @headers = default_headers.update opts
@@ -21,6 +22,24 @@ module AliyunSlsSdk
       # @http.debug_output = $stdout
     end
 
+    # https://help.aliyun.com/document_detail/29015.html
+    def create_logstore(logStoreName, ttl, shardCount, ssl_verify = false)
+      body = {:logstoreName => logStoreName, :ttl => ttl, :shardCount => shardCount}
+      content = body.to_json
+      # 压缩content数据
+      compressed = Zlib::Deflate.deflate(content.encode.to_s)
+      headers = compact_headers(content, compressed)
+      headers["Authorization"] = signature("POST", nil, headers, content, {})
+      scheme = ssl_verify ? "https" : "http"
+
+      post_uri = URI "#{scheme}://#{@host}/logstores"
+      post = Net::HTTP::Post.new(post_uri.request_uri, headers)
+      post.body = compressed
+      response = @http.request post_uri, post
+      parse_response(response)
+    end
+
+
     # http://docs.aliyun.com/#/pub/sls/api/apilist&PutLogs
     def puts_logs(logstorename, content, ssl_verify = false)
       # 压缩content数据
@@ -189,6 +208,11 @@ module AliyunSlsSdk
       "SLS #{@aliyun_access_key_id}:#{sign(method, logstorename, headers, content, query)}"
     end
 
+    # https://help.aliyun.com/document_detail/29010.html
+    def setup_common_headers()
+
+    end
+
     # content是LogGroup
     def compact_headers(content, compressed)
       headers = @headers.dup
@@ -201,10 +225,10 @@ module AliyunSlsSdk
         headers["Content-Length"] = compressed.bytesize.to_s
         # 日志内容包含的日志必须小于3MB和4096条。
         raise AliyunSls::PostBodyTooLarge, "content length is larger than 3MB" if headers["Content-Length"].to_i > 3*1024**2*8
-        raise AliyunSls::PostBodyTooLarge, "content size is more than 4096" if content.logs.size > 4096
+#        raise AliyunSls::PostBodyTooLarge, "content size is more than 4096" if content.logs && content.logs.size > 4096
         # MD5必须为大写字符串
         headers["Content-MD5"] = Digest::MD5.hexdigest(compressed).upcase
-        headers["Content-Type"] = "application/x-protobuf"
+        headers["Content-Type"] = "application/json"
         headers["x-sls-bodyrawsize"] = body.bytesize.to_s
         headers["x-sls-compresstype"] = "deflate"
       end

data/lib/aliyun_sls_sdk/create_log_store_response.rb

@@ -0,0 +1,15 @@
+require 'json'
+
+module AliyunSlsSdk
+  class CreateLogStoreResponse < LogResponse
+
+    def initialize(header)
+      super(header)
+    end
+
+    def log_print()
+      puts 'CreateLogStoreResponse:'
+      puts 'headers:' + self.all_headers.to_json
+    end
+  end
+end

data/lib/aliyun_sls_sdk/get_log_request.rb

@@ -0,0 +1,18 @@
+module AliyunSlsSdk
+  class GetLogRequest < LogRequest
+    attr_accessor :project, :logstore, :fromTime, :toTime, :topic, :query, :line, :offset, :reverse
+    def initialize(project=nil, logstore=nil, fromTime=nil, toTime=nil, topic=nil, 
+                query=nil, line=nil, offset=nil, reverse=nil)
+      @project = project
+      @logstore = logstore
+      @fromTime = fromTime
+      @toTime = toTime
+      @topic = topic
+      @query = query
+      @line = line
+      @offset = offset
+      @reverse = reverse
+
+    end
+  end
+end

data/lib/aliyun_sls_sdk/log_client.rb

@@ -0,0 +1,171 @@
+require "time"
+require "addressable/uri"
+require "net/http/persistent"
+require "json"
+
+module AliyunSlsSdk
+  class LogClient
+
+    @@API_VERSION = "0.6.0"
+    @@USER_AGENT = "log-ruby-sdk-v-0.6.1"
+    @@http = Net::HTTP::Persistent.new
+    def initialize(endpoint, accessKeyId, accessKeySecret)
+      @endpoint = endpoint
+      @accessKeyId = accessKeyId
+      @accessKeySecret = accessKeySecret
+    end
+
+    def create_logstore(project_name, logstore_name, ttl, shard_count)
+      headers = {}
+      params = {}
+      headers["x-log-bodyrawsize"] = '0'
+      headers["Content-Type"] = "application/json"
+      resource = "/logstores"
+      body = {}
+      body["logstoreName"] = logstore_name.encode("utf-8");
+      body["ttl"] = ttl;
+      body["shardCount"] = shard_count;
+      body_str = body.to_json;
+      resp, header = send("POST", project_name, body_str, resource, params, headers)
+      return CreateLogStoreResponse.new(header)
+    end
+
+
+    def get_logs()
+
+    end
+
+
+    def put_logs(request)
+      if request.logitems.length > 4096
+        raise AliyunSls::PostBodyTooLarge, "log item is larger than 4096"
+      end
+      logGroup = Protobuf::LogGroup.new(:logs => [])
+      logGroup.topic = request.topic
+      logGroup.source = request.source
+      request.logitems.each { |logitem|
+        log = Protobuf::Log.new(:time => logitem.timestamp, :contents => [])
+        logGroup.logs << log
+        contents = logitem.contents
+        contents.each { |k, v|
+          content = Protobuf::Log::Content.new(:key => k, :value => v)
+          log.contents <<  content
+        }
+      }
+      body = logGroup.encode.to_s
+      if body.length > 3 * 1024 * 1024
+        raise AliyunSls::PostBodyTooLarge, "content length is larger than 3MB"
+      end
+      headers = {}
+      headers['x-log-bodyrawsize'] = body.length.to_s
+      headers['Content-Type'] = 'application/x-protobuf'
+      is_compress = request.compress
+
+      compress_data = nil
+      if is_compress
+          headers['x-log-compresstype'] = 'deflate'
+          compress_data = Zlib::Deflate.deflate(body)
+
+      end
+      params = {}
+      logstore = request.logstore
+      project = request.project
+      resource = '/logstores/' + logstore
+      if request.hashkey
+          resource = '/logstores/' + logstore+"/shards/route"
+          params["key"] = request.hashkey
+      else
+          resource = '/logstores/' + logstore+"/shards/lb"
+      end
+
+      respHeaders = nil
+      if is_compress
+          respHeaders = send('POST', project, compress_data, resource, params, headers)
+      else
+          respHeaders = send('POST', project, body, resource, params, headers)
+      end
+      return PutLogsResponse.new(respHeaders[1])
+
+    end
+
+
+
+    private
+    def send(method, project, body, resource, params, headers, respons_body_type ='json')
+      if body
+        headers['Content-Length'] = body.bytesize.to_s
+        headers['Content-MD5'] = Util.cal_md5(body)
+      else
+        headers['Content-Length'] = '0'
+        headers["x-log-bodyrawsize"] = '0'
+      end
+      headers['x-log-apiversion'] = @@API_VERSION
+      headers['x-log-signaturemethod'] = 'hmac-sha1'
+      url = "http://" + project + "." + @endpoint
+      headers['Host'] = project + "." + @endpoint
+      headers['Date'] = headers["Date"] = DateTime.now.httpdate
+      signature = Util.get_request_authorization(method, resource,
+            @accessKeySecret, params, headers)
+      headers['Authorization'] = "LOG " + @accessKeyId + ':' + signature
+      url = url + resource
+      return sendRequest(method, url, params, body, headers, respons_body_type)
+    end
+
+    def sendRequest(method, url, params, body, headers, respons_body_type = 'json')
+      statusCode, respBody, respHeaders = getHttpResponse(method, url, params, body, headers)
+      if respHeaders['x-log-requestid']
+        requestId = respHeaders['x-log-requestid']
+      else
+        requestId = ''
+      end
+
+      if statusCode == '200'
+        if respons_body_type == 'json'
+          return respBody.to_json, respHeaders
+        else
+          return respBody, respHeaders
+        end
+      elsif statusCode.to_s =~ /[4|5]\d\d/
+        msg = "status: #{statusCode}, request_id: #{requestId}, body: #{respBody}"
+        if $logger and $logger.respond_to?(:error)
+          $logger.error msg
+        else
+          puts msg
+        end
+        if respons_body_type == 'json'
+          return respBody.to_json, respHeaders
+        else
+          return respBody, respHeaders
+        end
+      else
+        msg = "status: #{statusCode}, request_id: #{requestId}, body: #{respBody}"
+        if $logger and $logger.respond_to?(:error)
+          $logger.error msg
+        else
+          puts msg
+        end
+        if respons_body_type == 'json'
+          return respBody.to_json, respHeaders
+        else
+          return respBody, respHeaders
+        end
+      end
+    end
+
+    def getHttpResponse(method, url, params, body, headers)
+      headers['User-Agent'] = @@USER_AGENT
+      r = nil
+      uri = Addressable::URI.parse(url)
+      uri.query_values = params
+      methodRequest = nil
+      if method.downcase == 'get'
+        methodRequest = Net::HTTP::Get.new(uri.request_uri, headers)
+      elsif method.downcase == 'post'
+        methodRequest = Net::HTTP::Post.new(uri.request_uri, headers)
+        methodRequest.body = body
+      end
+      response = @@http.request uri, methodRequest
+      return response.code, response.body, response.to_hash
+    end
+  end
+end

data/lib/aliyun_sls_sdk/log_item.rb

@@ -0,0 +1,16 @@
+require "time"
+
+module AliyunSlsSdk
+  class LogItem
+
+    attr_accessor :timestamp, :contents
+    # contents is a hash
+    def initialize(timestamp, contents)
+      if not timestamp
+        @timestamp = Time.now.to_i
+      end
+      @contents = contents
+    end
+  end
+
+end

data/lib/aliyun_sls_sdk/log_request.rb

@@ -0,0 +1,8 @@
+module AliyunSlsSdk
+  class LogRequest
+    attr_accessor :project
+    def initialize(projectName)
+      @project = projectName
+    end
+  end
+end

data/lib/aliyun_sls_sdk/log_response.rb

@@ -0,0 +1,17 @@
+module AliyunSlsSdk
+  class LogResponse
+    attr_accessor :request_id,:all_headers
+
+    def initialize(headers)
+      @all_headers = headers
+      if headers['x-log-requestid']
+        @request_id = headers['x-log-requestid']
+      end
+        @request_id = ''
+    end
+
+    def get_header(key)
+      return @all_headers[key]
+    end
+  end
+end

data/lib/aliyun_sls_sdk/put_logs_request.rb

@@ -0,0 +1,15 @@
+
+module AliyunSlsSdk
+  class PutLogsRequest < LogRequest
+    attr_accessor :project, :logstore, :topic, :source, :logitems, :hashkey, :compress
+    def initialize(project=nil, logstore=nil, topic=nil, source=nil, logitems=nil, hashKey = nil, compress = false)
+      @project = project
+      @logstore = logstore
+      @topic = topic
+      @source = source
+      @logitems = logitems
+      @hashkey = hashKey
+      @compress = compress
+    end
+  end
+end

data/lib/aliyun_sls_sdk/put_logs_response.rb

@@ -0,0 +1,5 @@
+
+module AliyunSlsSdk
+  class PutLogsResponse < LogResponse
+  end
+end

data/lib/aliyun_sls_sdk/util.rb

@@ -0,0 +1,67 @@
+require "uri"
+require "base64"
+require "zlib"
+require "hmac-sha1"
+
+
+module AliyunSlsSdk
+  class Util
+    def self.compress_data(data)
+      Zlib::Deflate.deflate(data, 6)
+    end
+
+    def self.cal_md5(content)
+      Digest::MD5.hexdigest(content).upcase
+    end
+
+    def self.hmac_sha1(content, key)
+      Base64.encode64((HMAC::SHA1.new(key) << content).digest).rstrip()
+    end
+
+    def self.canonicalized_log_headers(headers)
+      h = {}
+      headers.each { |k, v|
+        if k =~ /x-log-.*/ or k =~ /x-acs-.*/
+          h[k.downcase] = v
+        end
+      }
+      h.keys.sort.map { |e|
+        "#{e}:#{h[e].gsub(/^\s+/, '')}"
+      }.join($/) + $/
+    end
+
+    def self.url_encode(params)
+      # todo
+    end
+
+    def self.canonicalized_resource(resource, params)
+      if not params.empty?
+        urlString = params.keys.sort.map { |k|
+          "#{k}=#{params[k]}"
+        }.join('&')
+        return resource+"?"+urlString
+      else
+        return resource
+      end
+    end
+
+    def self.get_request_authorization(method, resource, key, params, headers)
+      if not key
+        return ''
+      end
+      content = method + "\n"
+      if  headers['Content-MD5']
+            content += headers['Content-MD5']
+      end
+      content += "\n"
+      if headers['Content-Type']
+          content += headers['Content-Type']
+      end
+      content += "\n"
+      content += headers['Date']+"\n"
+      content += Util.canonicalized_log_headers(headers)
+      content += Util.canonicalized_resource(resource, params)
+      return Util.hmac_sha1(content, key)
+    end
+  end
+end

data/lib/aliyun_sls_sdk/version.rb

@@ -1,3 +1,3 @@
 module AliyunSlsSdk
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/aliyun_sls_sdk.rb

@@ -1,6 +1,15 @@
 require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'version.rb')
-require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'protobuf.rb')
 require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'connection.rb')
+require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'protobuf.rb')
+require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'log_request.rb')
+require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'get_log_request.rb')
+require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'put_logs_request.rb')
+require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'log_response.rb')
+require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'put_logs_response.rb')
+require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'util.rb')
+require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'log_client.rb')
+require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'log_item.rb')
+require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'create_log_store_response.rb')
 
 module AliyunSlsSdk
   class PostBodyInvalid < RuntimeError;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyun_sls_sdk
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - linhua.tlh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,7 +122,16 @@ files:
 - aliyun_sls_sdk.gemspec
 - lib/aliyun_sls_sdk.rb
 - lib/aliyun_sls_sdk/connection.rb
+- lib/aliyun_sls_sdk/create_log_store_response.rb
+- lib/aliyun_sls_sdk/get_log_request.rb
+- lib/aliyun_sls_sdk/log_client.rb
+- lib/aliyun_sls_sdk/log_item.rb
+- lib/aliyun_sls_sdk/log_request.rb
+- lib/aliyun_sls_sdk/log_response.rb
 - lib/aliyun_sls_sdk/protobuf.rb
+- lib/aliyun_sls_sdk/put_logs_request.rb
+- lib/aliyun_sls_sdk/put_logs_response.rb
+- lib/aliyun_sls_sdk/util.rb
 - lib/aliyun_sls_sdk/version.rb
 homepage: https://help.aliyun.com/product/28958.html
 licenses: