fluent-plugin-azure-storage-append-blob-lts 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f0868aba2220e9c160b9e8bec8854921864b580c1b7cb1d05845ca9e73c4606
-  data.tar.gz: 4d73dcf3a57b45018de76a862407062049735da53e96aa664db6304bc65b8718
+  metadata.gz: e1dca8c31f6ec0f0383d24637d3c0b6225d92e8505387a5c1a422d85057f0340
+  data.tar.gz: 240d435415a53386a245d3449d092eb2d71a85c2e08e989b841ec71b7a20a9f5
 SHA512:
-  metadata.gz: d72f2ccdfb8c92f13694c05f4fc9a349144dd4016b0c1eebee613d8ef536a5072a8635028a097cf21a546220cd11f870eddd4675b1e3241194b39d2a0ddf2d46
-  data.tar.gz: a7dfd1c386ed529d9ead3978fe436c7f69a653bd4ce206b5755c8af78142464c4779ab3d781fc14c035f650e5e8940c97a8a4dca240a933ffb5d733b924d9ae3
+  metadata.gz: 7744655dfad7169b43df0db53a20c781276d8dba8a83c2858e1809cb281008e9b401b6755ec6fb0efa4eff0311c2e76fc2d2e60164ffd373ef0087b81fabc9cf
+  data.tar.gz: 046e1e69571d6502d6c06d52d49c3e97234f4b2a44e15210122941d6787bac825769b40f2c1e70cff926f8d5a6ca9cf916ee2aac42b06a82367c7b9c0f410279

data/.github/workflows/publish.yaml

@@ -11,14 +11,12 @@ jobs:
   build:
     name: Build + Publish
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby 2.6
       uses: actions/setup-ruby@v1
       with:
         ruby-version: 2.6.x
-
     - name: Publish to RubyGems
       run: |
         mkdir -p $HOME/.gem

data/.github/workflows/test.yaml

@@ -8,9 +8,7 @@ on:
 
 jobs:
   test:
-
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby

data/fluent-plugin-azure-storage-append-blob-lts.gemspec

@@ -3,12 +3,12 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name = 'fluent-plugin-azure-storage-append-blob-lts'
-  spec.version = '0.4.0'
+  spec.version = '0.5.0'
   spec.authors = ['Jonas-Taha El Sesiy']
-  spec.email = ['']
+  spec.email = ['github@elsesiy.com']
 
   spec.summary = 'Azure Storage Append Blob output plugin for Fluentd event collector'
-  spec.description = 'Fluentd plugin to upload logs to Azure Storage append blobs. Fork of https://github.com/elsesiy/fluent-plugin-azure-storage-append-blob'
+  spec.description = 'Fluentd plugin to upload logs to Azure Storage append blobs. Fork of https://github.com/microsoft/fluent-plugin-azure-storage-append-blob'
   spec.homepage = 'https://github.com/elsesiy/fluent-plugin-azure-storage-append-blob-lts'
   spec.license = 'MIT'
 

data/lib/fluent/plugin/out_azure-storage-append-blob.rb

@@ -61,15 +61,14 @@ module Fluent
                          end
                        end
 
-        raise ConfigError, 'azure_storage_account needs to be specified' if @azure_storage_account.nil?
-
-        raise ConfigError, 'azure_container needs to be specified' if @azure_container.nil?
-
         if (@azure_storage_access_key.nil? || @azure_storage_access_key.empty?) &&
            (@azure_storage_sas_token.nil? || @azure_storage_sas_token.empty?) &&
            (@azure_storage_connection_string.nil? || @azure_storage_connection_string.empty?)
-          log.info 'Using MSI since neither azure_storage_access_key nor azure_storage_sas_token was provided.'
+          log.info 'Using MSI since neither of azure_storage_access_key, azure_storage_sas_token, azure_storage_connection_string was provided.'
           @use_msi = true
