remove trailing '/' in endpoint url

Author: 2bndy5

cpp-linter/src/rest_api/github/mod.rs

@@ -261,16 +261,11 @@ impl RestApiClient for GithubApiClient {
                 let sha = self.sha.clone().unwrap() + "/";
                 let comments_url = self
                     .api_url
-                    .join("repos/")
-                    .unwrap()
-                    .join(format!("{}/", repo).as_str())
-                    .unwrap()
-                    .join(if is_pr { "issues/" } else { "commits/" })
-                    .unwrap()
-                    .join(if is_pr { pr.as_str() } else { sha.as_str() })
-                    .unwrap()
-                    .join("comments/")
-                    .unwrap();
+                    .join("repos/")?
+                    .join(format!("{}/", repo).as_str())?
+                    .join(if is_pr { "issues/" } else { "commits/" })?
+                    .join(if is_pr { pr.as_str() } else { sha.as_str() })?
+                    .join("comments")?;
 
                 self.update_comment(
                     comments_url,

cpp-linter/src/rest_api/github/specific_api.rs

@@ -205,7 +205,7 @@ impl GithubApiClient {
             })?,
         );
         let repo = format!(
-            "repos/{}/comments/",
+            "repos/{}/comments",
             // if we got here, then we know it is on a CI runner as self.repo should be known
             self.repo.as_ref().expect("Repo name unknown.")
         );
@@ -243,11 +243,14 @@ impl GithubApiClient {
                                 comment.user.login,
                                 comment.user.id,
                             );
-                            let this_comment_url = base_comment_url
-                                .join(&comment.id.to_string())
-                                .with_context(|| {
-                                format!("Failed to parse URL for JSON comment.id: {}", comment.id)
-                            })?;
+                            let this_comment_url =
+                                Url::parse(format!("{base_comment_url}/{}", &comment.id).as_str())
+                                    .with_context(|| {
+                                        format!(
+                                            "Failed to parse URL for JSON comment.id: {}",
+                                            comment.id
+                                        )
+                                    })?;
                             if delete || comment_url.is_some() {
                                 // if not updating: remove all outdated comments
                                 // if updating: remove all outdated comments except the last one

cpp-linter/tests/comments.rs

@@ -106,7 +106,7 @@ async fn setup(lib_root: &Path, test_params: &TestParams) {
             server
                 .mock(
                     "GET",
-                    format!("/repos/{REPO}/commits/{SHA}/comments/").as_str(),
+                    format!("/repos/{REPO}/commits/{SHA}/comments").as_str(),
                 )
                 .match_header("Accept", "application/vnd.github.raw+json")
                 .match_header("Authorization", TOKEN)
@@ -123,7 +123,7 @@ async fn setup(lib_root: &Path, test_params: &TestParams) {
                 .create(),
         );
     } else {
-        let pr_endpoint = format!("/repos/{REPO}/issues/{PR}/comments/");
+        let pr_endpoint = format!("/repos/{REPO}/issues/{PR}/comments");
         for pg in ["1", "2"] {
             let link = if pg == "1" {
                 format!("<{}{pr_endpoint}?page=2>; rel=\"next\"", server.url())
@@ -190,7 +190,7 @@ async fn setup(lib_root: &Path, test_params: &TestParams) {
                 .mock(
                     "POST",
                     format!(
-                        "/repos/{REPO}/{}/comments/",
+                        "/repos/{REPO}/{}/comments",
                         if test_params.event_t == EventType::PullRequest {
                             format!("issues/{PR}")
                         } else {