Simplify data types and array handling #2457
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bastelfreak
reviewed
Sep 12, 2023
| @@ -1,10 +1,10 @@ | |||
| <%- | | |||
| String $header, | |||
| Optional[Array[Variant[Stdlib::Host,Stdlib::IP::Address]]] $internal_proxy = undef, | |||
There was a problem hiding this comment.
is the template used anywhere where the Variant type is used as well?
There was a problem hiding this comment.
Good point. https://github.com/puppetlabs/puppetlabs-apache/blob/main/manifests/mod/remoteip.pp should also be simplified.
The type Stdlib::Host includes Stdlib::IP::Address, so the variant is redundant. There's also no way to pass nested arrays so flatten is not needed.
ekohl
force-pushed
the
simplify-remote-ip
branch
from
c69f55b to
df6862a
Compare
bastelfreak
approved these changes
Sep 12, 2023
smortex
reviewed
Sep 12, 2023
Comment on lines
+54
to
+55
| Optional[Array[Stdlib::IP::Address]] $internal_proxy = undef, | ||
| Optional[Array[Stdlib::IP::Address]] $proxy_ips = undef, |
There was a problem hiding this comment.
Wait, "The type Stdlib::Host includes Stdlib::IP::Address", was it not supposed to be the other way around?
Optional[Array[Stdlib::Host]] $internal_proxy = undef,
Optional[Array[Stdlib::Host]] $proxy_ips = undef,
🤔
There was a problem hiding this comment.
Bleh, that's what you get for quickly doing the work.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The type Stdlib::Host includes Stdlib::IP::Address, so the variant is redundant. There's also no way to pass nested arrays so flatten is not needed.