logstash-input-qingstor 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c156065e6f20cd2f8e096288335596f2c6ab31cf
-  data.tar.gz: 843ab1800defe7b983f19aec17991e5d1aa90494
+  metadata.gz: 2c3ef515c2bf42830ada2c07360ee1444a239470
+  data.tar.gz: 24375bc480c7560c2fb358cd3d6b65635d0b18bc
 SHA512:
-  metadata.gz: 3470074fc6bd016a3ee83eb1de998823f4c3912305c18a9065793f03e4b5134e9580a2ce95f05d39fe8c316078463a5bb1bcceabcad868478c8aecd5a59b97a0
-  data.tar.gz: 74b562849a1f53e8322360ef22f74147226dd0da64512c37f049cf84c04f859d5640c43a2d270b2cf486760ac4ed44921b569cf16d5ddecc7a56eac5101a049f
+  metadata.gz: 924eb9d4eb958184a9efa290195a5728fcae475be0f948d71bffa204dfabea6df7bef25dd21124abefa4b0f0276ef490fce0438c88eb027a3cd7bad1e0aaa18f
+  data.tar.gz: fc3332dab20489769f43e5cf0e26939bfdbd4978ebfea9e5e8d10caaf76d012c02489108d0a5899ddce3abee38e2f5913182e662ad281fbb25a9c61d709c5f81

data/README.md

@@ -43,6 +43,14 @@ input {
         # 默认: false
         delete_remote_files => true
 
+        # 重新配置qingstor的地址
+        # 默认: nil
+        host => "new.qingstor.net"
+
+        # 重新配置qingstor地址的端口号
+        # 默认: 443
+        port => 443
+
         # 如果指定一个本地目录, 那么在处理完之后将文件备份至该位置.
         # 默认:　nil 
         local_dir => 'your/local/directory'

data/lib/logstash/inputs/qingstor.rb

@@ -18,11 +18,17 @@ class LogStash::Inputs::Qingstor < LogStash::Inputs::Base
   # The key to access your QingStor
   config :secret_access_key, :validate => :string, :required => true
 
+  # If specified, it would redirect to this host address.
+  config :host, :validate => :string, :default => nil
+
+  # It specifies the host port, please coordinate with config 'host'.
+  config :port, :validate => :number, :default => 443
+
   # The name of the qingstor bucket
   config :bucket, :validate => :string, :required => true
 
   # The region of the QingStor bucket
-  config :region, :validate => ["pek3a", "sh1a"], :default => "pek3a"
+  config :region, :validate => :string, :default => "pek3a"
 
   # If specified, it would only download the files with the specified prefix.
   config :prefix, :validate => :string, :default => nil
@@ -69,6 +75,7 @@ class LogStash::Inputs::Qingstor < LogStash::Inputs::Base
     @logger.info "Registering QingStor plugin", :bucket => @bucket, :region => @region
     
     @qs_config = QingStor::SDK::Config.init @access_key_id, @secret_access_key
+    @qs_config.update({ host: @host, port: @port }) unless @host.nil?
     @qs_service = QingStor::SDK::Service.new @qs_config
     @qs_bucket = @qs_service.bucket @bucket, @region
 
@@ -143,7 +150,7 @@ class LogStash::Inputs::Qingstor < LogStash::Inputs::Base
     
     md5_string = Digest::MD5.file(@tmp_file_path).to_s
 
-    new_key = if @backup_prefix.end_with?('/')
+    new_key = if @backup_prefix.end_with?('/') || @backup_prefix.empty?
                 @backup_prefix + key 
               else 
                 @backup_prefix + '/' + key 

data/logstash-input-qingstor.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-input-qingstor'
-  s.version       = '0.1.2'
+  s.version       = '0.1.3'
   s.licenses      = ['Apache License (2.0)']
   s.summary       = 'logstash input plugin for QingStor'
-  s.description   = 'Use this plugin to fetch file as a input of logstash from Qingstor'
+  s.description   = 'Use this plugin to fetch file from Qingstor as the input of logstash'
   s.homepage      = 'https://github.com/Tacinight/logstash-input-qingstor'
   s.authors       = ['Evan Zhao']
   s.email         = 'tacingiht@gmail.com'
@@ -24,4 +24,4 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "qingstor-sdk", ">=1.9.2"
 
   s.add_development_dependency 'logstash-devutils'
-end
+end

data/spec/inputs/qingstor_spec.rb

@@ -29,7 +29,7 @@ describe LogStash::Inputs::Qingstor do
   let(:backup) { "logstash-backup" }
   let(:local_backup_dir) { File.join(Dir.tmpdir, backup) }
 
-  context "local backup" do 
+  context "at the local end" do 
     it "backup to local dir" do 
       fetch_events(config.merge({"backup_local_dir" => local_backup_dir }))
       expect(File.exists?(File.join(local_backup_dir, key1))).to be_truthy
@@ -42,15 +42,25 @@ describe LogStash::Inputs::Qingstor do
     end 
   end 
 
-  context "remote backup" do 
+  context "at the remote end " do 
     it "backup to another bucket" do 
       fetch_events(config.merge({"backup_bucket" => backup}))
       expect(list_remote_file(backup).size).to eq(2)
     end 
 
     after do 
-      delete_bucket(backup)
+      clean_and_delete_bucket(backup)
     end 
   end 
 
+  context "advance config" do
+    it "redirect to the specified host without specified port" do 
+      expect{fetch_events(config.merge({"host" => "qingstor.dev"}))}.to raise_error(Net::HTTP::Persistent::Error)
+    end 
+
+    it "redirect to the specified host without specified port" do 
+      expect{fetch_events(config.merge({"host" => "qingstor.dev", "port" => 444}))}.to raise_error(Net::HTTP::Persistent::Error)
+    end 
+  end
+
 end

data/spec/inputs/qs_access_helper.rb

@@ -37,7 +37,10 @@ def list_remote_file(bucket = ENV['bucket'], region = ENV['region'])
   return bucket.list_objects[:keys]
 end
 
-def delete_bucket(bucket)
+def clean_and_delete_bucket(bucket)
   bucket = qs_init_bucket(bucket)
+  bucket.list_objects[:keys].each do |file|
+    bucket.delete_object file[:key]
+  end 
   bucket.delete
 end 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-qingstor
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Evan Zhao
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +86,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Use this plugin to fetch file as a input of logstash from Qingstor
+description: Use this plugin to fetch file from Qingstor as the input of logstash
 email: tacingiht@gmail.com
 executables: []
 extensions: []