Paired-with: Jesse Wolfe <[email protected]>
Signed-off-by: Paul Berry <[email protected]>
---
Local-branch: ticket/next/5743
lib/puppet/report.rb | 3 ++-
lib/report_transformer.rb | 3 +++
spec/lib/puppet/report_spec.rb | 27 ++++++++++++++++++---------
3 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/lib/puppet/report.rb b/lib/puppet/report.rb
index 2b90958..55a6029 100644
--- a/lib/puppet/report.rb
+++ b/lib/puppet/report.rb
@@ -194,7 +194,8 @@ module ReportExtensions #:nodoc:
"time" => time,
"change_count" => change_count || 0,
"out_of_sync" => out_of_sync,
- "events" => events.map(&:to_hash)
+ "events" => events.map(&:to_hash),
+ "version" => version
}
end
end
diff --git a/lib/report_transformer.rb b/lib/report_transformer.rb
index 290d392..8b4e300 100644
--- a/lib/report_transformer.rb
+++ b/lib/report_transformer.rb
@@ -67,6 +67,9 @@ class ReportTransformer::OneToTwo <
ReportTransformer::ReportTransformation
end
report["status"] = failed_resources?(report) ? 'failed' :
changed_resources?(report) ? 'changed' : 'unchanged'
+ report["resource_statuses"].each do |resource_status|
+ resource_status.delete("version")
+ end
report
end
diff --git a/spec/lib/puppet/report_spec.rb b/spec/lib/puppet/report_spec.rb
index b77b258..9ac096b 100644
--- a/spec/lib/puppet/report_spec.rb
+++ b/spec/lib/puppet/report_spec.rb
@@ -224,7 +224,8 @@ describe Puppet::Transaction::Report do
"source_description" => "/Schedule[monthly]",
"file" => nil,
"out_of_sync" => nil,
- "events" => []
+ "events" => [],
+ "version" => 1279826342
},
{
"line" => nil,
@@ -240,7 +241,8 @@ describe Puppet::Transaction::Report do
"source_description" => "/Filebucket[puppet]",
"file" => nil,
"out_of_sync" => nil,
- "events" => []
+ "events" => [],
+ "version" => 1279826342
},
{
"line" => 8,
@@ -269,7 +271,8 @@ describe Puppet::Transaction::Report do
"status" => "success",
"tags" => ["service", "mysqld", "node", "default",
"class"],
"time" => Time.parse("2010-07-22 12:19:48.921431
-07:00")
- }]
+ }],
+ "version" => 1279826342
},
{
"line" => nil,
@@ -285,7 +288,8 @@ describe Puppet::Transaction::Report do
"source_description" => "/Schedule[never]",
"file" => nil,
"out_of_sync" => nil,
- "events" => []
+ "events" => [],
+ "version" => 1279826342
},
{
"line" => nil,
@@ -301,7 +305,8 @@ describe Puppet::Transaction::Report do
"source_description" => "/Schedule[weekly]",
"file" => nil,
"out_of_sync" => nil,
- "events" => []
+ "events" => [],
+ "version" => 1279826342
},
{
"line" => 9,
@@ -329,7 +334,8 @@ describe Puppet::Transaction::Report do
"status" => "success",
"tags" => ["exec", "node", "default", "class"],
"time" => Time.parse("2010-07-22 12:19:47.360626
-07:00")
- }]
+ }],
+ "version" => 1279826342
},
{
"line" => nil,
@@ -345,7 +351,8 @@ describe Puppet::Transaction::Report do
"source_description" => "/Schedule[puppet]",
"file" => nil,
"out_of_sync" => nil,
- "events" => []
+ "events" => [],
+ "version" => 1279826342
},
{
"line" => nil,
@@ -361,7 +368,8 @@ describe Puppet::Transaction::Report do
"source_description" => "/Schedule[daily]",
"file" => nil,
"out_of_sync" => nil,
- "events" => []
+ "events" => [],
+ "version" => 1279826342
},
{
"line" => nil,
@@ -377,7 +385,8 @@ describe Puppet::Transaction::Report do
"source_description" => "/Schedule[hourly]",
"file" => nil,
"out_of_sync" => nil,
- "events" => []
+ "events" => [],
+ "version" => 1279826342
}
]
end
--
1.7.2
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
