Add all artifacts to maintainers and issue lists when wildcard is used

permissions/plugin-aws-java-sdk.yml

@@ -6,6 +6,29 @@ issues:
 paths:
   - "org/jenkins-ci/plugins/aws-java-sdk"
   - "org/jenkins-ci/plugins/aws-java-sdk/aws-java-sdk-*"
+extraNames:
+  - aws-java-sdk-api-gateway
+  - aws-java-sdk-autoscaling
+  - aws-java-sdk-cloudformation
+  - aws-java-sdk-cloudfront
+  - aws-java-sdk-codebuild
+  - aws-java-sdk-codedeploy
+  - aws-java-sdk-ec2
+  - aws-java-sdk-ecr
+  - aws-java-sdk-ecs
+  - aws-java-sdk-efs
+  - aws-java-sdk-elasticbeanstalk
+  - aws-java-sdk-elasticloadbalancingv2
+  - aws-java-sdk-iam
+  - aws-java-sdk-kinesis
+  - aws-java-sdk-lambda
+  - aws-java-sdk-logs
+  - aws-java-sdk-minimal
+  - aws-java-sdk-organizations
+  - aws-java-sdk-secretsmanager
+  - aws-java-sdk-sns
+  - aws-java-sdk-sqs
+  - aws-java-sdk-ssm
 cd:
   enabled: true
 developers:

permissions/plugin-gcp-java-sdk.yml

@@ -4,6 +4,9 @@ github: &GH "jenkinsci/gcp-java-sdk-plugin"
 paths:
 - "io/jenkins/plugins/gcp-java-sdk"
 - "io/jenkins/plugins/gcp-java-sdk-*"
+extraNames:
+- gcp-java-sdk-auth
+- gcp-java-sdk-storage
 developers:
 - "aneveux"
 - "@cloudbees-developers"

permissions/plugin-mina-sshd-api.yml

@@ -3,6 +3,11 @@ name: "mina-sshd-api"
 github: &GH "jenkinsci/mina-sshd-api-plugin"
 paths:
   - "io/jenkins/plugins/mina-sshd-api/mina-sshd-api-*"
+extraNames:
+  - "mina-sshd-api-common"
+  - "mina-sshd-api-core"
+  - "mina-sshd-api-scp"
+  - "mina-sshd-api-sftp"
 cd:
   enabled: true
 developers:

permissions/plugin-remoting-opentelemetry.yml

@@ -2,7 +2,8 @@
 name: "remoting-opentelemetry"
 github: &GH "jenkinsci/remoting-opentelemetry-plugin"
 paths:
-  - "io/jenkins/plugins/remoting-opentelemetry*"
+  - "io/jenkins/plugins/remoting-opentelemetry"
+  - "io/jenkins/plugins/remoting-opentelemetry-*"
 developers:
   - "aki7m"
   - "oleg_nenashev"

src/main/groovy/io/jenkins/infra/repository_permissions_updater/ArtifactoryPermissionsUpdater.groovy

