fluent-plugin-azurestorage-gen2 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c9dfe2426009f9375ce47d7285a6030af693c148
-  data.tar.gz: 9e76fe1f92164e6e3807482f04d7f2cf6fecc19b
+SHA256:
+  metadata.gz: c6a19402e29cb9d0cc99d4c7540abe4078bf18b01de1679321caac31bbc22009
+  data.tar.gz: 1e721f1eb70a0c492532fed6246f216457673e6f5c210f333f8a07fa2b8be8d6
 SHA512:
-  metadata.gz: dbdac55653f0e83acde54dc2ace5e58e43f6954b84bb0179526a4230adf59619be469f313508ecbeb772dc447473cd62e9d3fbaff9cb3af5d45b3d1ba6fdab45
-  data.tar.gz: 95475a64f3447e017da418c4faa87dabc932c12205b2050e9e4dd1382128f919415e466a94c68a90bd22be6be7cc3aaf4a426a9ffb1d4efff2bbb4a87925ef81
+  metadata.gz: bb60e722eca5df9ad5a4a46f85c5d00090f745757a7e475c0091e75df746066456cd16380899770758869b638469a7a2ff865370f96e641436d124066190e7ea
+  data.tar.gz: 10890970199e264c2a2cc7a2711558deeb1ca694af1d680b262cff47935249d84559878ae7a1096774cfddfaf15175c1e7a25b32511c24d2302d32f51c01e229

data/.github/workflows/build.yml

@@ -0,0 +1,25 @@
+name: Build Gem
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1
+        with:
+          ruby-version: '2.7'
+
+      - name: Build gem
+        run: make gem

data/.github/workflows/publish.yml

@@ -0,0 +1,32 @@
+name: Publish Gem
+
+on:
+  push:
+    tags:
+      - '*'
+
+env:
+  RUBYGEMS_USER: ${{ secrets.RUBYGEMS_USER }}
+  RUBYGEMS_PASSWORD: ${{ secrets.RUBYGEMS_PASSWORD }}
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1
+        with:
+          ruby-version: '2.7'
+
+      - name: Publish gem
+        run: |
+          curl -u $RUBYGEMS_USER:$RUBYGEMS_PASSWORD https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials
+          chmod 0600 ~/.gem/credentials
+          make push
+        env:
+          RUBYGEMS_USER: ${{ secrets.RUBYGEMS_USER }}
+          RUBYGEMS_PASSWORD: ${{ secrets.RUBYGEMS_PASSWORD }}

data/README.md

@@ -1,6 +1,6 @@
 # Azure Datalake Storage Gen2 Fluentd Output Plugin
 
