Skip to content

Commit f27f448

Browse files
authored
Fix convert_pdb (#21)
1 parent 4de848b commit f27f448

2 files changed

Lines changed: 17 additions & 15 deletions

File tree

lib/puppet/catalog-diff/compilecatalog.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
require 'puppet/network/http_pool'
2+
require File.expand_path(File.join(File.dirname(__FILE__), 'preprocessor.rb'))
3+
24
# Puppet::CatalogDiff
35
module Puppet::CatalogDiff
46
# Puppet::CatalogDiff::CompileCatalog

lib/puppet/catalog-diff/preprocessor.rb

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,22 @@ def convert25(resource, collector)
4747
collector << resource
4848
end
4949
end
50-
end
5150

52-
# Converts PuppetDB catalogs to our intermediate format
53-
def convert_pdb(catalog)
54-
catalog = catalog[0]
55-
# Fix "data" level in PuppetDB catalog
56-
catalog['resources'] = catalog['resources']['data']
57-
# Fix edges
58-
new_edges = []
59-
catalog['edges']['data'].each do |edge|
60-
new_edges << {
61-
'source' => "#{edge['source_type']}[#{edge['source_title']}]",
62-
'target' => "#{edge['target_type']}[#{edge['target_title']}]",
63-
}
51+
# Converts PuppetDB catalogs to our intermediate format
52+
def convert_pdb(catalog)
53+
catalog = catalog[0]
54+
# Fix "data" level in PuppetDB catalog
55+
catalog['resources'] = catalog['resources']['data']
56+
# Fix edges
57+
new_edges = []
58+
catalog['edges']['data'].each do |edge|
59+
new_edges << {
60+
'source' => "#{edge['source_type']}[#{edge['source_title']}]",
61+
'target' => "#{edge['target_type']}[#{edge['target_title']}]",
62+
}
63+
end
64+
catalog['edges'] = new_edges
65+
catalog
6466
end
65-
catalog['edges'] = new_edges
66-
catalog
6767
end
6868
end

0 commit comments

Comments
 (0)