@@ -173,43 +173,49 @@ class ArtifactoryPermissionsUpdater {
 
             if (definition.issues) {
                 if (definition.github) {
-                    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()
-                            if (viewUrl) {
-                                ret += [ viewUrl: viewUrl ]
-                            }
-                            def reportUrl = tracker.getReportUrl()
-                            if (reportUrl) {
-                                ret += [ reportUrl: reportUrl ]
+                    ArrayList<String> names = new ArrayList(Arrays.asList(definition.getExtraNames()))
+                    names.add(definition.name)
+                    for (String name: names) {
+                        issueTrackersByPlugin.put(name, definition.issues.collect { tracker ->
+                            if (tracker.isJira() || tracker.isGitHubIssues()) {
+                                def ret = [type: tracker.getType(), reference: tracker.getReference()]
+                                def viewUrl = tracker.getViewUrl()
+                                if (viewUrl) {
+                                    ret += [viewUrl: viewUrl]
+                                }
+                                def reportUrl = tracker.getReportUrl()
+                                if (reportUrl) {
+                                    ret += [reportUrl: reportUrl]
+                                }
+                                return ret
                             }
-                            return ret
-                        }
-                        return null
-                    }.findAll { it != null })
+                            return null
+                        }.findAll { it != null })
+                    }
                 } else {
                     throw new Exception("Issue trackers ('issues') support requires GitHub repository ('github')")
                 }
             }
 
             String artifactId = definition.name
             for (String path : definition.paths) {
-                if (path.substring(path.lastIndexOf('/') + 1) != artifactId) {
+                String lastPathElement = path.substring(path.lastIndexOf('/') + 1)
+                if (lastPathElement != artifactId && !lastPathElement.contains("*")) {
                     // We could throw an exception here, but we actively abuse this for unusually structured components
-                    LOGGER.log(Level.WARNING, "Unexpected path: " + path + " for artifact ID: " + artifactId)
+                    if (lastPathElement.endsWith("-releaseblocker") || lastPathElement.endsWith("-releaseblock")) {
+                        LOGGER.log(Level.INFO, "Release blocked for artifact ID: " + artifactId)
+                    } else {
+                        LOGGER.log(Level.WARNING, "Unexpected path: " + path + " for artifact ID: " + artifactId)
+                    }
                 }
                 String groupId = path.substring(0, path.lastIndexOf('/')).replace('/', '.')
-
-                String key = groupId + ":" + artifactId
-
-                if (maintainersByComponent.containsKey(key)) {
-                    LOGGER.log(Level.WARNING, "Duplicate maintainers entry for component: " + key)
+                if (lastPathElement.contains("*")) {
+                    for (String name: definition.getExtraNames()) {
+                        addMaintainers(maintainersByComponent, groupId + ":" +  name, definition)
+                    }
+                } else {
+                    addMaintainers(maintainersByComponent, groupId + ":" +  artifactId, definition)
                 }
-                // A potential issue with this implementation is that groupId changes will result in lack of maintainer information for the old groupId.
-                // In practice this will probably not be a problem when path changes here and subsequent release are close enough in time.
-                // Alternatively, always keep the old groupId around for a while.
-                maintainersByComponent.computeIfAbsent(key, { _ -> new ArrayList<>(Arrays.asList(definition.developers)) })
             }
 
             String fileBaseName = file.name.replaceAll('\\.ya?ml$', '')
@@ -358,6 +364,16 @@ class ArtifactoryPermissionsUpdater {
         new File('checks-details.txt').text = details
     }
 
+    private static void addMaintainers(HashMap<String, List<String>> maintainersByComponent, String key, Definition definition) {
+        if (maintainersByComponent.containsKey(key)) {
+            LOGGER.log(Level.WARNING, "Duplicate maintainers entry for component: " + key)
+        }
+        // A potential issue with this implementation is that groupId changes will result in lack of maintainer information for the old groupId.
+        // In practice this will probably not be a problem when path changes here and subsequent release are close enough in time.
+        // Alternatively, always keep the old groupId around for a while.
+        maintainersByComponent.computeIfAbsent(key, { _ -> new ArrayList<>(Arrays.asList(definition.developers)) })
+    }
+
     /**
      * Takes a directory with Artifactory API payloads and submits them to the appropriate Artifactory API,
      * creating/updating the specified objects identified through the file name.

src/main/java/io/jenkins/infra/repository_permissions_updater/Definition.java

@@ -123,6 +123,7 @@ public String getType() {
     private String[] paths = new String[0];
     private String[] developers = new String[0];
     private IssueTracker[] issues = new IssueTracker[0];
+    private String[] extraNames = new String[0];
 
     private String github;
 
@@ -153,6 +154,14 @@ public void setPaths(String[] paths) {
         this.paths = paths.clone();
     }
 
+    public void setExtraNames(String[] extraNames) {
+        this.extraNames = extraNames.clone();
+    }
+
+    public String[] getExtraNames() {
+        return extraNames.clone();
+    }
+
     public IssueTracker[] getIssues() {
         return issues.clone();
     }