update resource association logic to try both with and without dimension fixes #1665
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.
AmazonMQ has special associator logic to match and remove a suffix
-[0-9]+$"from the Broker dimension label. This problem solves the case where the resource name in the ARN indeed doesn't have that suffix, because of ActiveMQ adding the suffix to theBrokerdimension, but causes an issue if the ARN actually does have that kind of suffix, because the customer named the resource that way.This PR updates the label building logic to first try to apply any of the custom fixes. If any of them were applied, and there's no resource ARN match from the resulting label set signature, then we try to build a new label set signature with no fixes applied.