Merge pull request #5012 from linuxfoundation/unicron-update-comment-message-for-intercom

Update comment text & link for intercom integration needed by May 6th

Author: lukaszgryglicki

.gitignore

@@ -276,7 +276,7 @@ cla-backend-go/golang-api.log
 utils/otel_dd_go/otel_dd
 audit.json
 spans*.json
-*api_usage.csv
+*api_usage*.csv
 
 *.exe
 *.exe~

cla-backend-go/github/github_repository.go

@@ -2150,7 +2150,7 @@ func getCommentBody(repositoryType, signURL string, signed, missing []*UserCommi
 
 	// ---------- Missing section (group by author) ----------
 	if numMissing > 0 {
-		supportURL := "https://jira.linuxfoundation.org/servicedesk/customer/portal/4"
+		supportURL := "https://easycla.lfx.linuxfoundation.org/"
 		missingIDHelpURL := "https://linuxfoundation.atlassian.net/wiki/spaces/LP/pages/160923756/Missing+ID+on+Commit+but+I+have+an+agreement+on+file"
 		githubHelpURL := "https://help.github.com/en/github/committing-changes-to-your-project/why-are-my-commits-linked-to-the-wrong-user"
 
@@ -2190,7 +2190,7 @@ func getCommentBody(repositoryType, signURL string, signed, missing []*UserCommi
 						"<a href='%s' target='_blank'>GitHub Help</a> to resolve. "+
 						"(To view the commit's email address, add .patch at the end of this PR page's URL.) "+
 						"For further assistance with EasyCLA, "+
-						"<a href='%s' target='_blank'>please submit a support request ticket</a>.</li>",
+						"<a href='%s' target='_blank'>please visit our EasyCLA portal</a> and chat with our support bot.</li>",
 					failed, strings.Join(shas, ", "), missingIDHelpURL, githubHelpURL, supportURL,
 				))
 				continue
@@ -2214,7 +2214,7 @@ func getCommentBody(repositoryType, signURL string, signed, missing []*UserCommi
 					`<li>%s %s (%s). This user is authorized, but they must confirm their affiliation with their company. `+
 						`Start the authorization process <a href='%s' target='_blank'> by clicking here</a>, `+
 						`click "Corporate", select the appropriate company from the list, then confirm your affiliation on the page that appears. `+
-						`For further assistance with EasyCLA, <a href='%s' target='_blank'>please submit a support request ticket</a>.</li>`,
+						`For further assistance with EasyCLA, <a href='%s' target='_blank'>please visit our EasyCLA portal</a> and chat with our support bot.</li>`,
 					failed, authorInfo, strings.Join(shas, ", "),
 					signURL, supportURL,
 				))
