Fix consecutive hyphens in export id#6194
Merged
Merged
Conversation
Signed-off-by: Hai Yan <oeyh@amazon.com>
oeyh
requested review from
KarstenSchnitter,
chenqi0805,
dinujoh,
dlvenable,
engechas,
graytaylor0,
kkondaka,
san81,
sb2k16 and
srikanthjg
as code owners
kkondaka
reviewed
Oct 22, 2025
| return truncateString(snapshotId, EXPORT_TASK_ID_MAX_LENGTH - 16) + "-export-" + UUID.randomUUID().toString().substring(0, 8); | ||
| String truncatedSnapshotId = truncateString(snapshotId, EXPORT_TASK_ID_MAX_LENGTH - 16); | ||
| // Remove trailing hyphens to prevent consecutive hyphens in the export task identifier | ||
| truncatedSnapshotId = truncatedSnapshotId.replaceAll("-+$", ""); |
Collaborator
There was a problem hiding this comment.
I think using "replaceAll" is expensive due to regular expressions. You can use either
- a while loop like
int endIndex = truncatedSnapshotId.length();
while (endIndex > 0 && truncatedSnapshotId.charAt(endIndex - 1) == '-') {
endIndex--;
}
truncatedSnapshotId = truncatedSnapshotId.substring(0, endIndex);
or use Apache StringUtils like this
import org.apache.commons.lang3.StringUtils;
truncatedSnapshotId = StringUtils.stripEnd(truncatedSnapshotId, "-");
Member
There was a problem hiding this comment.
Creating an export only happens once per database. I think this is fine.
Collaborator
Author
There was a problem hiding this comment.
Yes, this runs only once when pipeline starts.
dlvenable
approved these changes
Oct 22, 2025
| return truncateString(snapshotId, EXPORT_TASK_ID_MAX_LENGTH - 16) + "-export-" + UUID.randomUUID().toString().substring(0, 8); | ||
| String truncatedSnapshotId = truncateString(snapshotId, EXPORT_TASK_ID_MAX_LENGTH - 16); | ||
| // Remove trailing hyphens to prevent consecutive hyphens in the export task identifier | ||
| truncatedSnapshotId = truncatedSnapshotId.replaceAll("-+$", ""); |
Member
There was a problem hiding this comment.
Creating an export only happens once per database. I think this is fine.
| String truncatedSnapshotId = truncateString(snapshotId, EXPORT_TASK_ID_MAX_LENGTH - 16); | ||
| // Remove trailing hyphens to prevent consecutive hyphens in the export task identifier | ||
| truncatedSnapshotId = truncatedSnapshotId.replaceAll("-+$", ""); | ||
| return truncatedSnapshotId + "-export-" + UUID.randomUUID().toString().substring(0, 8); |
Member
There was a problem hiding this comment.
Are there any other export restrictions which we might hit?
Collaborator
Author
There was a problem hiding this comment.
These are the naming restrictions:
- Identifiers must begin with a letter;
- must contain only ASCII letters, digits, and hyphens;
- and must not end with a hyphen or contain two consecutive hyphens.
- cannot be longer than 60 characters
The snapshot Id, which is used as first part of the export id here, conforms to similar rules, so after truncating and preventing consecutive hyphens, we should be good.
kkondaka
approved these changes
Oct 23, 2025
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Description
Fixed the RDS export task ID generation to prevent consecutive hyphens in export task identifiers that cause RDS validation failures.
Issues Resolved
Resolves #6186
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.