Quote regexp metadata when using secret labels in regexp queries for dupe checks. #17446
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
|
/merge |
Merged
Merged
jujubot
added a commit
that referenced
this pull request
Jun 3, 2024
#17461 Forward merge: - #17348 - #17413 - #17423 - #17436 - #17422 - #17446 - #17448 - #17444 - #17453 - #17440 - #17458 Conflicts: - acceptancetests/jujupy/client.py - acceptancetests/jujupy/tests/test_status.py - acceptancetests/repository/trusty/haproxy/cm.py - acceptancetests/tests/test_jujucharm.py - cmd/juju/cloud/addcredential.go - core/base/base.go - environs/bootstrap/bootstrap.go - provider/azure/environ.go - provider/azure/internal/imageutils/images.go - scripts/win-installer/setup.iss - snap/snapcraft.yaml - version/version.go Conflicts mostly trivial `provider/azure/internal/imageutils/images.go` took a bit of thought. This conflict resulted from my PR #17440
Merged
jujubot
added a commit
that referenced
this pull request
Jun 7, 2024
#17479 Forward merge: - #17348 - #17413 - #17423 - #17436 - #17336 - #17422 - #17446 - #17448 - #17444 - #17453 - #17440 - #17458 - #17454 - #17461 - #17462 - #17463 - #17465 - #17469 - #17144 - #17179 - #17464 - #17476 - #17477 Conflicts: - cmd/juju/application/bundle/bundle.go - cmd/juju/application/bundle/bundle_test.go - cmd/juju/application/deploy.go - cmd/juju/application/deploy_test.go - cmd/juju/commands/bootstrap.go - cmd/juju/machine/add.go - cmd/jujud-controller/agent/machine.go - cmd/jujud/agent/machine.go - go.mod - go.sum - internal/bundle/changes/changes.go - internal/container/utils.go - internal/container/utils_test.go - internal/provider/azure/environ.go - internal/provider/azure/internal/errorutils/errors_test.go - internal/provider/azure/internal/imageutils/images.go - internal/provider/azure/internal/imageutils/images_test.go - internal/worker/containerbroker/broker_test.go - internal/worker/uniter/runner/context/context.go - internal/worker/uniter/runner/context/contextfactory.go - internal/worker/uniter/runner/context/export_test.go - internal/worker/uniter/runner/jujuc/relation-ids.go - tests/includes/juju.sh - tests/main.sh - tests/suites/deploy/os.sh Most conflicts were trivial to solve. Azure conflicts took a bit of thought. They emerged from [my PR](#17440) The conflicts to `internal/worker/uniter/runner`, emerging from [this PR](#17464), took some thought, since the structure of tests had changed to mocks. The conflicts with the production code here, however, was trivial to merge
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.
It turns out some charms are using special chars in secret labels, including regexp symbols. As such, mongo queries which check for duplicate labels fail as the query uses a regexp. This PR is a simple fix which quotes the regexp metadata.
QA steps
Links
Launchpad bug: https://bugs.launchpad.net/bugs/2058012
Jira card: JUJU-6078