@@ -2228,7 +2228,7 @@ func getCommentBody(repositoryType, signURL string, signed, missing []*UserCommi
 				committersComment.WriteString(fmt.Sprintf(
 					`<li><a href='%s' target='_blank'>%s</a> - %s. The commit (%s) is not authorized under a signed CLA. `+
 						`<a href='%s' target='_blank'>Please click here to be authorized</a>. `+
-						`For further assistance with EasyCLA, <a href='%s' target='_blank'>please submit a support request ticket</a>.</li>`,
+						`For further assistance with EasyCLA, <a href='%s' target='_blank'>please visit our EasyCLA portal</a> and chat with our support bot.</li>`,
 					signURL, failed, authorInfo, strings.Join(shas, ", "),
 					signURL, supportURL,
 				))

cla-backend-go/v2/gitlab-activity/service.go

@@ -346,7 +346,7 @@ func PrepareMrCommentContent(missingUsers []*gatedGitlabUser, signedUsers []*git
 	}
 
 	// gitlabSupportURL := "https://about.gitlab.com/support"
-	easyCLASupportURL := "https://jira.linuxfoundation.org/servicedesk/customer/portal/4"
+	easyCLASupportURL := "https://easycla.lfx.linuxfoundation.org/"
 	// faq := "https://docs.linuxfoundation.org/lfx/easycla/v2-current/getting-started/easycla-troubleshooting#github-unable-to-contribute-to-easycla-enforced-repositories"
 
 	if len(missingUsers) > 0 {
@@ -358,14 +358,14 @@ func PrepareMrCommentContent(missingUsers []*gatedGitlabUser, signedUsers []*git
 								  Start the authorization process <a href='%s'> by clicking here</a>, click "Corporate", 
 								  select the appropriate company from the list, then confirm your affiliation on the page that appears.
 								  For further assistance with EasyCLA,
-								  <a href='%s' target='_blank'>please submit a support request ticket</a>. </li>`, failed, authorInfo, signURL, easyCLASupportURL)
+								  <a href='%s' target='_blank'>please visit our EasyCLA portal</a> and chat with our support bot.</li>`, failed, authorInfo, signURL, easyCLASupportURL)
 				result += msg
 				body = confirmationNeededBadge
 			} else {
 				msg := fmt.Sprintf(`<li><a href='%s' target='_blank'>%s</a> - %s. The commit is not authorized under a signed CLA.
 									<a href='%s' target='_blank'>Please click here to be authorized</a>.
 									For further assistance with EasyCLA,
-									<a href='%s' target='_blank'>please submit a support request ticket</a>.
+									<a href='%s' target='_blank'>please visit our EasyCLA portal</a> and chat with our support bot.
 									</li>`, signURL, failed, authorInfo, signURL, easyCLASupportURL)
 				result += msg
 				body = failedBadge

cla-backend/cla/tests/unit/test_github.py

@@ -12,7 +12,7 @@
 SUCCESS = ":white_check_mark:"
 FAILED = ":x:"
 SIGN_URL = "http://test.contributor.lfcla/sign"
-SUPPORT_URL = "https://jira.linuxfoundation.org/servicedesk/customer/portal/4"
+SUPPORT_URL = "https://easycla.lfx.linuxfoundation.org/"
 GITHUB_HELP_URL = (
     "https://help.github.com/en/github/committing-changes-to-your-project/why-are-my-commits-linked-to-the-wrong-user"
 )
@@ -36,12 +36,11 @@
 #             + f"is missing the User's ID, preventing the EasyCLA check. "
 #             + f"<a href='{GITHUB_HELP_URL}' target='_blank'>Consult GitHub Help</a> to resolve."
 #             + f"For further assistance with EasyCLA, "
-#             + f"<a href='{SUPPORT_URL}' target='_blank'>please submit a support request ticket</a>."
+#             + f"<a href='{SUPPORT_URL}' target='_blank'>please visit our EasyCLA portal</a> and chat with our support bot."
 #             + "</li></url>"
 #     )
 #     assert response == expected
 
-
 # def test_get_comment_body_cla_fail_no_user_id_and_user_id():
 #     """
 #     Test CLA comment body for case CLA fail check with no user id and existing user id
@@ -63,14 +62,14 @@
 #             + " ,".join([GITHUB_FAKE_SHA])
 #             + ") is not authorized under a signed CLA. "
 #             + f"[Please click here to be authorized]({SIGN_URL}). For further assistance with "
-#             + f"EasyCLA, [please submit a support request ticket]({SUPPORT_URL})."
+#             + f"EasyCLA, [please visit our EasyCLA portal]({SUPPORT_URL}) and chat with our support bot."
 #             + "</li>"
 #             + "<li> " + FAILED + " The commit ("
 #             + " ,".join([GITHUB_FAKE_SHA_2])
 #             + ") is missing the User's ID, preventing the EasyCLA check. [Consult GitHub Help]("
 #             + GITHUB_HELP_URL
 #             + ") to resolve. For further assistance with EasyCLA, "
-#             + f"[please submit a support request ticket]({SUPPORT_URL})."
+#             + f"[please visit our EasyCLA portal]({SUPPORT_URL}) and chat with our support bot."
 #             + "</li></ul>"
 #     )
 #
@@ -93,7 +92,7 @@
 #             + f'[Start the authorization process by clicking here]({SIGN_URL}), click "Corporate",'
 #             + "select the appropriate company from the list, then confirm "
 #             + "your affiliation on the page that appears. For further assistance with EasyCLA, "
-#             + f"[please submit a support request ticket]({SUPPORT_URL})."
+#             + f"[please visit our EasyCLA portal]({SUPPORT_URL}) and chat with our support bot."
 #             + "</li>"
 #             + "</ul>"
 #     )

cla-backend/cla/utils.py

@@ -1136,7 +1136,7 @@ def get_comment_body(repository_type, sign_url, signed: List[UserCommitSummary],
             committers_comment += f'<li>{success} {author_info} ({", ".join(commit_shas)})</li>'
 
     if num_missing > 0:
-        support_url = "https://jira.linuxfoundation.org/servicedesk/customer/portal/4"
+        support_url = "https://easycla.lfx.linuxfoundation.org/"
         missing_id_help_url = "https://linuxfoundation.atlassian.net/wiki/spaces/LP/pages/160923756/Missing+ID+on+Commit+but+I+have+an+agreement+on+file"
 
         # Build a lookup table to group all the commits by author.
@@ -1166,7 +1166,7 @@ def get_comment_body(repository_type, sign_url, signed: List[UserCommitSummary],
                     f"<a href='{github_help_url}' target='_blank'>GitHub Help</a> to resolve. "
                     "(To view the commit's email address, add .patch at the end of this PR page's URL.) "
                     "For further assistance with EasyCLA, "
-                    f"<a href='{support_url}' target='_blank'>please submit a support request ticket</a>."
+                    f"<a href='{support_url}' target='_blank'>please visit our EasyCLA portal</a> and chat with our support bot."
                     "</li>"
                 )
             else:
@@ -1191,7 +1191,7 @@ def get_comment_body(repository_type, sign_url, signed: List[UserCommitSummary],
                         f"select the appropriate company from the list, then confirm "
                         f"your affiliation on the page that appears. "
                         f"For further assistance with EasyCLA, "
-                        f"<a href='{support_url}' target='_blank'>please submit a support request ticket</a>."
+                        f"<a href='{support_url}' target='_blank'>please visit our EasyCLA portal</a> and chat with our support bot."
                         "</li>"
                     )
                 else:
@@ -1204,7 +1204,7 @@ def get_comment_body(repository_type, sign_url, signed: List[UserCommitSummary],
                         "is not authorized under a signed CLA. "
                         f"<a href='{sign_url}' target='_blank'>Please click here to be authorized</a>. "
                         f"For further assistance with EasyCLA, "
-                        f"<a href='{support_url}' target='_blank'>please submit a support request ticket</a>."
+                        f"<a href='{support_url}' target='_blank'>please visit our EasyCLA portal</a> and chat with our support bot."
                         "</li>"
                     )