Remove unneeded code (jenkins-infra#4081)

MarkEWaite · Sep 10, 2024 · 266d4d1 · 266d4d1
1 parent a61815c
commit 266d4d1
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 428 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -55,11 +55,7 @@ node('maven-21 || (java&&linux)') {
 
                 if (dryRun) {
                     try {
-                        withCredentials([
-                                usernamePassword(credentialsId: 'jiraUser', passwordVariable: 'JIRA_PASSWORD', usernameVariable: 'JIRA_USERNAME')
-                                ]) {
-                            sh 'java -DdryRun=true' + javaArgs
-                        }
+                      sh 'java -DdryRun=true' + javaArgs
                     } catch(ignored) {
                         if (fileExists('checks-title.txt')) {
                             def title = readFile file: 'checks-title.txt', encoding: 'utf-8'
@@ -76,7 +72,6 @@ node('maven-21 || (java&&linux)') {
                             title: 'All checks passed'
                 } else {
                     withCredentials([
-                            usernamePassword(credentialsId: 'jiraUser', passwordVariable: 'JIRA_PASSWORD', usernameVariable: 'JIRA_USERNAME'),
                             string(credentialsId: 'artifactoryAdminToken', variable: 'ARTIFACTORY_TOKEN'),
                             usernamePassword(credentialsId: 'jenkins-infra-bot-github-token', passwordVariable: 'GITHUB_TOKEN', usernameVariable: 'GITHUB_USERNAME')
                     ]) {

diff --git a/README.md b/README.md
@@ -166,10 +166,12 @@ A complete example with two trackers:
 ```yaml
 issues:
   - github: 'jenkinsci/configuration-as-code-plugin' # The preferred issue tracker
-  - jira: 'configuration-as-code-plugin' # A secondary issue tracker is the Jira component 'configuration-as-code-plugin'
+  - jira: '23170' # A secondary issue tracker is the Jira component id 23170 for 'configuration-as-code-plugin'
     report: false # No new issues should be reported here
 ```
 
+Jira component id can be found at: https://issues.jenkins.io/rest/api/2/project/JENKINS/components
+
 When GitHub Issues is used, there would be some duplicated content in the file (between `github` and `issues` entries) which can be resolved by using a YAML reference.
 Example:
 

diff --git a/permissions/plugin-repository.yml b/permissions/plugin-repository.yml
@@ -2,7 +2,7 @@
 name: "repository"
 github: "jenkinsci/maven-repository-plugin"
 issues:
-  - jira: "maven-repository-plugin"
+  - jira: '15802' # maven-repository-plugin
 paths:
   - "jenkins/repository"
 developers:

diff --git a/...oovy/io/jenkins/infra/repository_permissions_updater/ArtifactoryPermissionsUpdater.groovy b/...oovy/io/jenkins/infra/repository_permissions_updater/ArtifactoryPermissionsUpdater.groovy
@@ -120,8 +120,8 @@ class ArtifactoryPermissionsUpdater {
 
         Map<String, Set<TeamDefinition>> teamsByName = loadTeams()
 
-        Map<String, Set<String>> pathsByGithub = new TreeMap()
-        Map<String, List> issueTrackersByPlugin = new TreeMap()
+        Map<String, Set<String>> pathsByGithub = new TreeMap<>()
+        Map<String, List> issueTrackersByPlugin = new TreeMap<>()
         Map<String, List<Definition>> cdEnabledComponentsByGitHub = new TreeMap<>()
         Map<String, List<String>> maintainersByComponent = new HashMap<>()
 
@@ -176,11 +176,11 @@ class ArtifactoryPermissionsUpdater {
                     issueTrackersByPlugin.put(definition.name, definition.issues.collect { tracker ->
                         if (tracker.isJira() || tracker.isGitHubIssues()) {
                             def ret = [type: tracker.getType(), reference: tracker.getReference()]
-                            def viewUrl = tracker.getViewUrl(JiraAPI.getInstance())
+                            def viewUrl = tracker.getViewUrl()
                             if (viewUrl) {
                                 ret += [ viewUrl: viewUrl ]
                             }
-                            def reportUrl = tracker.getReportUrl(JiraAPI.getInstance())
+                            def reportUrl = tracker.getReportUrl()
                             if (reportUrl) {
                                 ret += [ reportUrl: reportUrl ]
                             }
@@ -243,7 +243,7 @@ class ArtifactoryPermissionsUpdater {
                         if (!definition.cd?.exclusive) {
                             users definition.developers.collectEntries { developer ->
                                 def existsInArtifactory = KnownUsers.existsInArtifactory(developer)
-                                def existsInJira = KnownUsers.existsInJira(developer) || JiraAPI.getInstance().isUserPresent(developer)
+                                def existsInJira = KnownUsers.existsInJira(developer)
 
                                 if (!existsInArtifactory && !existsInJira) {
                                     reportChecksApiDetails(developer + " needs to log in to Artifactory and Jira",
@@ -287,7 +287,7 @@ class ArtifactoryPermissionsUpdater {
                             }
                         } else {
                             definition.developers.each { developer ->
-                                def existsInJira = KnownUsers.existsInJira(developer) || JiraAPI.getInstance().isUserPresent(developer)
+                                def existsInJira = KnownUsers.existsInJira(developer)
 
                                 if (!existsInJira) {
                                     reportChecksApiDetails(developer + " needs to log in to Jira",

diff --git a/src/main/java/io/jenkins/infra/repository_permissions_updater/Definition.java b/src/main/java/io/jenkins/infra/repository_permissions_updater/Definition.java
@@ -2,7 +2,6 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -32,10 +31,6 @@ public static class SecurityContacts {
      * Some invalid input may result in both returning {@code false}, in that case other methods will throw exceptions.
      */
     public static class IssueTracker {
-        public interface JiraComponentSource {
-            String getComponentId(String componentName) throws IOException;
-        }
-
         private static final Logger LOGGER = Logger.getLogger(IssueTracker.class.getName());
 
         public String jira;
@@ -50,6 +45,9 @@ public boolean isJira() {
                 LOGGER.log(Level.INFO, "Unexpected Jira component name, skipping: " + jira);
                 return false;
             }
+
+            assertJiraIdFormatValid();
+
             return true;
         }
 
@@ -65,44 +63,29 @@ public boolean isGitHubIssues() {
         }
 
         @SuppressFBWarnings(value = "NP_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD",
-                            justification = "All calls are guarded by jira null check in isJira()")
-        private String loadComponentId(JiraComponentSource source) throws IOException {
-            String jiraComponentId = jira;
+                justification = "All calls are guarded by jira null check in isJira()")
+        private void assertJiraIdFormatValid() {
             if (!jira.matches("[0-9]+")) {
-                // CreateIssueDetails needs the numeric Jira component ID
-                jiraComponentId = source.getComponentId(jira);
-                if (jiraComponentId == null) {
-                    LOGGER.warning("Failed to determine Jira component ID for '" + jira + "', the component may not exist");
-                    return null;
-                }
+                throw new IllegalArgumentException("Jira component ID must be numeric, but got: " + jira);
             }
-            return jiraComponentId;
         }
 
-        public String getViewUrl(JiraComponentSource source) throws IOException {
+        public String getViewUrl() {
             if (isJira()) {
-                final String id = loadComponentId(source);
-                if (id != null) {
-                    return "https://issues.jenkins.io/issues/?jql=component=" + id;
-                }
-                return null;
+                return "https://issues.jenkins.io/issues/?jql=component=" + jira;
             }
             if (isGitHubIssues()) {
                 return "https://github.com/" + github + "/issues";
             }
             throw new IllegalStateException("Invalid issue tracker: " + github + " / " + jira);
         }
 
-        public String getReportUrl(JiraComponentSource source) throws IOException {
+        public String getReportUrl() {
             if (!report) {
                 return null;
             }
             if (isJira()) {
-                final String id = loadComponentId(source);
-                if (id != null) {
-                    return "https://www.jenkins.io/participate/report-issue/redirect/#" + id;
-                }
-                return null;
+                return "https://www.jenkins.io/participate/report-issue/redirect/#" + jira;
             }
             if (isGitHubIssues()) {
                 return "https://github.com/" + github + "/issues/new/choose"; // The 'choose' URL works even when there are no issue templates

diff --git a/src/main/java/io/jenkins/infra/repository_permissions_updater/JiraAPI.java b/src/main/java/io/jenkins/infra/repository_permissions_updater/JiraAPI.java
diff --git a/src/main/java/io/jenkins/infra/repository_permissions_updater/JiraImpl.java b/src/main/java/io/jenkins/infra/repository_permissions_updater/JiraImpl.java
diff --git a/src/main/java/io/jenkins/infra/repository_permissions_updater/KnownUsers.java b/src/main/java/io/jenkins/infra/repository_permissions_updater/KnownUsers.java
@@ -15,8 +15,8 @@ public class KnownUsers {
     private static final String ARTIFACTORY_USER_NAMES_URL = System.getProperty("artifactoryUserNamesJsonListUrl", "https://reports.jenkins.io/artifactory-ldap-users-report.json");
     private static final String JIRA_USER_NAMES_URL = System.getProperty("jiraUserNamesJsonListUrl", "https://reports.jenkins.io/jira-users-report.json");
 
-    private static Set<String> knownArtifactoryUsers = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
-    private static Set<String> knownJiraUsers = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
+    private static final Set<String> knownArtifactoryUsers = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
+    private static final Set<String> knownJiraUsers = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
 
     static {
         try {