fluent-plugin-azurestorage-gen2 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1f459cce5a616b607bcd07b2a0e60acb2b7f0e2
-  data.tar.gz: 6c162b6991996a2fb61f7f3f8af87a3e74454b6f
+  metadata.gz: 2f30aa7c60fa869b86eb0d921aab12831c6355b6
+  data.tar.gz: 522010167e94cb9500e89b13aa68c4ec0bba1053
 SHA512:
-  metadata.gz: 75e25084709b908aa16411d04262e828c52bbe367cc11d250ab8c9b7575cf819134b69aa0dc15c6c9ba8d902212c40bb79336ce9661378d4fc2968d87020f112
-  data.tar.gz: 460b141c22880446e7a6a15990f5c7d753646c372aefb41a7b13ecb6fb270fe9fe44528cb985c54fde282adba39179ca42a86bbd6713b530d66703c6ba3e425f
+  metadata.gz: 5d40bc5c3964bd9187e6710dbda66f7e3556f310425120cf2c46da19a34c8905676278f4428d744a3255ce83e55bf8bdd2791dae755b25aefcf32d39e771c8b6
+  data.tar.gz: 149ee0c0ffc588e048fd0fa87cc343af153d6dc6de4132e9ace1d06f13b80e9d4f6ca60dba1892972693e6dfb37fc0dc649e233e538ccdcf982bbbc6540d1d1f

data/README.md

@@ -9,7 +9,7 @@
 
 | fluent-plugin-azurestorage-gen2 | fluentd | ruby |
 |------------------------|---------|------|
-| >= 0.1.5 | >= v0.14.0 | >= 2.4 |
+| >= 0.1.6 | >= v0.14.0 | >= 2.4 |
 
 ## Overview
 

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/fluent/plugin/out_azurestorage_gen2.rb

@@ -89,11 +89,6 @@ module Fluent::Plugin
             @azure_storage_path = ''
             @last_azure_storage_path = ''
             @current_index = 0
-            if @store_as.nil? || @store_as == "none" || @store_as == "text"
-                @blob_content_type = "text/plain"
-            else
-                @blob_content_type = "application/octet-stream"
-            end
 
             if @store_as.nil? || @store_as == "none"
                 @final_file_extension = @file_extension
@@ -239,7 +234,7 @@ module Fluent::Plugin
                 if response.success?
                   data = JSON.parse(response.body)
                   log.debug "azurestorage_gen2: Token response: #{data}"
-                  @azure_access_token = data["access_token"]
+                  @azure_access_token = data["access_token"].chomp
                 else
                     raise Fluent::UnrecoverableError, "Failed to acquire access token. #{response.code}: #{response.body}"
                 end
@@ -257,7 +252,7 @@ module Fluent::Plugin
                 if response.success?
                   data = JSON.parse(response.body)
                   log.debug "azurestorage_gen2: Token response: #{data}"
-                  @azure_access_token = data["access_token"]
+                  @azure_access_token = data["access_token"].chomp
                 else
                     raise Fluent::UnrecoverableError, "Failed to acquire access token. #{response.code}: #{response.body}"
                 end
@@ -269,7 +264,7 @@ module Fluent::Plugin
         def acquire_access_token_by_az
             access_token=`az account get-access-token --resource https://storage.azure.com/ --query accessToken -o tsv`
             log.debug "azurestorage_gen2: Token response: #{access_token}"
-            @azure_access_token = access_token
+            @azure_access_token = access_token.chomp
         end
 
         private
@@ -322,7 +317,7 @@ module Fluent::Plugin
         private
         def create_blob(blob_path)
             datestamp = create_request_date
-            headers = {:"x-ms-version" =>  ABFS_API_VERSION, :"x-ms-date" => datestamp,:"Content-Length" => "0", :"Content-Type" => "#{@blob_content_type}"}
+            headers = {:"x-ms-version" =>  ABFS_API_VERSION, :"x-ms-date" => datestamp,:"Content-Length" => "0", :"Content-Type" => "text/plain"}
             params = {:resource => "file", :recursive => "false"}
             auth_header = create_auth_header("put", datestamp, "#{@azure_container}#{blob_path}", headers, params)
             headers[:Authorization] = auth_header
@@ -345,11 +340,11 @@ module Fluent::Plugin
         def append_blob_block(blob_path, content, position)
             log.debug "azurestorage_gen2: append_blob_block.start: Append blob ('#{blob_path}') called with position #{position}"
             datestamp = create_request_date
-            headers = {:"x-ms-version" =>  ABFS_API_VERSION,  :"x-ms-date" => datestamp, :"Content-Type" => "#{@blob_content_type}", :"Content-Length" => content.length}
+            headers = {:"x-ms-version" =>  ABFS_API_VERSION,  :"x-ms-date" => datestamp, :"Content-Length" => content.length}
             params = {:action => "append", :position => "#{position}"}
             auth_header = create_auth_header("patch", datestamp, "#{@azure_container}#{blob_path}", headers, params)
             headers[:Authorization] = auth_header
-            request = Typhoeus::Request.new("https://#{azure_storage_account}#{URL_DOMAIN_SUFFIX}/#{@azure_container}#{blob_path}", :method => :patch, :body => content, :params => params, :headers=> headers)
+            request = Typhoeus::Request.new("https://#{azure_storage_account}#{URL_DOMAIN_SUFFIX}/#{@azure_container}#{blob_path}", :method => :patch, :headers=> headers, :params => params, :body => content)
             request.on_complete do |response|
                 if response.success?
                     log.debug "azurestorage_gen2: Blob '#{blob_path}' has been appended, response code: #{response.code}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-azurestorage-gen2
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Oliver Szabo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2020-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd