Skip to content

Adjust change-url parsing to deal with sub-pages #75

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

Merged
merged 1 commit into from
Sep 20, 2023
Merged

Adjust change-url parsing to deal with sub-pages #75

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
8 changes: 6 additions & 2 deletions cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,13 @@ func getChangeUuid(ctx context.Context, expectedStatus sdp.ChangeStatus, errNotF
if err != nil {
return uuid.Nil, fmt.Errorf("invalid --change value '%v', error: %w", changeUrlString, err)
}
changeUuid, err = uuid.Parse(path.Base(changeUrl.Path))
pathParts := strings.Split(path.Clean(changeUrl.Path), "/")
if len(pathParts) < 2 {
return uuid.Nil, fmt.Errorf("invalid --change value '%v', not long enough: %w", changeUrlString, err)
}
changeUuid, err = uuid.Parse(pathParts[1])
if err != nil {
return uuid.Nil, fmt.Errorf("invalid --change value '%v', couldn't parse: %w", changeUrlString, err)
return uuid.Nil, fmt.Errorf("invalid --change value '%v', couldn't parse UUID: %w", changeUrlString, err)
}

return changeUuid, nil
Expand Down