fluent-plugin-azure-storage-append-blob-lts 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24eb19ac68cd42369ff7f147be24635945aad7c003f4ed789bcb4189d5f9a96e
-  data.tar.gz: f293437b177cf4f7fc7a02694150f03f479c70749a3973d2ffc45a19377b7784
+  metadata.gz: f9e6de27ebbf624d51968e415d502111523d3fd670d2345558381b03895934d6
+  data.tar.gz: 80fbe42cee9d82adb02afbaf2cfed1fd92b0d4fbbbfb1e67b50e328795d90b23
 SHA512:
-  metadata.gz: 7be9b8cf563a7c2cf5b10667a8d037ea5a17d84a78ab3a782a937f5c06e0f850804985fef3b5b6eff795e965c4eefa0d690ddd737485929fa4882df416e420c0
-  data.tar.gz: d4bb668e69155459e1b69ce954f9b8434a9dfa5e92dbf5e1324e9a1d50514c2e7b6b34e513f5fcb3621f5ba7b2b2dee5d7dea1cf37788ffe198869f5d7a3a0a4
+  metadata.gz: d3c2e0296f88ae875f19043e322678aa9a7ea3a26e9bb41f9f4292991ff09a6a50022d03c1da48b36e0c724c2e9e83f70ef431e1b9a3fc628507774a8de32943
+  data.tar.gz: a86038ca1acc515dd05df9f86d014cef337c5cc8a70847a15dd94b8f86fe2233c5b0a49be988f26a3da86f298d1aa27465aab4fb904ddd8eeef9e16535291d99

data/README.md

@@ -29,6 +29,7 @@ And then execute:
       type azure-storage-append-blob
 
       azure_cloud                       <azure cloud environment>
+      azure_storage_dns_suffix          <your azure storage dns suffix> # only used for Azure Stack Cloud
       azure_storage_account             <your azure storage account>
       azure_storage_access_key          <your azure storage access key> # leave empty to use MSI
       azure_storage_connection_string   <your azure storage connection string> # leave empty to use MSI
