Fixes #14545 - Correctly parse y.z minor OS version from facts #3836
Conversation
| "operatingsystem" => "CentOS", | ||
| "lsbdistdescription" => "CentOS Linux release 7.2.1511 (Core) ", | ||
| "operatingsystemrelease" => "7.2.1511" | ||
| }).operatingsystem |
There was a problem hiding this comment.
Indent the right brace the same as the first position after the preceding left parenthesis.
|
LGTM. @tbrisker : Have you come up with a solution how not to break media paths for, let's say, Centos? Could we just add a new variable that gets replaces in the url that does not contain the full minor version? |
|
@timogoebel It looks like actually this will un-break the media path for CentOS, take a look at: http://mirror.centos.org/centos/ |
|
@tbrisker : You're correct. 👍 |
Some OSes use y.z minor version, for example CentOS uses versions such as 7.2.1511. Currently, the puppet fact parser will only take the 'y' part of the version, 2 in this case, which can lead to conflicts if the OS has been defined manually with the 2.1511 minor version (as the description will still contain the entire version).
|
Thanks to @dlevene1 for providing the reproducing details, please wait for him to verify this solves the issue for him before merging. |
|
Reporter has confirmed via mail that this PR fixed the issue for them. |
| description: "CentOS Linux 7.2.1511") | ||
| assert_valid PuppetFactParser.new({ "operatingsystem" => "CentOS", | ||
| "lsbdistdescription" => "CentOS Linux release 7.2.1511 (Core) ", | ||
| "operatingsystemrelease" => "7.2.1511" |
There was a problem hiding this comment.
Not that I care, but here's an example where enabling the cop to enforce one type of hash syntax would've been good instead of allowing 2 different hashing syntaxes to coexist.
There was a problem hiding this comment.
For me it kind of makes sense to use the newer syntax when passing a hash as function arguments. The second hash I think expects string keys rather then symbols, so I kept it with the old style.
Some OSes use y.z minor version, for example CentOS uses versions such
as 7.2.1511. Currently, the puppet fact parser will only take the 'y'
part of the version, 2 in this case, which can lead to conflicts if the
OS has been defined manually with the 2.1511 minor version (as the
description will still contain the entire version).