+        elsif @azure_storage_connection_string.nil? || @azure_storage_connection_string.empty?
+          raise ConfigError, 'azure_storage_account needs to be specified' if @azure_storage_account.nil?
+          raise ConfigError, 'azure_container needs to be specified' if @azure_container.nil?
         end
       end
 

data/test/plugin/test_out_azure_storage_append_blob.rb

@@ -18,6 +18,12 @@ class AzureStorageAppendBlobOutTest < Test::Unit::TestCase
     path log
   ).freeze
 
+  CONNSTR_CONFIG = %(
+    azure_storage_connection_string https://test
+    time_slice_format        %Y%m%d-%H
+    path log
+  ).freeze
+
   MSI_CONFIG = %(
     azure_storage_account test_storage_account
     azure_container test_container
@@ -66,6 +72,13 @@ class AzureStorageAppendBlobOutTest < Test::Unit::TestCase
       assert_equal 120, d.instance.azure_token_refresh_interval
       assert_equal '1970-01-01', d.instance.azure_imds_api_version
     end
+
+    test 'config with connection string should set instance variables' do
+      d = create_driver conf: CONNSTR_CONFIG
+      assert_equal 'https://test', d.instance.azure_storage_connection_string
+      assert_equal false, d.instance.use_msi
+      assert_equal true, d.instance.auto_create_container
+    end
   end
 
   sub_test_case 'test path slicing' do
@@ -92,15 +105,13 @@ class AzureStorageAppendBlobOutTest < Test::Unit::TestCase
   # This class is used to create an Azure::Core::Http::HTTPError. HTTPError parses
   # a response object when it is created.
   class FakeResponse
-    def initialize(status=404)
+    def initialize(status = 404)
       @status = status
-      @body = "body"
+      @body = 'body'
       @headers = {}
     end
 
-    attr_reader :status
-    attr_reader :body
-    attr_reader :headers
+    attr_reader :status, :body, :headers
   end
 
   # This class is used to test plugin functions which interact with the blob service
@@ -125,18 +136,18 @@ class AzureStorageAppendBlobOutTest < Test::Unit::TestCase
   sub_test_case 'test container_exists' do
     test 'container 404 returns false' do
       d = create_driver service: FakeBlobService.new(404)
-      assert_false d.instance.container_exists? "anything"
+      assert_false d.instance.container_exists? 'anything'
     end
 
     test 'existing container returns true' do
       d = create_driver service: FakeBlobService.new(200)
-      assert_true d.instance.container_exists? "anything"
+      assert_true d.instance.container_exists? 'anything'
     end
 
     test 'unexpected exception raises' do
       d = create_driver service: FakeBlobService.new(500)
       assert_raise_kind_of Azure::Core::Http::HTTPError do
-        d.instance.container_exists? "anything"
+        d.instance.container_exists? 'anything'
       end
     end
   end
@@ -175,10 +186,10 @@ class AzureStorageAppendBlobOutTest < Test::Unit::TestCase
 
     test 'long buffer appends multiple times' do
       limit = Fluent::Plugin::AzureStorageAppendBlobOut::AZURE_BLOCK_SIZE_LIMIT
-      buf_1 = 'a' * limit
-      buf_2 = 'a' * 3
-      blocks = fake_appended_blocks buf_1 + buf_2
-      assert_equal [buf_1, buf_2], blocks
+      buf1 = 'a' * limit
+      buf2 = 'a' * 3
+      blocks = fake_appended_blocks buf1 + buf2
+      assert_equal [buf1, buf2], blocks
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-azure-storage-append-blob-lts
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Jonas-Taha El Sesiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-20 00:00:00.000000000 Z
+date: 2021-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,9 +87,9 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 description: Fluentd plugin to upload logs to Azure Storage append blobs. Fork of
-  https://github.com/elsesiy/fluent-plugin-azure-storage-append-blob
+  https://github.com/microsoft/fluent-plugin-azure-storage-append-blob
 email:
-- ''
+- github@elsesiy.com
 executables: []
 extensions: []
 extra_rdoc_files: []