@@ -59,6 +60,12 @@ Default: `AZUREPUBLICCLOUD`
 
 Cloud environment used to determine the storage endpoint suffix to use, see [here](https://github.com/Azure/go-autorest/blob/master/autorest/azure/environments.go).
 
+Use `AZURESTACKCLOUD` for Azure Stack Cloud.
+
+### `azure_storage_dns_suffix` (Required only for Azure Stack Cloud)
+
+Your Azure Storage endpoint suffix. This can be retrieved from Azure Storage connection string, `EndpointSuffix` section.
+
 ### `azure_storage_account` (Required)
 
 Your Azure Storage Account Name. This can be retrieved from Azure Management portal.
@@ -72,11 +79,11 @@ If all are empty, the plugin will use the local Managed Identity endpoint to obt
 
 ### `azure_imds_api_version` (Optional, only for MSI)
 
-Default: `2019-08-15`
+Default: `2020-12-01`
 
 The Instance Metadata Service is used during the OAuth flow to obtain an access token. This API is versioned and specifying the version is mandatory.
 
-See [here](https://docs.microsoft.com/en-us/azure/virtual-machines/linux/instance-metadata-service#versioning) for more details.
+See [here](https://docs.microsoft.com/en-us/azure/virtual-machines/linux/instance-metadata-service?tabs=windows#versioning) for more details.
 
 ### `azure_token_refresh_interval` (Optional, only for MSI)
 

data/fluent-plugin-azure-storage-append-blob-lts.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-lts'
-  spec.version = '0.6.2'
+  spec.version = '0.6.3'
   spec.authors = ['Jonas-Taha El Sesiy']
   spec.email = ['github@elsesiy.com']
 

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

@@ -36,11 +36,12 @@ module Fluent
       config_param :azure_storage_account, :string, default: nil
       config_param :azure_storage_access_key, :string, default: nil, secret: true
       config_param :azure_storage_connection_string, :string, default: nil, secret: true
+      config_param :azure_storage_dns_suffix, :string, default: nil
       config_param :azure_storage_sas_token, :string, default: nil, secret: true
       config_param :azure_cloud, :string, default: 'AZUREPUBLICCLOUD'
       config_param :azure_msi_client_id, :string, default: nil
       config_param :azure_container, :string, default: nil
-      config_param :azure_imds_api_version, :string, default: '2019-08-15'
+      config_param :azure_imds_api_version, :string, default: '2020-12-01'
       config_param :azure_token_refresh_interval, :integer, default: 60
       config_param :azure_object_key_format, :string, default: '%{path}%{time_slice}-%{index}.log'
       config_param :auto_create_container, :bool, default: true
@@ -75,9 +76,15 @@ module Fluent
                          end
                        end
 
-        @azure_storage_dns_suffix = @storage_endpoint_mapping[@azure_cloud]
-        if @azure_storage_dns_suffix.nil?
-          raise ConfigError 'azure_cloud invalid, must be either of AZURECHINACLOUD, AZUREGERMANCLOUD, AZUREPUBLICCLOUD, AZUREUSGOVERNMENTCLOUD'
+        if @azure_cloud == 'AZURESTACKCLOUD'
+          if @azure_storage_dns_suffix.nil?
+            raise ConfigError, 'azure_storage_dns_suffix invalid, must not be empty for AZURESTACKCLOUD'
+          end
+        else
+          @azure_storage_dns_suffix = @storage_endpoint_mapping[@azure_cloud]
+          if @azure_storage_dns_suffix.nil?
+            raise ConfigError, 'azure_cloud invalid, must be either of AZURECHINACLOUD, AZUREGERMANCLOUD, AZUREPUBLICCLOUD, AZUREUSGOVERNMENTCLOUD, AZURESTACKCLOUD'
+          end
         end
 
         if (@azure_storage_access_key.nil? || @azure_storage_access_key.empty?) &&

data/test/plugin/test_out_azure_storage_append_blob.rb

@@ -34,6 +34,16 @@ class AzureStorageAppendBlobOutTest < Test::Unit::TestCase
     path log
   ).freeze
 
+  AZURESTACKCLOUD_CONFIG = %(
+    azure_cloud AZURESTACKCLOUD
+    azure_storage_dns_suffix test.storage.dns.suffix
+    azure_storage_account test_storage_account
+    azure_storage_access_key MY_FAKE_SECRET
+    azure_container test_container
+    time_slice_format        %Y%m%d-%H
+    path log
+  ).freeze
+
   def create_driver(conf: CONFIG, service: nil)
     d = Fluent::Test::Driver::Output.new(Fluent::Plugin::AzureStorageAppendBlobOut).configure(conf)
     d.instance.instance_variable_set(:@bs, service)
@@ -43,7 +53,7 @@ class AzureStorageAppendBlobOutTest < Test::Unit::TestCase
 
   sub_test_case 'test config' do
     test 'config should reject with no azure container' do
-      assert_raise Fluent::ConfigError do
+      assert_raise Fluent::ConfigError.new('azure_container needs to be specified') do
         create_driver conf: %(
           azure_storage_account test_storage_account
           azure_storage_access_key MY_FAKE_SECRET
@@ -54,6 +64,22 @@ class AzureStorageAppendBlobOutTest < Test::Unit::TestCase
       end
     end
 
+    test 'config should reject for invalid cloud ' do
+      assert_raise Fluent::ConfigError.new('azure_cloud invalid, must be either of AZURECHINACLOUD, AZUREGERMANCLOUD, AZUREPUBLICCLOUD, AZUREUSGOVERNMENTCLOUD, AZURESTACKCLOUD') do
+        create_driver conf: %(
+          azure_cloud INVALIDCLOUD
+        )
+      end
+    end
+
+    test 'config should reject for Azure Stack Cloud with no azure storage dns suffix' do
+      assert_raise Fluent::ConfigError.new('azure_storage_dns_suffix invalid, must not be empty for AZURESTACKCLOUD') do
+        create_driver conf: %(
+          azure_cloud AZURESTACKCLOUD
+        )
+      end
+    end
+
     test 'config with access key should set instance variables' do
       d = create_driver
       assert_equal 'core.cloudapi.de', d.instance.instance_variable_get(:@azure_storage_dns_suffix)
@@ -81,6 +107,16 @@ class AzureStorageAppendBlobOutTest < Test::Unit::TestCase
       assert_equal false, d.instance.instance_variable_get(:@use_msi)
       assert_equal true, d.instance.auto_create_container
     end
+  
+    test 'config for Azure Stack Cloud should set instance variables' do
+      d = create_driver conf: AZURESTACKCLOUD_CONFIG
+      assert_equal 'test.storage.dns.suffix', d.instance.instance_variable_get(:@azure_storage_dns_suffix)
+      assert_equal 'test_storage_account', d.instance.azure_storage_account
+      assert_equal 'MY_FAKE_SECRET', d.instance.azure_storage_access_key
+      assert_equal 'test_container', d.instance.azure_container
+      assert_equal true, d.instance.auto_create_container
+      assert_equal '%{path}%{time_slice}-%{index}.log', d.instance.azure_object_key_format
+    end
   end
 
   sub_test_case 'test path slicing' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-azure-storage-append-blob-lts
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Jonas-Taha El Sesiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2021-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler