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.

Sign up for GitHub

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

Mask/redact password and secure_json_data in grafana_datasource; require at least puppet 6.1.0 #221

Merged
merged 4 commits into from
Jan 4, 2021
Merged

Mask/redact password and secure_json_data in grafana_datasource; require at least puppet 6.1.0 #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b127d62
Make password and secure_json_data in grafana_datasource sensitive so…
nmaludy Aug 20, 2020
5515a3a
Fix whitespace linting issues
nmaludy Aug 20, 2020
599483f
Merge remote-tracking branch 'origin/master' into bugfix/secure-json-…
nmaludy Jan 4, 2021
22daadb
Raise minimum Puppet version to 6.1.0. Fixing linting error.
nmaludy Jan 4, 2021
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
2 changes: 2 additions & 0 deletions lib/puppet/type/grafana_datasource.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@

newproperty(:password) do
desc 'The password for the datasource (optional)'
sensitive true
end

newproperty(:database) do
Expand Down Expand Up @@ -110,6 +111,7 @@

newproperty(:secure_json_data) do
desc 'Additional secure JSON data to configure the datasource (optional)'
sensitive true

validate do |value|
unless value.nil? || value.is_a?(Hash)
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 5.5.8 < 7.0.0"
"version_requirement": ">= 6.1.0 < 7.0.0"
}
],
"tags": [
Expand Down