Navigation Menu

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

(PUP-10955) Normalize environment name to symbol before caching #8702

Merged
merged 1 commit into from Jul 22, 2021

Conversation

luchihoratiu
Copy link
Contributor

@luchihoratiu luchihoratiu commented Jul 19, 2021

The Puppet::Environments::Cached.get method says it accepts Strings or Symbols. This commit normalizes the environment name before caching and getting the environment to avoid duplicated environments in cache (as String and as Symbol).

@luchihoratiu luchihoratiu requested review from a team July 19, 2021 11:53
@luchihoratiu
Copy link
Contributor Author

jenkins please test this with servertests

@luchihoratiu
Copy link
Contributor Author

jenkins please test this with servertests

@luchihoratiu
Copy link
Contributor Author

jenkins please test this with servertests

@joshcooper
Copy link
Contributor

PR #8673 is been merged, so you should be able to rebase onto upstream/6.x

@luchihoratiu luchihoratiu force-pushed the PUP-10955-un-revert branch 2 times, most recently from 5a5f5a3 to 505e785 Compare July 21, 2021 13:19
@luchihoratiu
Copy link
Contributor Author

Acceptance tests passed (here) so this should be good to further review/merge ✅
Latest push was rebasing to 6.x.

Copy link
Contributor

@joshcooper joshcooper left a comment

Choose a reason for hiding this comment

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

Just had the nit, otherwise looks good.

The `Puppet::Environments::Cached.get` method says it accepts Strings or
Symbols. This commit normalizes the environment name before caching and
getting the environment to avoid duplicated environments in cache (as
String and as Symbol).
@gimmyxd gimmyxd merged commit c0071fc into puppetlabs:6.x Jul 22, 2021
joshcooper added a commit to joshcooper/puppet that referenced this pull request Jul 23, 2021
…5-un-revert"

This reverts commit c0071fc, reversing
changes made to 8a95722.
joshcooper added a commit to joshcooper/puppet that referenced this pull request Jul 23, 2021
…5-un-revert"

This reverts commit c0071fc, reversing
changes made to 8a95722.
joshcooper added a commit to joshcooper/puppet that referenced this pull request Jul 24, 2021
* upstream/6.x:
  (packaging) Updating manpage file for 6.x
  Revert "Merge pull request puppetlabs#8673 from joshcooper/guard_text_domain"
  Revert "Merge pull request puppetlabs#8708 from joshcooper/missing_guard_methods"
  Revert "Merge pull request puppetlabs#8702 from luchihoratiu/PUP-10955-un-revert"
  (docs)(DOC-5035) Remove "master" in generated docs

Conflicts:
  lib/puppet/defaults.rb
  lib/puppet/environments.rb
  lib/puppet/type/filebucket.rb
  man/man5/puppet.conf.5

Accepted text_domain_service revert in 6.x

Accepted `Puppet Server` changes in 6.x
joshcooper added a commit to joshcooper/puppet that referenced this pull request Jul 27, 2021
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