fluent-plugin-azure-storage-append-blob 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7640e2e4b681f3d556b69dfd6cce4483c5af1e3a98a92b9261c5a2d9e1365277
-  data.tar.gz: 1fbc5232cbe8e50f6518fc41460e94ad59f9187d36fa8f3faf4800b5490b46d3
+  metadata.gz: 7a89c4f7d6a51e00949d27e329f80304d3eecb461bea1f4b87f65c799dceeaf4
+  data.tar.gz: dbaa1b0840aa9e99c3bced832851f8c24a65a664260a197e1537baafb341f01f
 SHA512:
-  metadata.gz: cbc94f676ec13fec572539c98b82f200f6ef11659ca6745720eefcd2d71c7b34ac9287a9175b1a0bc1c84e6d70feaf7ceea5df8ad5c3af7600fffb52237356c2
-  data.tar.gz: 1989910ce48aaffd875d4226c097e85d25c04cea12dbcc9c4cfad13560a52ae1406675544be27bf02981fc20f78e4da88bf07d3ffd58fcc7744f7a0ddaeeee44
+  metadata.gz: ff251e63e5ccbb5262713ef7a44b59c72b552a534a37eff2ae50d9342e1fcffc328569764c00f61059429441401269c505b221bff681b96737e8aa46a91358c3
+  data.tar.gz: a6ab02e79f9044cec9c08f3799442516c337900e484753d656403fe8c6ce9f62ac58b92056f45aa554d681d4372933e91408f54f99630a83106fefc716e4bade

data/.github/workflows/gem-push.yml

@@ -2,6 +2,10 @@ name: Ruby Gem
 
 on:
   workflow_dispatch:
+    inputs:
+      otp:
+        description: 'One Time Password'     
+        required: true
 
 jobs:
   build:
@@ -22,6 +26,6 @@ jobs:
         chmod 0600 $HOME/.gem/credentials
         printf -- "---\n:rubygems_api_key: ${RUBYGEMS_API_KEY}\n" > $HOME/.gem/credentials
         gem build *.gemspec
-        gem push *.gem
+        gem push *.gem --otp ${{ github.event.inputs.otp }}
       env:
         RUBYGEMS_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

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

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name = 'fluent-plugin-azure-storage-append-blob'
-  spec.version = '0.2.0'
+  spec.version = '0.2.1'
   spec.authors = ['Microsoft Corporation']
   spec.email = ['']
 

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

@@ -150,10 +150,23 @@ module Fluent
         end
       end
 
+      def container_exists?(container)
+        begin
+          @bs.get_container_properties(container)
+        rescue Azure::Core::Http::HTTPError => ex
+          if ex.status_code == 404 # container does not exist
+            return false
+          else
+            raise
+          end
+        end
+        return true
+      end
+
       private
 
       def ensure_container
-        unless @bs.list_containers.find { |c| c.name == @azure_container }
+        unless container_exists? @azure_container
           if @auto_create_container
             @bs.create_container(@azure_container)
           else

data/test/plugin/test_out_azure_storage_append_blob.rb

@@ -1,5 +1,7 @@
 require 'helper'
 require 'fluent/plugin/out_azure-storage-append-blob.rb'
+require 'azure/core/http/http_response'
+require 'azure/core/http/http_error'
 
 include Fluent::Test::Helpers
 
@@ -83,4 +85,53 @@ class AzureStorageAppendBlobOutTest < Test::Unit::TestCase
       assert_equal slice, Time.now.utc.strftime('log/%Y/%m/%d')
     end
   end
+
+  # 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)
+      @status = status
+      @body = "body"
+      @headers = {}
+    end
+
+    attr_reader :status
+    attr_reader :body
+    attr_reader :headers
+  end
+
+  # This class is used to test plugin functions which interact with the blob service
+  class FakeBlobService
+    def initialize(status)
+      @response = Azure::Core::Http::HttpResponse.new(FakeResponse.new(status))
+    end
+
+    def get_container_properties(container)
+      unless @response.status_code == 200
+        raise Azure::Core::Http::HTTPError.new(@response)
+      end
+    end
+  end
+
+  sub_test_case 'test container_exists' do
+    test 'container 404 returns false' do
+      d = create_driver
+      d.instance.instance_variable_set(:@bs, FakeBlobService.new(404))
+      assert_false d.instance.container_exists? "anything"
+    end
+
+    test 'existing container returns true' do
+      d = create_driver
+      d.instance.instance_variable_set(:@bs, FakeBlobService.new(200))
+      assert_true d.instance.container_exists? "anything"
+    end
+
+    test 'unexpected exception raises' do
+      d = create_driver
+      d.instance.instance_variable_set(:@bs, FakeBlobService.new(500))
+      assert_raise_kind_of Azure::Core::Http::HTTPError do
+        d.instance.container_exists? "anything"
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-azure-storage-append-blob
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Microsoft Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler