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

Bump minimum stdlib version to be 4.25.0 #193

Merged
merged 2 commits into from
Aug 18, 2023
Merged

Bump minimum stdlib version to be 4.25.0 #193

merged 2 commits into from
Aug 18, 2023

Conversation

sircubbi
Copy link
Contributor

@sircubbi sircubbi commented Jun 4, 2023

  • bump version-requirement for stdlib to 4.25.0 (needed for Stdlib::IP::*)

  • further enforce serveraddress in sql to be an ip-address and no subnet

  • remove unnecessary Optional[] for already defined valued

* bump version-requirement for stdlib to 4.25.0
  (needed for Stdlib::IP::*)

* further enforce serveraddress in sql to be an ip-address and no
  subnet

* remove unnecessary Optional[] for already defined valued
@sircubbi
Copy link
Contributor Author

sircubbi commented Jun 4, 2023

Added suggestions from #192

BTW: looking at the code there are some more Optionals with predefined values, maybe those can be cleaned up too, but I guess those are better in a separate PR.

@djjudas21
Copy link
Owner

@nward This looks ok to me by eye but I have no way of testing it. Are you able to review & merge? I think we're getting to a stage where we should do a new release, so I want to get as many PRs merged as possible

Copy link
Collaborator

@nward nward left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given that we have already merged #192, I think the only one we need to address is the minimum version of stdlib.

We need to do a big clean up of the Optionals and other type things - so I think we should do those all at once.

There is no problem with these changes being done here - but I think we should try keep PRs to one issue at a time.

@@ -9,7 +9,7 @@
String $header = '%t',
Optional[Freeradius::Boolean] $locking = undef,
Optional[Freeradius::Boolean] $log_packet_header = undef,
Optional[Array[String]] $suppress = [],
Array[String] $suppress = [],
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Array[String] $suppress = [],
Optional[Array[String]] $suppress = [],

manifests/sql.pp Outdated
@@ -2,7 +2,7 @@
define freeradius::sql (
Enum['mysql', 'mssql', 'oracle', 'postgresql'] $database,
Freeradius::Password $password,
Variant[Stdlib::Host, Stdlib::IP::Address] $server = 'localhost',
Variant[Stdlib::Host, Stdlib::IP::Address::Nosubnet] $server = 'localhost',
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Variant[Stdlib::Host, Stdlib::IP::Address::Nosubnet] $server = 'localhost',
Variant[Stdlib::Host, Stdlib::IP::Address] $server = 'localhost',

(actually it turns out that this can just be Stdlib::Host - as Host already covers single IP addresses which is nice - but I don't think we should make that change in this PR)

@nward nward changed the title Cleanup/Improvements for PR#192 Bump minimum stdlib version to be 4.25.0 Aug 18, 2023
@nward nward merged commit 2b3f232 into djjudas21:main Aug 18, 2023
2 checks passed
@sircubbi sircubbi deleted the tydiup_pr192 branch August 18, 2023 10:02
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.

3 participants