fluent-plugin-openstack 0.0.4 → 0.0.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/VERSION +1 -1
  3. data/fluent-plugin-openstack.gemspec +6 -8
  4. data/lib/fluent/plugin/out_swift.rb +16 -13
  5. metadata +17 -37
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b0748f1164bf7b8b89bae682ce44ff4fc407bb1163dc348db288bee26fe7d3a3
4
- data.tar.gz: 77fc7b831d011bce506b0dc1e756b2846ba30011610daa6db3393b1e13f72ff1
3
+ metadata.gz: 0bf7e0376741874af9bd281d2fc21afbff304fd22ef772806019e62e64e15085
4
+ data.tar.gz: 17c1f13fadf19580bbf16eff3b44e05b557d9d3b597869ee672658cb1a9a189b
5
5
  SHA512:
6
- metadata.gz: 0c32144ab893cdf0a1b0e542062a2bf0383ec3acff8cec2c2253f51e2dcb068d3f24a7cf85531f12b4d22507aab86320b81342d33507d9475778f0289dac03d2
7
- data.tar.gz: 780aef2d1abefcb88f671b10d9abed6df82d5f5a47e080fd711f198f18a27e37bc060ed63d1535c1332b25ce81530fb0d42c20cbc0f50d7958243013c6e10216
6
+ metadata.gz: 651d60c944f2681b785d42259fbbf2e9911aaca2768e6d4a2813a478c777089e7a866330e34c8d08da968836fb28652deb3a60adef7ad791b483a64567295bfe
7
+ data.tar.gz: 0e72a846daa2a3f5d76385d9797d57fe7104650cb3ffdd71421d20478626b28ab4b1c48055a9702d29ad0ff9b9b144d3642408c162c2a76b2c51ebc4ffe74be4
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.0.4
1
+ 0.0.5
data/fluent-plugin-openstack.gemspec CHANGED
@@ -17,15 +17,13 @@ Gem::Specification.new do |gem|
17
17
  gem.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
18
18
  gem.require_paths = ['lib']
19
19
 
20
- gem.add_runtime_dependency 'activesupport'
21
- gem.add_runtime_dependency 'fluentd', ['>= 0.14.2', '< 2']
20
+ gem.add_runtime_dependency 'fluentd'
22
21
  gem.add_runtime_dependency 'fog-openstack'
23
22
  gem.add_runtime_dependency 'uuidtools'
23
+ gem.add_runtime_dependency 'xmlrpc'
24
24
 
25
- gem.add_development_dependency 'bundler', '~> 2.0.2'
26
- gem.add_development_dependency 'flexmock', '>= 1.2.0'
27
- gem.add_development_dependency 'rake', '~> 12.0'
28
- gem.add_development_dependency 'test-unit', '>= 3.1.0'
29
-
30
- gem.add_dependency('xmlrpc') if RUBY_VERSION.to_s >= '2.4'
25
+ gem.add_development_dependency 'bundler'
26
+ gem.add_development_dependency 'flexmock'
27
+ gem.add_development_dependency 'rake'
28
+ gem.add_development_dependency 'test-unit'
31
29
  end
data/lib/fluent/plugin/out_swift.rb CHANGED
@@ -7,7 +7,6 @@ require 'zlib'
7
7
  require 'time'
8
8
  require 'tempfile'
9
9
  require 'open3'
10
- require 'active_support/all'
11
10
 
12
11
  module Fluent::Plugin
13
12
  class SwiftOutput < Output
@@ -71,13 +70,13 @@ module Fluent::Plugin
71
70
 
72
71
  super
73
72
 
74
- if auth_url.blank?
73
+ if auth_url.empty?
75
74
  raise Fluent::ConfigError, 'auth_url parameter or OS_AUTH_URL variable not defined'
76
75
  end
77
- if auth_user.blank?
76
+ if auth_user.empty?
78
77
  raise Fluent::ConfigError, 'auth_user parameter or OS_USERNAME variable not defined'
79
78
  end
80
- if auth_api_key.blank?
79
+ if auth_api_key.empty?
81
80
  raise Fluent::ConfigError, 'auth_api_key parameter or OS_PASSWORD variable not defined'
82
81
  end
83
82
 
@@ -116,16 +115,20 @@ module Fluent::Plugin
116
115
  end
117
116
 
118
117
  def start
118
+ openstack_config = {
119
+ provider: 'OpenStack',
120
+ openstack_auth_url: auth_url,
121
+ openstack_username: auth_user,
122
+ openstack_api_key: auth_api_key,
123
+ openstack_tenant: auth_tenant,
124
+ openstack_region: auth_region
125
+ }
126
+
127
+ log.warn openstack_config.inspect.to_s
128
+
119
129
  Excon.defaults[:ssl_verify_peer] = ssl_verify
120
130
  begin
121
- self.storage = Fog::Storage.new(
122
- provider: 'OpenStack',
123
- openstack_auth_url: auth_url,
124
- openstack_username: auth_user,
125
- openstack_api_key: auth_api_key,
126
- openstack_tenant: auth_tenant,
127
- openstack_region: auth_region
128
- )
131
+ self.storage = Fog::Storage.new(openstack_config)
129
132
  rescue StandardError => e
130
133
  raise "Can't call Swift API. Please check your ENV OS_*, your credentials or auth_url configuration. Error: #{e.inspect}"
131
134
  end
@@ -136,7 +139,7 @@ module Fluent::Plugin
136
139
 
137
140
  # TODO: dead method?
138
141
  def format(tag, time, record)
139
- log.warn "Method: `format(tag, time, record)` is NOT dead!"
142
+ log.warn 'Method: `format(tag, time, record)` is NOT dead!'
140
143
  r = inject_values_to_record(tag, time, record)
141
144
  formatter.format(tag, time, r)
142
145
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-openstack
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.4
4
+ version: 0.0.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - brissenden
@@ -11,7 +11,7 @@ cert_chain: []
11
11
  date: 2019-08-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- name: activesupport
14
+ name: fluentd
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
17
  - - ">="
@@ -25,27 +25,21 @@ dependencies:
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
- name: fluentd
28
+ name: fog-openstack
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: 0.14.2
34
- - - "<"
35
- - !ruby/object:Gem::Version
36
- version: '2'
33
+ version: '0'
37
34
  type: :runtime
38
35
  prerelease: false
39
36
  version_requirements: !ruby/object:Gem::Requirement
40
37
  requirements:
41
38
  - - ">="
42
39
  - !ruby/object:Gem::Version
43
- version: 0.14.2
44
- - - "<"
45
- - !ruby/object:Gem::Version
46
- version: '2'
40
+ version: '0'
47
41
  - !ruby/object:Gem::Dependency
48
- name: fog-openstack
42
+ name: uuidtools
49
43
  requirement: !ruby/object:Gem::Requirement
50
44
  requirements:
51
45
  - - ">="
@@ -59,7 +53,7 @@ dependencies:
59
53
  - !ruby/object:Gem::Version
60
54
  version: '0'
61
55
  - !ruby/object:Gem::Dependency
62
- name: uuidtools
56
+ name: xmlrpc
63
57
  requirement: !ruby/object:Gem::Requirement
64
58
  requirements:
65
59
  - - ">="
@@ -76,66 +70,52 @@ dependencies:
76
70
  name: bundler
77
71
  requirement: !ruby/object:Gem::Requirement
78
72
  requirements:
79
- - - "~>"
73
+ - - ">="
80
74
  - !ruby/object:Gem::Version
81
- version: 2.0.2
75
+ version: '0'
82
76
  type: :development
83
77
  prerelease: false
84
78
  version_requirements: !ruby/object:Gem::Requirement
85
79
  requirements:
86
- - - "~>"
80
+ - - ">="
87
81
  - !ruby/object:Gem::Version
88
- version: 2.0.2
82
+ version: '0'
89
83
  - !ruby/object:Gem::Dependency
90
84
  name: flexmock
91
85
  requirement: !ruby/object:Gem::Requirement
92
86
  requirements:
93
87
  - - ">="
94
88
  - !ruby/object:Gem::Version
95
- version: 1.2.0
89
+ version: '0'
96
90
  type: :development
97
91
  prerelease: false
98
92
  version_requirements: !ruby/object:Gem::Requirement
99
93
  requirements:
100
94
  - - ">="
101
95
  - !ruby/object:Gem::Version
102
- version: 1.2.0
96
+ version: '0'
103
97
  - !ruby/object:Gem::Dependency
104
98
  name: rake
105
- requirement: !ruby/object:Gem::Requirement
106
- requirements:
107
- - - "~>"
108
- - !ruby/object:Gem::Version
109
- version: '12.0'
110
- type: :development
111
- prerelease: false
112
- version_requirements: !ruby/object:Gem::Requirement
113
- requirements:
114
- - - "~>"
115
- - !ruby/object:Gem::Version
116
- version: '12.0'
117
- - !ruby/object:Gem::Dependency
118
- name: test-unit
119
99
  requirement: !ruby/object:Gem::Requirement
120
100
  requirements:
121
101
  - - ">="
122
102
  - !ruby/object:Gem::Version
123
- version: 3.1.0
103
+ version: '0'
124
104
  type: :development
125
105
  prerelease: false
126
106
  version_requirements: !ruby/object:Gem::Requirement
127
107
  requirements:
128
108
  - - ">="
129
109
  - !ruby/object:Gem::Version
130
- version: 3.1.0
110
+ version: '0'
131
111
  - !ruby/object:Gem::Dependency
132
- name: xmlrpc
112
+ name: test-unit
133
113
  requirement: !ruby/object:Gem::Requirement
134
114
  requirements:
135
115
  - - ">="
136
116
  - !ruby/object:Gem::Version
137
117
  version: '0'
138
- type: :runtime
118
+ type: :development
139
119
  prerelease: false
140
120
  version_requirements: !ruby/object:Gem::Requirement
141
121
  requirements: