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.

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

(PA-1887) Fix osfamily::darwin OSX version regex #278

Merged
merged 1 commit into from Mar 1, 2018

Conversation

ekinanp
Copy link
Contributor

@ekinanp ekinanp commented Feb 28, 2018

The previous regex used a character class instead of a union to
match the major Mac OSX product version, which would match values
such as "10.14", "10.15". This meant that the puppet_agent module
would think these are supported platforms, and proceed further with
the installation (failing at a different point, which would produce
a harder-to-read error message). This commit fixes things so that
non-supported Mac OSX platforms correctly fail in the osfamily::darwin
class with a readable error message.

@ekinanp ekinanp changed the title (maint) Fix osfamily::drawin OSX version regex (maint) Fix osfamily::darwin OSX version regex Feb 28, 2018
@ekinanp
Copy link
Contributor Author

ekinanp commented Feb 28, 2018

@puppetcla
Copy link

CLA signed by all contributors.

@MikaelSmith
Copy link
Contributor

@ekinanp
Copy link
Contributor Author

ekinanp commented Mar 1, 2018

@MikaelSmith Oh forgot to tell you that I updated the spec test

@MikaelSmith
Copy link
Contributor

This should probably have a ticket, since it will fix upgrades for 10.12 and 10.13. I assume those wouldn't work before.

@ekinanp
Copy link
Contributor Author

ekinanp commented Mar 1, 2018

What's interesting is those worked and still work fine -- the reason is b/c the old regex was wrong, it was using character classes. I talk about it a bit more in the commit message. I can file the ticket though.

@MikaelSmith
Copy link
Contributor

Oh gotcha. Probably still worth ensuring we have a release note about now enforcing macOS version checks.

@ekinanp ekinanp changed the title (maint) Fix osfamily::darwin OSX version regex (PA-1887) Fix osfamily::darwin OSX version regex Mar 1, 2018
The previous regex used a character class instead of a union to
match the major Mac OSX product version, which would match values
such as "10.14", "10.15". This meant that the puppet_agent module
would think these are supported platforms, and proceed further with
the installation (failing at a different point, which would produce
a harder-to-read error message). This commit fixes things so that
non-supported Mac OSX platforms correctly fail in the osfamily::darwin
class with a readable error message.
@ekinanp
Copy link
Contributor Author

ekinanp commented Mar 1, 2018

@MikaelSmith Ok, I filed PA-1887 for this work and it seems that the CI checks have passed.

@MikaelSmith MikaelSmith merged commit 21f722e into puppetlabs:master Mar 1, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants