Fixup: address JSON loading as fixed UTF-8 encoding
What does this MR do?
Fixup: address JSON loading as fixed UTF-8 encoding
Replace JSON.parse(File.read()) with JSON.load_file() post JSON 2.8.2+
This ensures File.read(path, :encoding => Encoding::UTF_8)
as see in
https://github.com/ruby/json/commit/3a8505a8fa39711a957b2fc942862a874a8e8bef
JSON interchange specifically rfc8259, section 8.1 indicates that we should always expect these files to be UTF8
https://datatracker.ietf.org/doc/html/rfc8259#section-8.1
- Should be backported to 17.10, which includes JSON 2.10.1
- Not needed before 17.10, as JSON <= 2.7.x
Closes #8995 (closed)
Changelog: fixed
Related issues
Checklist
See Definition of done.
For anything in this list which will not be completed, please provide a reason in the MR discussion.
Required
-
MR title and description are up to date, accurate, and descriptive. -
MR targeting the appropriate branch. -
Latest Merge Result pipeline is green. -
When ready for review, MR is labeled workflowready for review per the Distribution MR workflow.
For GitLab team members
If you don't have access to this, the reviewer should trigger these jobs for you during the review process.
-
The manual Trigger:ee-packagejobs have a green pipeline running against latest commit. -
If config/softwareorconfig/patchesdirectories are changed, make sure thebuild-package-on-all-osjob within theTrigger:ee-packagedownstream pipeline succeeded. -
If you are changing anything SSL related, then the Trigger:package:fipsmanual job within theTrigger:ee-packagedownstream pipeline must succeed. -
If CI configuration is changed, the branch must be pushed to dev.gitlab.orgto confirm regular branch builds aren't broken.
Expected (please provide an explanation if not completing)
-
Test plan indicating conditions for success has been posted and passes. -
Documentation created/updated. -
Tests added. -
Integration tests added to GitLab QA. -
Equivalent MR/issue for the GitLab Chart opened. -
Validate potential values for new configuration settings. Formats such as integer 10, duration10s, URIscheme://user:passwd@host:portmay require quotation or other special handling when rendered in a template and written to a configuration file.
Closes #8995 (closed)
Edited by Clemens Beck