Project

General

Profile

« Previous | Next » 

Revision ebcc4e73

Added by Eric Helms over 8 years ago

Ensure JSON is wrapped in quotations

View differences:

manifests/config.pp
file { '/etc/pulp/server/plugins.conf.d/yum_importer.json':
ensure => file,
content => template('pulp/yum_importer.json'),
content => template('pulp/yum_importer.json.erb'),
owner => 'root',
group => 'root',
mode => '0644',
......
file { '/etc/pulp/server/plugins.conf.d/iso_importer.json':
ensure => file,
content => template('pulp/iso_importer.json'),
content => template('pulp/iso_importer.json.erb'),
owner => 'root',
group => 'root',
mode => '0644',
......
if $pulp::enable_docker {
file { '/etc/pulp/server/plugins.conf.d/docker_importer.json':
ensure => file,
content => template('pulp/docker_importer.json'),
content => template('pulp/docker_importer.json.erb'),
owner => 'root',
group => 'root',
mode => '0644',
......
file { '/etc/pulp/server/plugins.conf.d/puppet_importer.json':
ensure => file,
content => template('pulp/puppet_importer.json'),
content => template('pulp/puppet_importer.json.erb'),
owner => 'root',
group => 'root',
mode => '0644',
spec/classes/pulp_config_spec.rb
with_content(/^topic_exchange: 'amq.topic'$/)
end
end
context "with proxy configuration" do
let :pre_condition do
"class {'pulp':
enable_rpm => true,
proxy_url => 'http://fake.com',
proxy_port => 7777,
proxy_username => 'al',
proxy_password => 'beproxyin'
}"
end
let :facts do
default_facts
end
it "should produce valid json" do
should contain_file("/etc/pulp/server/plugins.conf.d/yum_importer.json").with_content(
/"proxy_host": "http:\/\/fake.com",/
).with_content(
/"proxy_port": 7777,/
).with_content(
/"proxy_username": "al",/
).with_content(
/"proxy_password": "beproxyin"/
)
end
end
end
templates/docker_importer.json
{
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_url']) -%>
"proxy_host": <%= scope['pulp::proxy_url'] %>,
<% else %>
"proxy_host": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_port']) -%>
"proxy_port": <%= scope['pulp::proxy_port'] %>,
<% else %>
"proxy_port": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_username']) -%>
"proxy_username": <%= scope['pulp::proxy_username'] %>,
<% else %>
"proxy_username": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_password']) -%>
"proxy_password": <%= scope['pulp::proxy_password'] %>
<% else %>
"proxy_password": null
<% end %>
}
templates/docker_importer.json.erb
{
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_url']) -%>
"proxy_host": "<%= scope['pulp::proxy_url'] %>",
<% else %>
"proxy_host": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_port']) -%>
"proxy_port": <%= scope['pulp::proxy_port'] %>,
<% else %>
"proxy_port": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_username']) -%>
"proxy_username": "<%= scope['pulp::proxy_username'] %>",
<% else %>
"proxy_username": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_password']) -%>
"proxy_password": "<%= scope['pulp::proxy_password'] %>"
<% else %>
"proxy_password": null
<% end %>
}
templates/iso_importer.json
{
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_url']) -%>
"proxy_host": <%= scope['pulp::proxy_url'] %>,
<% else %>
"proxy_host": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_port']) -%>
"proxy_port": <%= scope['pulp::proxy_port'] %>,
<% else %>
"proxy_port": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_username']) -%>
"proxy_username": <%= scope['pulp::proxy_username'] %>,
<% else %>
"proxy_username": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_password']) -%>
"proxy_password": <%= scope['pulp::proxy_password'] %>
<% else %>
"proxy_password": null
<% end %>
}
templates/iso_importer.json.erb
{
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_url']) -%>
"proxy_host": "<%= scope['pulp::proxy_url'] %>",
<% else %>
"proxy_host": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_port']) -%>
"proxy_port": <%= scope['pulp::proxy_port'] %>,
<% else %>
"proxy_port": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_username']) -%>
"proxy_username": "<%= scope['pulp::proxy_username'] %>",
<% else %>
"proxy_username": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_password']) -%>
"proxy_password": "<%= scope['pulp::proxy_password'] %>"
<% else %>
"proxy_password": null
<% end %>
}
templates/puppet_importer.json
{
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_url']) -%>
"proxy_host": <%= scope['pulp::proxy_url'] %>,
<% else %>
"proxy_host": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_port']) -%>
"proxy_port": <%= scope['pulp::proxy_port'] %>,
<% else %>
"proxy_port": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_username']) -%>
"proxy_username": <%= scope['pulp::proxy_username'] %>,
<% else %>
"proxy_username": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_password']) -%>
"proxy_password": <%= scope['pulp::proxy_password'] %>
<% else %>
"proxy_password": null
<% end %>
}
templates/puppet_importer.json.erb
{
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_url']) -%>
"proxy_host": "<%= scope['pulp::proxy_url'] %>",
<% else %>
"proxy_host": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_port']) -%>
"proxy_port": <%= scope['pulp::proxy_port'] %>,
<% else %>
"proxy_port": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_username']) -%>
"proxy_username": "<%= scope['pulp::proxy_username'] %>",
<% else %>
"proxy_username": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_password']) -%>
"proxy_password": "<%= scope['pulp::proxy_password'] %>"
<% else %>
"proxy_password": null
<% end %>
}
templates/yum_importer.json
{
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_url']) -%>
"proxy_host": <%= scope['pulp::proxy_url'] %>,
<% else %>
"proxy_host": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_port']) -%>
"proxy_port": <%= scope['pulp::proxy_port'] %>,
<% else %>
"proxy_port": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_username']) -%>
"proxy_username": <%= scope['pulp::proxy_username'] %>,
<% else %>
"proxy_username": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_password']) -%>
"proxy_password": <%= scope['pulp::proxy_password'] %>
<% else %>
"proxy_password": null
<% end %>
}
templates/yum_importer.json.erb
{
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_url']) -%>
"proxy_host": "<%= scope['pulp::proxy_url'] %>",
<% else %>
"proxy_host": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_port']) -%>
"proxy_port": <%= scope['pulp::proxy_port'] %>,
<% else %>
"proxy_port": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_username']) -%>
"proxy_username": "<%= scope['pulp::proxy_username'] %>",
<% else %>
"proxy_username": null,
<% end %>
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::proxy_password']) -%>
"proxy_password": "<%= scope['pulp::proxy_password'] %>"
<% else %>
"proxy_password": null
<% end %>
}

Also available in: Unified diff