fluent-plugin-gcs 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85b1b9b0ed8cd2b264dacc7f54fb1bf9e15b2f1e6f28871b17e0bb7e844e1669
-  data.tar.gz: a90fec1f3d5509be2df1a72d2479e9db6ba7f133ad67c60789abbdbb1360e519
+  metadata.gz: 06b8bb5edbdcbf288abdadf04670aba1ce83ce1e9f1f8d2ccfae29c543a6b87e
+  data.tar.gz: 2678dbe5a7bdd06149be0cd8bd4bfb0b65557b842c58790b0db7680ba4f58d82
 SHA512:
-  metadata.gz: 8bcb9225215a56ea5ad0d34ac2447e0b39074ae9269e885c2ac70ba2679213340653b47941ea2c5c395861535fd565ae81a6e153e48adef175cf6966b1849a20
-  data.tar.gz: dfe13e0a8ea31f3d80d1174aa4c35385cf6206820d5574f31d501767e972b144f646a48711e64c63b10261045385aed4af9a2e7516aeeac0f6aa460cb37cf807
+  metadata.gz: 67857cecbfc047d0f8e2dbbf0cf3065a3f0b0a11ce08bf277574060f0238648ef36ca4f5d8f498af4a30632a13d81112cc0ae9a55846bb7aaf3703260df07260
+  data.tar.gz: ae8f1b545dc3b89f8209597addff218ec713040970ab3bdc4dd4db35acf4482927d9f41ccad3a90bc8c9eb0a66d20ba3116d3c06839772669181350d54dd266c

data/.github/workflows/test.yaml

@@ -0,0 +1,24 @@
+name: Test
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['3.1', '3.2']
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run tests
+      run: bundle exec rake test

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 New features / Enhancements
 
