fluent-plugin-cloud-feeds 1.0.2 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDY1ODgzYTM5YWM1Nzk4OGFlOWJkODcxYzU2MjE1N2I3MzdlNGFiMw==
+    MzAzN2YxMjcwMGFmMjYzYjc3MGE4OTY0NzMzMmM1YzY4NDQ1MTQ3MA==
   data.tar.gz: !binary |-
-    YjM3NWRjZGY1YTMzMGZkYzg3Yjk3ZDYxMWUxNDJjMTcxMzIzOTVlYg==
+    MmFkZmM4Nzc5MjkxNzNjNzFmMmJkNThiYjQ0YWJmN2QxNTQ2OWY4Mw==
 SHA512:
   metadata.gz: !binary |-
-    Mjg1OTBjMjEzY2QwZTgwZWU2MDJhODJkMmRiMWQ0ZDdlODEyMDI1NmEzNzJi
-    MWI1MWRmMWI2ZjBjODdhNDZmNTBiNjI4ZWJmNzNkZTg4Y2Q1NWYyNDIyOGE5
-    OWZhZGU0YWNkYWRhZTFmYWJhMDU5NWRmZmE5NjkyZWYxZTVmNTg=
+    ZWQ3ZDZmMzQwZmQ4NmE5NjFkNjRjMzgxOTdjM2QxOGViMjkyMGI4YTFjNjhl
+    MzY5NTU0NzY2YjY3YzYwZDVmNDdiMjUxZWQ0ZWFjMGM0MTQ5NWE5ZWVmMjEz
+    Y2Y4YjRjM2IxMzBhZDdlZTk0ZDFiMDBlNTg4MTQwYjU3ODk2YWM=
   data.tar.gz: !binary |-
-    MDQxYzg2MTdjZTg2ZDUxYzlmNmVhY2UxZTE5ZGJmYWRhNWY4ZmYwNDczMmZh
-    NTM0ZGI0M2Y2YjJkOGM2NGFlNDIxY2E3M2Y0YjIwOTNiOTRhYjQwZmUyZTdi
-    YmIxYzkzMWIzZjI2YTVlMGFlMWQ0NWVhYTdkYTc4ZDUzM2M2Mzc=
+    YmNiMmUzNTY5ZGYzMDE3OTJmZDgwOWFiNDE5M2UxMjU4YWQ0MmZiNWQyZjIy
+    YzkyYWJiM2JmMWRkZGNiOTEwNTQ5NWFmMTRmYWM4MzUxNWQ3MDkwYzIyMDJm
+    MzY1OTMyMDMxMzIzMTkyMTFmYzI4YmY2NWZjMDlmNjdjM2QzYzg=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-cloud-feeds (1.0.2)
+    fluent-plugin-cloud-feeds (1.1.0)
       fluentd (= 0.12.7)
       net-http-persistent (>= 2.7)
 

data/fluent-plugin-cloud-feeds.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name = "fluent-plugin-cloud-feeds"
-  s.version = "1.0.2"
+  s.version = "1.1.0"
   s.authors = ["David Kowis", "Tyler Royal"]
   s.email= ["david.kowis@rackspace.com", "tyler.royal@rackspace.com"]
   s.homepage = "https://github.com/rackerlabs/fluent-plugin-cloud-feeds"

data/lib/fluent/plugin/out_rackspace_cloud_feeds.rb

@@ -93,6 +93,7 @@ class Fluent::RackspaceCloudFeedsOutput < Fluent::Output
     now = DateTime.strptime(time.to_s, '%s').strftime("%FT%T.%LZ")
 
     <<EOF
+<?xml version="1.0" encoding="UTF-8" ?>
 <entry xmlns="http://www.w3.org/2005/Atom">
     <id>#{SecureRandom.uuid.to_s}</id>
     <title type="text">User Access Event</title>
@@ -108,7 +109,8 @@ EOF
     es.each { |time, record|
       # take the data, put it in to an abdera envelope
       post = Net::HTTP::Post.new @feeds_uri.path
-      post.body = atomic_wrapper(record, time)
+
+      post.body = atomic_wrapper(JSON.parse(record)['message'], time)
       unless @auth_token
         #get new auth token
         @auth_token = authenticate_user

data/spec/feeds_output_spec.rb

@@ -33,6 +33,10 @@ RSpec.describe('Rackspace Cloud Feeds output plugin') do
 EOF
   end
 
+  def encoded_payload
+    {'message' => simple_sample_payload}.to_json
+  end
+
   def less_simple_payload
     <<EOF
 { "GUID" : "9b2ac70c-16c9-493e-85be-d26a39319c2b", "ServiceCode" : "repose", "Region" : "USA", "DataCenter" : "DFW", "Timestamp" : "1429546468047", "Request" : { "Method" : "GET", "URL" : "http://localhost:10006/", "QueryString" : "", "Parameters" : {  }, "UserName" : "", "ImpersonatorName" : "", "ProjectID" : [  ], "Roles" : [  ], "UserAgent" : "deproxy 0.21" }, "Response" : { "Code" : 200, "Message" : "OK" }, "MethodLabel" : "" }
@@ -100,7 +104,7 @@ EOF
       stub_identity_auth_post(token)
       stub_atom_post(simple_sample_payload)
 
-      driver.emit(simple_sample_payload)
+      driver.emit(encoded_payload)
 
       expect(a_request(:post, IDENTITY_URL).with do |req|
                parsed = JSON.parse(req.body)
@@ -127,7 +131,7 @@ EOF
       stub_identity_auth_post(token)
 
       stub_atom_post(simple_sample_payload)
-      driver.emit(simple_sample_payload)
+      driver.emit(encoded_payload)
 
 
       expect(a_request(:post, FEED_URL).with do |req|
@@ -146,7 +150,7 @@ EOF
 
       # simulate behavior from the bufferize plugin, which will retry the call eventually
       expect {
-        driver.emit(simple_sample_payload)
+        driver.emit(encoded_payload)
       }.to raise_exception(/NOT AUTHORIZED TO POST TO FEED ENDPOINT.+/)
 
       #expect another request to identity
@@ -154,7 +158,7 @@ EOF
       stub_atom_post(simple_sample_payload)
 
       #simulate the thing being called again
-      driver.emit(simple_sample_payload)
+      driver.emit(encoded_payload)
 
       expect(a_request(:post, IDENTITY_URL).with do |req|
                parsed = JSON.parse(req.body)
@@ -191,7 +195,7 @@ EOF
       end
 
       expect {
-        driver.emit(simple_sample_payload)
+        driver.emit(encoded_payload)
       }.to raise_exception(/Unable to authenticate with identity at.+/)
 
       expect(WebMock).not_to have_requested(:post, FEED_URL)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cloud-feeds
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - David Kowis