-[![Build Status](https://travis-ci.org/oleewere/fluent-plugin-azurestorage-gen2.svg?branch=master)](https://travis-ci.org/oleewere/fluent-plugin-azurestorage-gen2)
+![Build](https://github.com/oleewere/fluent-plugin-azurestorage-gen2/actions/workflows/build.yml/badge.svg)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![Gem Version](https://badge.fury.io/rb/fluent-plugin-azurestorage-gen2.svg)](http://badge.fury.io/rb/fluent-plugin-azurestorage-gen2)
 ![](https://ruby-gem-downloads-badge.herokuapp.com/fluent-plugin-azurestorage-gen2?type=total&metric=true)
@@ -78,6 +78,18 @@ $ gem install fluent-plugin-azurestorage-gen2
 </match>
 ```
 
+- Configuration outside of VMs with OAuth credentials using Azure Government:
+```
+<match **>
+  ...
+  azure_oauth_tenant_id            <my tenant id>
+  azure_oauth_app_id               <my app client id>
+  azure_oauth_secret               <my client secret>
+  azure_oauth_identity_authority   login.microsoftonline.us
+  ...
+</match>
+```
+
 ### Configuration options
 
 ### azure_storage_account
@@ -113,6 +125,10 @@ OAuth client id that is used for OAuth based authentication. Required if OAuth b
 
 OAuth client secret that is used for OAuth based authentication. Required if OAuth based credential mechanism is used.
 
+### azure_oauth_identity_authority
+
+Identity Authority URL used to retrieve the OAuth token. Default is commercial cloud of 'login.microsoftonline.com' and to switch to using Azure Government Cloud, provide a value of 'login.microsoftonline.us'
+
 ### azure_oauth_refresh_interval
 
 OAuth2 access token refreshment interval in second. Only applies when MSI / OAuth authentication is used.
@@ -318,6 +334,10 @@ Proxy username for Azure proxy endpoint (used only if `proxy_url` is filled)
 
 Proxy password for Azure `proxy_username` (used only if `proxy_url` is filled)
 
+### http_timeout_seconds
+
+The time limit for HTTP request in seconds. Default: 120
+
 ## TODOs
 
 - add storage key support

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.4

data/lib/fluent/plugin/out_azurestorage_gen2.rb

@@ -29,6 +29,7 @@ module Fluent::Plugin
         config_param :azure_oauth_app_id, :string, :default => nil, :secret => true
         config_param :azure_oauth_secret, :string, :default => nil, :secret => true
         config_param :azure_oauth_tenant_id, :string, :default => nil
+        config_param :azure_oauth_identity_authority, :string, :default => "login.microsoftonline.com"
         config_param :azure_oauth_use_azure_cli, :bool, :default => false
         config_param :azure_oauth_refresh_interval, :integer, :default => 60 * 60
         config_param :azure_container, :string, :default => nil
@@ -51,6 +52,7 @@ module Fluent::Plugin
         config_param :proxy_password, :string, :default => nil, :secret => true
         config_param :write_only, :bool, :default => false
         config_param :upload_timestamp_format, :string, :default => '%H%M%S%L'
+        config_param :http_timeout_seconds, :integer, :default => 120
 
         DEFAULT_FORMAT_TYPE = "out_file"
         ACCESS_TOKEN_API_VERSION = "2018-02-01"
@@ -286,7 +288,8 @@ module Fluent::Plugin
             end
             req_opts = {
                 :params => params,
-                :headers => { Metadata: "true" }
+                :headers => { Metadata: "true" },
+                :timeout => @http_timeout_seconds
             }
             add_proxy_options(req_opts)
             request = Typhoeus::Request.new("http://169.254.169.254/metadata/identity/oauth2/token", req_opts)
@@ -310,10 +313,11 @@ module Fluent::Plugin
             req_opts = {
                 :params => params,
                 :body => content, 
-                :headers => headers
+                :headers => headers,
+                :timeout => @http_timeout_seconds
             }
             add_proxy_options(req_opts)
-            request = Typhoeus::Request.new("https://login.microsoftonline.com/#{@azure_oauth_tenant_id}/oauth2/token", req_opts)
+            request = Typhoeus::Request.new("#{@azure_oauth_identity_authority}/#{@azure_oauth_tenant_id}/oauth2/token", req_opts)
             request.on_complete do |response|
                 if response.success?
                   data = JSON.parse(response.body)
@@ -343,7 +347,8 @@ module Fluent::Plugin
             req_opts = {
                 :method => :head,
                 :params => params,
-                :headers => headers
+                :headers => headers,
+                :timeout => @http_timeout_seconds
             }
             add_proxy_options(req_opts)
             request = Typhoeus::Request.new("https://#{azure_storage_account}#{@url_domain_suffix}/#{@azure_container}", req_opts)
@@ -376,7 +381,8 @@ module Fluent::Plugin
             req_opts = {
                 :method => :put,
                 :params => params,
-                :headers => headers
+                :headers => headers,
+                :timeout => @http_timeout_seconds
             }
             add_proxy_options(req_opts)
             request = Typhoeus::Request.new("https://#{azure_storage_account}#{@url_domain_suffix}/#{@azure_container}", req_opts)
@@ -402,7 +408,8 @@ module Fluent::Plugin
             req_opts = {
                 :method => :put,
                 :params => params,
-                :headers => headers
+                :headers => headers,
+                :timeout => @http_timeout_seconds
             }
             add_proxy_options(req_opts)
             request = Typhoeus::Request.new("https://#{azure_storage_account}#{@url_domain_suffix}/#{@azure_container}#{blob_path}", req_opts)
@@ -432,7 +439,8 @@ module Fluent::Plugin
                 :method => :patch,
                 :params => params,
                 :headers => headers,
-                :body => content
+                :body => content,
+                :timeout => @http_timeout_seconds
             }
             add_proxy_options(req_opts)
             request = Typhoeus::Request.new("https://#{azure_storage_account}#{@url_domain_suffix}/#{@azure_container}#{blob_path}", req_opts)
@@ -463,7 +471,8 @@ module Fluent::Plugin
             req_opts = {
                 :method => :patch,
                 :params => params,
-                :headers => headers
+                :headers => headers,
+                :timeout => @http_timeout_seconds
             }
             add_proxy_options(req_opts)
             request = Typhoeus::Request.new("https://#{azure_storage_account}#{@url_domain_suffix}/#{@azure_container}#{blob_path}", req_opts)
@@ -490,7 +499,8 @@ module Fluent::Plugin
             req_opts = {
                 :method => :head,
                 :params => params,
-                :headers => headers
+                :headers => headers,
+                :timeout => @http_timeout_seconds
             }
             add_proxy_options(req_opts)
             request = Typhoeus::Request.new("https://#{azure_storage_account}#{@url_domain_suffix}/#{@azure_container}#{blob_path}", req_opts)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-azurestorage-gen2
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Oliver Szabo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-06 00:00:00.000000000 Z
+date: 2023-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -191,8 +191,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build.yml"
+- ".github/workflows/publish.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - Makefile
@@ -225,11 +226,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Azure Storage output plugin for Fluentd event collector
-test_files:
-- test/helper.rb
-- test/plugin/test_out_azurestorage_gen2.rb
+test_files: []

data/.travis.yml

@@ -1,14 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.4
-
-gemfile:
- - Gemfile
-
-branches:
-  only:
-    - master
-
-# bundle exec rake test
-script: make gem