+## [0.4.2] - 2022/08/16
+
+Bug fixes
+
+- [Fix automatic conversion from a hash to keyword arguments](https://github.com/daichirata/fluent-plugin-gcs/pull/22)
+
 ## [0.4.1] - 2020/04/17
 
 New features

data/Gemfile

@@ -1,4 +1,13 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
+
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in fluent-plugin-gcs.gemspec
 gemspec
+
+gem "rake", "~> 13.0"
+gem "rr", "= 1.1.2"
+gem "test-unit", ">= 3.0.8"
+gem "test-unit-rr", ">= 1.0.3"
+gem "timecop"
+gem "solargraph"

data/README.md

@@ -1,5 +1,5 @@
 # fluent-plugin-gcs
-[![Gem Version](https://badge.fury.io/rb/fluent-plugin-gcs.svg)](https://badge.fury.io/rb/fluent-plugin-gcs) [![Build Status](https://travis-ci.org/daichirata/fluent-plugin-gcs.svg?branch=master)](https://travis-ci.org/daichirata/fluent-plugin-gcs) [![Code Climate](https://codeclimate.com/github/daichirata/fluent-plugin-gcs/badges/gpa.svg)](https://codeclimate.com/github/daichirata/fluent-plugin-gcs)
+[![Gem Version](https://badge.fury.io/rb/fluent-plugin-gcs.svg)](https://badge.fury.io/rb/fluent-plugin-gcs) [![Test](https://github.com/daichirata/fluent-plugin-gcs/actions/workflows/test.yaml/badge.svg)](https://github.com/daichirata/fluent-plugin-gcs/actions/workflows/test.yaml) [![Code Climate](https://codeclimate.com/github/daichirata/fluent-plugin-gcs/badges/gpa.svg)](https://codeclimate.com/github/daichirata/fluent-plugin-gcs)
 
 Google Cloud Storage output plugin for [Fluentd](https://github.com/fluent/fluentd).
 

data/fluent-plugin-gcs.gemspec

@@ -22,10 +22,4 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "fluentd", [">= 0.14.22", "< 2"]
   spec.add_runtime_dependency "google-cloud-storage", "~> 1.1"
-
-  spec.add_development_dependency "rake", ">= 12.3.3"
-  spec.add_development_dependency "rr", "= 1.1.2"
-  spec.add_development_dependency "test-unit", ">= 3.0.8"
-  spec.add_development_dependency "test-unit-rr", ">= 1.0.3"
-  spec.add_development_dependency "timecop"
 end

data/lib/fluent/plugin/gcs/version.rb

@@ -1,5 +1,5 @@
 module Fluent
   module GCSPlugin
-    VERSION = "0.4.1"
+    VERSION = "0.4.3"
   end
 end

data/lib/fluent/plugin/out_gcs.rb

@@ -15,6 +15,7 @@ module Fluent::Plugin
     def initialize
       super
       require "google/cloud/storage"
+      Google::Apis.logger = log
     end
 
     config_param :project, :string,  default: nil,
@@ -131,7 +132,7 @@ module Fluent::Plugin
         opts.merge!(@encryption_opts)
 
         log.debug { "out_gcs: upload chunk:#{chunk.key} to gcs://#{@bucket}/#{path} options: #{opts}" }
-        @gcs_bucket.upload_file(obj.path, path, opts)
+        @gcs_bucket.upload_file(obj.path, path, **opts)
       end
     end
 
@@ -153,13 +154,13 @@ module Fluent::Plugin
 
     def check_object_exists(path)
       if !@blind_write
-        return @gcs_bucket.find_file(path, @encryption_opts)
+        return @gcs_bucket.find_file(path, **@encryption_opts)
       else
         return false
       end
     end
 
-    def generate_path(chunk, i = 0, prev = nil)
+    def generate_path(chunk)
       metadata = chunk.metadata
       time_slice = if metadata.timekey.nil?
                      ''.freeze
@@ -170,23 +171,34 @@ module Fluent::Plugin
         "%{file_extension}" => @object_creator.file_extension,
         "%{hex_random}" => hex_random(chunk),
         "%{hostname}" => Socket.gethostname,
-        "%{index}" => i,
         "%{path}" => @path,
         "%{time_slice}" => time_slice,
-        "%{uuid_flush}" => SecureRandom.uuid,
       }
-      path = @object_key_format.gsub(Regexp.union(tags.keys), tags)
-      path = extract_placeholders(path, chunk)
-      return path unless check_object_exists(path)
-
-      if path == prev
-        if @overwrite
-          log.warn "object `#{path}` already exists but overwrites it"
-          return path
+
+      prev = nil
+      i = 0
+
+      until i < 0 do # Until overflow
+        tags["%{uuid_flush}"] = SecureRandom.uuid
+        tags["%{index}"] = i
+
+        path = @object_key_format.gsub(Regexp.union(tags.keys), tags)
+        path = extract_placeholders(path, chunk)
+        return path unless check_object_exists(path)
+
+        if path == prev
+          if @overwrite
+            log.warn "object `#{path}` already exists but overwrites it"
+            return path
+          end
+          raise "object `#{path}` already exists"
         end
-        raise "object `#{path}` already exists"
+
+        i += 1
+        prev = path
       end
-      generate_path(chunk, i + 1, path)
+
+      raise "cannot find an unoccupied GCS path"
     end
 
     # This is stolen from Fluentd

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-gcs
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Daichi HIRATA
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2023-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -44,76 +44,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.2
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.8
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.8
-- !ruby/object:Gem::Dependency
-  name: test-unit-rr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Google Cloud Storage output plugin for Fluentd
 email:
 - hirata.daichi@gmail.com
@@ -121,8 +51,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yaml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -138,7 +68,7 @@ homepage: https://github.com/daichirata/fluent-plugin-gcs
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -153,8 +83,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Google Cloud Storage output plugin for Fluentd
 test_files: []

data/.travis.yml

@@ -1,11 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.6
-  - 2.7
-  - ruby-head
-
-before_install:
-  - gem update bundler
-
-script: bundle exec rake test