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.

Sign up for GitHub

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

Allow orgs with leading numbers in name in GitRemote #4727

Merged
merged 1 commit into from
Nov 27, 2024
Merged

Allow orgs with leading numbers in name in GitRemote #4727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rewrite-core/src/main/java/org/openrewrite/GitRemote.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ private String repositoryPath(RemoteServerMatch match, URI normalizedUri) {
.replaceFirst("^/", "");
}

private static final Pattern PORT_PATTERN = Pattern.compile(":\\d+");
private static final Pattern PORT_PATTERN = Pattern.compile(":\\d+[^-\\w]"); // Allow orgs with numbers in name
Copy link
Contributor

Choose a reason for hiding this comment

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

github at least supports org names with only numbers.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Guess those will still get the exception thrown then, but at least this works for partial numeric org names. Welcome suggestions for a complete fix!

Copy link
Contributor

Choose a reason for hiding this comment

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

Guess those will still get the exception thrown then, but at least this works for partial numeric org names. Welcome suggestions for a complete fix!

I had opened this previously #4651

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, I had no idea. Approved just now & sorry about the conflict. Do let me know if there's ever something open for too long.


static URI normalize(String url) {
try {
Expand Down
1 change: 1 addition & 0 deletions rewrite-core/src/test/java/org/openrewrite/GitRemoteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public class GitRemoteTest {
@CsvSource(textBlock = """
https://github.com/org/repo, github.com, org/repo, org, repo
[email protected]:org/repo.git, github.com, org/repo, org, repo
[email protected]:8451LLC/helm.git, github.com, 8451LLC/helm, 8451LLC, helm
ssh://github.com/org/repo.git, github.com, org/repo, org, repo

https://gitlab.com/group/repo.git, gitlab.com, group/repo, group, repo
Expand Down
Loading