[MediaWiki-commits] [Gerrit] operations/puppet[production]: labs: Use YAML.load instead of .parse for loading YAML

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: labs: Use YAML.load instead of .parse for loading YAML
..


labs: Use YAML.load instead of .parse for loading YAML

Change-Id: Iff3601a0fb5d416acc4a7770adff60b6edf29463
---
M modules/wmflib/lib/hiera/httpcache.rb
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Yuvipanda: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/wmflib/lib/hiera/httpcache.rb 
b/modules/wmflib/lib/hiera/httpcache.rb
index ca5e8f6..1c6abb5 100644
--- a/modules/wmflib/lib/hiera/httpcache.rb
+++ b/modules/wmflib/lib/hiera/httpcache.rb
@@ -68,7 +68,8 @@
   end
   # We shamelessly throw exceptions here, and catch them upper in the chain
   # specifically in Hiera::Mwcache.stale? and Hiera::Mwcache.read
-  body = YAML.parse(res.body)
+  # FIXME: use safe_load here somehow?
+  body = YAML.load(res.body)
 
   body['hiera']
 end

-- 
To view, visit https://gerrit.wikimedia.org/r/310689
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff3601a0fb5d416acc4a7770adff60b6edf29463
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labs: Use YAML.load instead of .parse for loading YAML

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/310689

Change subject: labs: Use YAML.load instead of .parse for loading YAML
..

labs: Use YAML.load instead of .parse for loading YAML

Change-Id: Iff3601a0fb5d416acc4a7770adff60b6edf29463
---
M modules/wmflib/lib/hiera/httpcache.rb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/89/310689/1

diff --git a/modules/wmflib/lib/hiera/httpcache.rb 
b/modules/wmflib/lib/hiera/httpcache.rb
index ca5e8f6..f513435 100644
--- a/modules/wmflib/lib/hiera/httpcache.rb
+++ b/modules/wmflib/lib/hiera/httpcache.rb
@@ -68,7 +68,7 @@
   end
   # We shamelessly throw exceptions here, and catch them upper in the chain
   # specifically in Hiera::Mwcache.stale? and Hiera::Mwcache.read
-  body = YAML.parse(res.body)
+  body = YAML.load(res.body)
 
   body['hiera']
 end

-- 
To view, visit https://gerrit.wikimedia.org/r/310689
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff3601a0fb5d416acc4a7770adff60b6edf29463
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits