Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(FM-7839) Implement to_json method for ResourceShim #168

Merged
merged 1 commit into from
Apr 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions lib/puppet/resource_api/glue.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,13 @@ def to_hierayaml
YAML.dump('type' => { title => attributes }).split("\n").drop(2).join("\n") + "\n"
end

def to_json(*)
attrs = filtered_keys.map { |k| [k.to_s, values[k]] unless values[k].nil? }
attributes = Hash[*attrs.compact.flatten]
resource = { title => attributes }
resource.to_json
end

# attribute names that are not title or namevars
def filtered_keys
values.keys.reject { |k| k == :title || !attr_def[k] || (attr_def[k][:behaviour] == :namevar && @namevars.size == 1) }
Expand Down
4 changes: 4 additions & 0 deletions spec/integration/resource_api_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,10 @@ def get(_context)
describe 'its title' do
it { expect(instance.to_resource.title).to eq 'somename' }
end

it 'can serialize to json' do
expect({ 'resources' => [instance.to_resource] }.to_json).to eq '{"resources":[{"somename":{"ensure":"absent","boolean_param":false,"integer_param":99,"float_param":3.21,"ensure_param":"present","variant_pattern_param":"1234ABCD","url_param":"http://www.puppet.com","string_array_param":"d","e":"f","string_param":"default value"}}]}' # rubocop:disable Metrics/LineLength
end
end

it('ensure is reported as a symbol') { expect(instance[:ensure]).to be_a Symbol }
Expand Down
17 changes: 17 additions & 0 deletions spec/puppet/resource_api/glue_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,23 @@
end
end

describe '.to_json' do
it { expect(instance.to_json).to eq '{"title":{"attr":"value","attr_ro":"fixed"}}' }

context 'with nil values' do
subject(:instance) do
described_class.new({ namevarname: title, attr: nil, attr_ro: 'fixed' }, 'typename', [:namevarname],
namevarname: { type: 'String', behaviour: :namevar, desc: 'the title' },
attr: { type: 'String', desc: 'a string parameter' },
attr_ro: { type: 'String', desc: 'a string readonly', behaviour: :read_only })
end

it 'doesn\'t output them' do
expect(instance.to_json).to eq '{"title":{"attr_ro":"fixed"}}'
end
end
end

describe '.to_hierayaml' do
it { expect(instance.to_hierayaml).to eq " title:\n attr: value\n attr_ro: fixed\n" }

Expand Down