Narrow down Datatypes #2245

cocker-cc · 2022-06-10T09:18:32Z

use Datatypes from Stdlib
use Variant[Integer, Pattern[/^[0-9]+$/]] where Strings represent Integers

CLAassistant · 2022-06-10T09:18:39Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.

Cocker Koch seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

ekohl

I am very happy with stricter data types, but this is quite hard to review due to the various things going on. I'd prefer starting with the simple things like whitespace/coding style changes. Those can be merged pretty easily.

manifests/balancer.pp

ekohl · 2022-06-10T09:41:10Z

manifests/balancermember.pp

@@ -40,8 +40,8 @@
 #
 define apache::balancermember (
  String $balancer_cluster,
-  String $url = "http://${$facts['networking']['fqdn']}/",
-  Array $options = [],
+  Stdlib::HTTPUrl $url = "http://${$facts['networking']['fqdn']}/",


Just for context, https://httpd.apache.org/docs/2.4/mod/mod_proxy.html#balancermember is the documentation. That just mentions url, but I think HTTP/HTTPS is sufficient in schemes.

Just as an additional Note: stdlib/types/httpurl.pp:

type Stdlib::HTTPUrl = Pattern[/(?i:\Ahttps?:\/\/.*\z)/]

So, HTTPS is included there.

Yes, I was mostly thinking out loud. Should have been explicit in that.

manifests/balancermember.pp

manifests/fastcgi/server.pp

manifests/mod.pp

manifests/mod/cluster.pp

manifests/mod/authn_dbd.pp

david22swan · 2022-06-13T09:22:37Z

@cocker-cc Look's like a lot of good changes so far.
Looking forward to getting this merged.

cocker-cc · 2022-06-13T09:58:34Z

@cocker-cc Look's like a lot of good changes so far. Looking forward to getting this merged.

@david22swan: just wait for the Changes out of the Discussions above. Okay?

david22swan · 2022-06-13T09:59:25Z

@cocker-cc Look's like a lot of good changes so far. Looking forward to getting this merged.

@david22swan: just wait for the Changes out of the Discussions above. Okay?

Yeh, that's what I meant sorry. Should have been clearer.

david22swan · 2022-07-04T09:11:34Z

@cocker-cc Hey, just checking if there are any updates on this coming soon?

ekohl · 2022-07-04T09:28:22Z

It may be good to wait for #2255 before rebasing this.

manifests/mod/info.pp

ekohl

Please rebase this now that the related PRs have been merged.

Also, as I suggested inline, feel free to narrow things down if they make more sense. It's going to be a major version bump, let's make use of it.

manifests/init.pp

manifests/vhost.pp

ekohl

Once CI passes I'd be happy to merge this and iterate on it further if we find breakages.

manifests/mod/negotiation.pp

manifests/init.pp

ekohl

I'm going to merge this. We'll probably see some fallout from this given its size, but it's moving things forward a lot.

ekohl · 2022-07-20T13:20:19Z

Oh, I missed that there is now a merge conflict in spec/acceptance/mod_php_spec.rb. Once you fix that, I'll merge this soon to avoid further conflicts.

cocker-cc · 2022-07-20T14:05:20Z

Oh, I missed that there is now a merge conflict in spec/acceptance/mod_php_spec.rb.

done

spec/classes/mod/ldap_spec.rb

ekohl

Let's see if CI is green.

david22swan · 2022-07-25T08:45:03Z

Look's like a few type mismatches in the test's:

Error while evaluating a Resource Statement, Class[Apache]: parameter 'service_ensure' expects a match for Stdlib::Ensure::Service = Enum['running', 'stopped'], got Boolean
Error while evaluating a Resource Statement, Class[Apache]: parameter 'server_signature' expects a match for Variant[Enum['Off', 'On'], Stdlib::Email = Pattern[/\A[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*\z/]], got 'testsig' 
etc.

cocker-cc · 2022-07-25T14:48:46Z

Error while evaluating a Resource Statement

I updated some Puppet-Datatypes.

cocker-cc · 2022-07-26T11:18:02Z

Again I reverted some Datatypes back to String.

cocker-cc · 2022-07-27T14:37:52Z

2022-07-27T14:20:28.5731650Z        expected that the catalogue would contain File[30-rspec.example.com.conf symlink] with path set to "/etc/apache2/sites-enabled/30-rspec.example.com.conf" but it is set to "/etc/httpd/sites-enabled/30-rspec.example.com.conf"

Have no Idea, why these appear. In the Specfile it's set to apache2, and in the PP-File it's set to apache2.

ekohl

Those also happen in main. I'll take a quick look.

ekohl · 2022-07-26T19:43:28Z

manifests/mpm/disable_mpm_event.pp

@@ -1,3 +1,4 @@
+# @summary disable Apache-Module event


Perhaps this and the other disable classes should also have @api private

ekohl · 2022-07-28T08:49:41Z

I believe #2266 should fix it.

- use Datatypes from Stdlib, particularly a Port now only accepts Stdlib::Port - use Variant[Integer, Pattern[/^[0-9]+$/]] where Strings represent Integers

ekohl · 2022-07-28T11:56:18Z

Looks like the tests will be green (Puppet 7 already passed). The only thing appears to be the CLA.

david22swan

It's been a long road but LGTM
Thank you @cocker-cc for putting in the work and @ekohl for all the reviews.

Won't merge immediately as with the size of this I'd like some others on the team to give it a look over first, but all being good should be merged in by Monday evening at the latest, with it and all the other changes released by that Friday or the next Monday.

pmcmaw · 2022-07-29T09:11:46Z

spec/classes/mod/ldap_spec.rb

-          ldap_cache_ttl: '600',
-          ldap_opcache_entries: '1024',
-          ldap_opcache_ttl: '600',
+          ldap_shared_cache_size: 500_000,


Is the underscore a typo?

No, in Ruby this is a convention to make numbers easier to read. Because it's quite hard to see if it's 5 or 6 zeros, this makes it visually easier to see it's 500k, not 5m. Rubocop even enforces it.

Amazing, never knew this 👍 will definitely come in handy at some point :-)

@pmcmaw: Sharp Eyes 👀
I do not like it, but Rubocop with its Config-File coming from the PDK-Templates sais so.

pmcmaw · 2022-07-29T09:47:38Z

I have just posted one of the tiniest questions, other than that it LGTM.

david22swan · 2022-07-29T10:01:54Z

@cocker-cc Could you sign the CLA?
Once that is done I can hit merge

cocker-cc · 2022-07-29T10:15:27Z

@cocker-cc Could you sign the CLA? Once that is done I can hit merge

I did, but it does not show up.

david22swan · 2022-07-29T10:19:29Z

Yeh sorry bout that, it can happen sometimes.
Screenshot's good enough for me, will go ahead and merge.
Thank's again to the both of you for putting in all this work :)

pmcmaw · 2022-07-29T10:20:59Z

@cocker-cc Amazing PR, thank you for your time and effort! 🥳

cocker-cc requested a review from a team as a code owner June 10, 2022 09:18

ia-content added the community label Jun 10, 2022

ekohl reviewed Jun 10, 2022

View reviewed changes

david22swan added the backwards-incompatible label Jun 13, 2022

ekohl reviewed Jul 8, 2022

View reviewed changes

manifests/mod/info.pp Outdated Show resolved Hide resolved

ekohl requested changes Jul 8, 2022

View reviewed changes

cocker-cc force-pushed the Narrow_down_Datatypes branch 2 times, most recently from ef41982 to 55e7bc7 Compare July 10, 2022 09:20

ekohl reviewed Jul 11, 2022

View reviewed changes

manifests/init.pp Outdated Show resolved Hide resolved

manifests/init.pp Outdated Show resolved Hide resolved

manifests/init.pp Outdated Show resolved Hide resolved

manifests/vhost.pp Outdated Show resolved Hide resolved

manifests/vhost.pp Outdated Show resolved Hide resolved

cocker-cc force-pushed the Narrow_down_Datatypes branch from 55e7bc7 to 0c28a88 Compare July 11, 2022 18:04

ekohl reviewed Jul 18, 2022

View reviewed changes

manifests/mod/negotiation.pp Outdated Show resolved Hide resolved

manifests/init.pp Outdated Show resolved Hide resolved

cocker-cc force-pushed the Narrow_down_Datatypes branch from 0c28a88 to bdf1020 Compare July 18, 2022 08:39

ekohl previously approved these changes Jul 20, 2022

View reviewed changes

cocker-cc dismissed ekohl’s stale review via 280ec5f July 20, 2022 14:04

cocker-cc force-pushed the Narrow_down_Datatypes branch from bdf1020 to 280ec5f Compare July 20, 2022 14:04

ekohl reviewed Jul 20, 2022

View reviewed changes

spec/classes/mod/ldap_spec.rb Outdated Show resolved Hide resolved

cocker-cc force-pushed the Narrow_down_Datatypes branch from 280ec5f to bfa81ab Compare July 20, 2022 14:13

ekohl previously approved these changes Jul 20, 2022

View reviewed changes

cocker-cc dismissed ekohl’s stale review via 64a9d68 July 25, 2022 14:47

cocker-cc force-pushed the Narrow_down_Datatypes branch from bfa81ab to 64a9d68 Compare July 25, 2022 14:47

cocker-cc force-pushed the Narrow_down_Datatypes branch 2 times, most recently from 235894e to 93e7d0d Compare July 26, 2022 11:15

cocker-cc force-pushed the Narrow_down_Datatypes branch 2 times, most recently from 8489efe to 5b2d902 Compare July 26, 2022 13:14

ekohl reviewed Jul 28, 2022

View reviewed changes

Narrow down Datatypes

f41251e

- use Datatypes from Stdlib, particularly a Port now only accepts Stdlib::Port - use Variant[Integer, Pattern[/^[0-9]+$/]] where Strings represent Integers

cocker-cc force-pushed the Narrow_down_Datatypes branch from 5b2d902 to f41251e Compare July 28, 2022 11:00

david22swan approved these changes Jul 28, 2022

View reviewed changes

pmcmaw reviewed Jul 29, 2022

View reviewed changes

pmcmaw approved these changes Jul 29, 2022

View reviewed changes

david22swan merged commit 950cffb into puppetlabs:main Jul 29, 2022

cocker-cc deleted the Narrow_down_Datatypes branch July 29, 2022 15:21

trenta mentioned this pull request Jan 10, 2023

Apache module version 9 support voxpupuli/puppet-zabbix#860

Closed

Narrow down Datatypes #2245

Narrow down Datatypes #2245

Uh oh!

Conversation

cocker-cc commented Jun 10, 2022

Uh oh!

CLAassistant commented Jun 10, 2022

Uh oh!

ekohl left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

david22swan commented Jun 13, 2022

Uh oh!

cocker-cc commented Jun 13, 2022

Uh oh!

david22swan commented Jun 13, 2022

Uh oh!

david22swan commented Jul 4, 2022

Uh oh!

ekohl commented Jul 4, 2022

Uh oh!

Uh oh!

ekohl left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ekohl left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

ekohl left a comment

Choose a reason for hiding this comment

Uh oh!

ekohl commented Jul 20, 2022

Uh oh!

cocker-cc commented Jul 20, 2022

Uh oh!

Uh oh!

ekohl left a comment

Choose a reason for hiding this comment

Uh oh!

david22swan commented Jul 25, 2022

Uh oh!

cocker-cc commented Jul 25, 2022

Uh oh!

cocker-cc commented Jul 26, 2022

Uh oh!

cocker-cc commented Jul 27, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ekohl left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ekohl commented Jul 28, 2022

Uh oh!

ekohl commented Jul 28, 2022

Uh oh!

david22swan left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cocker-cc commented Jul 27, 2022 •

edited

Loading

david22swan left a comment •

edited

Loading

david22swan commented Jul 29, 2022 •

edited

Loading