s

garethahealy · Jan 5, 2024 · 17402f0 · 17402f0
1 parent 5863c60
commit 17402f0
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 17 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -93,21 +93,21 @@ jobs:
       - name: Make github-stats-*-runner executable
         run: chmod +x github-stats-*-runner
 
-      - name: Run collect-stats for myself
+      - name: Run collect-stats for UKI
         env:
           GITHUB_LOGIN: ${{ github.repository_owner }}
-          GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}
-        run: ./github-stats-*-runner collect-stats --organization=garethahealy
-
-      - name: Run collect-stats for myself
-        env:
-          GITHUB_LOGIN: ${{ github.repository_owner }}
-          GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}
-        run: echo "todo" #./github-stats-*-runner create-who-are-you-issues --dry-run=true --organization=garethahealy --issue-repo=github-stats --members-csv=tests/members.csv --fail-if-no-vpn=false
+          GITHUB_OAUTH: ${{ secrets.RHUKI_READ_PAT }}
+        run: ./github-stats-*-runner collect-stats --organization=RedHat-Consulting-UK
 
       - name: Upload github-output.csv
         uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4
         with:
           name: github-output.csv
           path: github-output.csv
           if-no-files-found: error
+
+      - name: Run create-who-are-you-issues for UKI
+        env:
+          GITHUB_LOGIN: ${{ github.repository_owner }}
+          GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}
+        run: ./github-stats-*-runner create-who-are-you-issues --dry-run=true --organization=RedHat-Consulting-UK --issue-repo=helm3 --members-csv=tests/members.csv --fail-if-no-vpn=false
diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,6 @@
     <skipITs>true</skipITs>
     <surefire-plugin.version>3.2.3</surefire-plugin.version>
   </properties>
-
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -28,7 +27,6 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-
   <dependencies>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -52,11 +50,16 @@
       <groupId>org.apache.directory.api</groupId>
       <artifactId>api-all</artifactId>
       <version>2.1.5</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.github.ben-manes.caffeine</groupId>
+          <artifactId>caffeine</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
-      <scope>test</scope>
+      <artifactId>quarkus-caffeine</artifactId>
     </dependency>
   </dependencies>
   <build>
@@ -127,6 +130,9 @@
       <properties>
         <skipITs>false</skipITs>
         <quarkus.package.type>native</quarkus.package.type>
+        <quarkus.native.additional-build-args>
+          -H:+UnlockExperimentalVMOptions,-H:ReflectionConfigurationFiles=reflection-config.json,-H:-UnlockExperimentalVMOptions
+        </quarkus.native.additional-build-args>
       </properties>
     </profile>
   </profiles>

diff --git a/src/main/java/com/garethahealy/githubstats/ReflectionConfiguration.java b/src/main/java/com/garethahealy/githubstats/ReflectionConfiguration.java
@@ -0,0 +1,9 @@
+package com.garethahealy.githubstats;
+
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import org.apache.directory.api.ldap.codec.standalone.StandaloneLdapApiService;
+import org.apache.mina.transport.socket.nio.NioProcessor;
+
+@RegisterForReflection(targets = {StandaloneLdapApiService.class, NioProcessor.class})
+public class ReflectionConfiguration {
+}
diff --git a/src/main/java/com/garethahealy/githubstats/model/MembersInfo.java b/src/main/java/com/garethahealy/githubstats/model/MembersInfo.java
@@ -0,0 +1,9 @@
+package com.garethahealy.githubstats.model;
+
+public class MembersInfo {
+    public enum Headers {
+        Timestamp,
+        EmailAddress,
+        WhatIsYourGitHubUsername
+    }
+}
diff --git a/src/main/java/com/garethahealy/githubstats/rest/client/CreateWhoAreYouIssueService.java b/src/main/java/com/garethahealy/githubstats/rest/client/CreateWhoAreYouIssueService.java
@@ -1,5 +1,7 @@
 package com.garethahealy.githubstats.rest.client;
 
+import com.garethahealy.githubstats.model.MembersInfo;
+import com.garethahealy.githubstats.model.RepoInfo;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import org.apache.commons.csv.CSVFormat;
@@ -84,6 +86,7 @@ public void run(String organization, String issueRepo, boolean isDryRun, String
                     boolean found = false;
                     for (Entry entry : cursor) {
                         entry.getDn();
+                        logger.infof("Found %s in ldap", uid);
                         found = true;
                     }
 
@@ -105,11 +108,15 @@ public void run(String organization, String issueRepo, boolean isDryRun, String
 
     private Set<String> getUsernamesToIgnore(String membersCsv) throws IOException {
         Set<String> answer = new HashSet<>();
-        CSVFormat csvFormat = CSVFormat.Builder.create(CSVFormat.DEFAULT).setSkipHeaderRecord(true).build();
+        CSVFormat csvFormat = CSVFormat.Builder.create(CSVFormat.DEFAULT)
+                .setHeader(MembersInfo.Headers.class)
+                .setSkipHeaderRecord(true)
+                .build();
+
         try (Reader in = new FileReader(membersCsv)) {
             Iterable<CSVRecord> records = csvFormat.parse(in);
             for (CSVRecord record : records) {
-                answer.add(record.get("What is your GitHub username?"));
+                answer.add(record.get(MembersInfo.Headers.WhatIsYourGitHubUsername));
             }
         }
 
@@ -118,11 +125,15 @@ private Set<String> getUsernamesToIgnore(String membersCsv) throws IOException {
 
     private List<String> getCollectedEmails(String membersCsv) throws IOException {
         List<String> answer = new ArrayList<>();
-        CSVFormat csvFormat = CSVFormat.Builder.create(CSVFormat.DEFAULT).setSkipHeaderRecord(true).build();
+        CSVFormat csvFormat = CSVFormat.Builder.create(CSVFormat.DEFAULT)
+                .setHeader(MembersInfo.Headers.class)
+                .setSkipHeaderRecord(true)
+                .build();
+
         try (Reader in = new FileReader(membersCsv)) {
             Iterable<CSVRecord> records = csvFormat.parse(in);
             for (CSVRecord record : records) {
-                answer.add(record.get("Email Address"));
+                answer.add(record.get(MembersInfo.Headers.EmailAddress));
             }
         }
 

diff --git a/src/main/resources/reflection-config.json b/src/main/resources/reflection-config.json
@@ -0,0 +1,11 @@
+[
+  {
+    "name" : "com.github.benmanes.caffeine.cache.PSAMS",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "allDeclaredFields" : true,
+    "allPublicFields" : true
+  }
+]