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

Simplify templates by reusing methods #2344

Merged
merged 1 commit into from
Jan 23, 2023

Conversation

ekohl
Copy link
Collaborator

@ekohl ekohl commented Nov 23, 2022

See individual commits for details. Note I haven't tested this and will rely on CI and review to spot errors.

@ekohl ekohl requested a review from a team as a code owner November 23, 2022 12:10
@david22swan
Copy link
Member

@ekohl Look's like your change may be causing some failures on Debian and Ubuntu

@ekohl
Copy link
Collaborator Author

ekohl commented Jan 10, 2023

I've submitted the first part as #2366. Once that's merged I'll rebase this and see where it fails.

@ekohl ekohl marked this pull request as draft January 10, 2023 15:01
@ekohl ekohl force-pushed the simplify-templates branch 2 times, most recently from e9e9acf to a15e4b7 Compare January 16, 2023 10:55
@ekohl
Copy link
Collaborator Author

ekohl commented Jan 16, 2023

Rebased and pushed a fix in the WSGI template that I think was the cause for the failure. If this is green, it's ready to be merged.

@ekohl ekohl marked this pull request as ready for review January 16, 2023 10:56
It's valid to call .sort on a hash and it'll sort by key. This means you
don't need to perform an additional lookup when iterating and makes the
code more readable.
Copy link
Member

@david22swan david22swan left a comment

Choose a reason for hiding this comment

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

Logic for this look's good to me and the tests are/were green.
Happy to merge, just had to hit the rebase button first.

@ekohl
Copy link
Collaborator Author

ekohl commented Jan 20, 2023

@david22swan rebase passed.

@david22swan david22swan merged commit 4d4c551 into puppetlabs:main Jan 23, 2023
@david22swan
Copy link
Member

Apologies on the wait, this slipped my mind

@ekohl ekohl deleted the simplify-templates branch January 23, 2023 09:25
@ekohl
Copy link
Collaborator Author

ekohl commented Jan 23, 2023

I've been there way too often.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants