chore: fix merge conflict, remove itsdangerous leftovers #2
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
Signed-off-by: heitorlessa <[email protected]>
Signed-off-by: heitorlessa <[email protected]>
…s-powertools#2943) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ools#2944) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Leandro Damascena <[email protected]>
Co-authored-by: Powertools for AWS Lambda (Python) bot <[email protected]>
…tools#2948) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ws-powertools#2946) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Leandro Damascena <[email protected]>
Co-authored-by: Powertools for AWS Lambda (Python) bot <[email protected]>
…s-powertools#2521) Co-authored-by: Roy Assis <[email protected]> Co-authored-by: Ruben Fonseca <[email protected]>
Co-authored-by: Leandro Damascena <[email protected]> Co-authored-by: heitorlessa <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ols#2957) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…2956) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Leandro Damascena <[email protected]>
Co-authored-by: Powertools for AWS Lambda (Python) bot <[email protected]>
Co-authored-by: Leandro Damascena <[email protected]>
Signed-off-by: heitorlessa <[email protected]>
Signed-off-by: heitorlessa <[email protected]>
* develop: chore: cleanup, add test for single and nested fix(parameters): make cache aware of single vs multiple calls docs(roadmap): add GovCloud and China region item (aws-powertools#2960) docs(metrics): update Datadog integration diagram (aws-powertools#2954) chore(ci): changelog rebuild (aws-powertools#2958) chore(deps-dev): bump cfn-lint from 0.79.6 to 0.79.7 (aws-powertools#2956) chore(deps): bump actions/setup-node from 3.7.0 to 3.8.0 (aws-powertools#2957) chore(deps-dev): bump xenon from 0.9.0 to 0.9.1 (aws-powertools#2955) feat(metrics): add Datadog observability provider (aws-powertools#2906) feat(event_handler): allow stripping route prefixes using regexes (aws-powertools#2521) chore(ci): changelog rebuild (aws-powertools#2952) chore(deps): bump pypa/gh-action-pypi-publish from 1.8.9 to 1.8.10 (aws-powertools#2946) chore(deps): bump gitpython from 3.1.31 to 3.1.32 in /docs (aws-powertools#2948) chore(deps-dev): bump aws-cdk from 2.90.0 to 2.91.0 (aws-powertools#2947) chore(ci): changelog rebuild (aws-powertools#2945) chore(deps-dev): bump the boto-typing group with 1 update (aws-powertools#2944) chore(deps): bump pypa/gh-action-pypi-publish from 1.8.8 to 1.8.9 (aws-powertools#2943) Signed-off-by: heitorlessa <[email protected]>
Signed-off-by: heitorlessa <[email protected]>
Signed-off-by: heitorlessa <[email protected]>
Signed-off-by: heitorlessa <[email protected]>
seshubaws
approved these changes
Sep 6, 2023
seshubaws
approved these changes
Sep 8, 2023
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.
Issue number:
Summary
Addressed all merge conflicts with
poetry.lockgiven the latest changes in the trunk. I also removed the last leftovers fromitsdangerousas tests were failing due to the provider no longer being found -- i switched perf tests from.encrypt/decryptto.maskfor nowChanges
tests/performance/test_data_masking.py(use.maskover.encrypt/decryptfor now)pyproject.tomlpoetry.lockdatamasking-allUser experience
Checklist
If your change doesn't seem to apply, please leave them unchecked.
Is this a breaking change?
RFC issue number:
Checklist:
Acknowledgment
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
Disclaimer: We value your time and bandwidth. As such, any pull requests created on non-triaged issues might not be successful.