🐛 avoid NPE for missing rule config

commonhaus · Jul 16, 2024 · 23bf63d · 23bf63d
1 parent cc97dad
commit 23bf63d
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/commonhaus-bot/src/main/java/org/commonhaus/automation/github/notice/Notice.java b/commonhaus-bot/src/main/java/org/commonhaus/automation/github/notice/Notice.java
@@ -13,6 +13,7 @@
 import org.commonhaus.automation.github.actions.Action;
 import org.commonhaus.automation.github.context.EventData;
 import org.commonhaus.automation.github.rules.Rule;
+import org.commonhaus.automation.github.rules.RuleConfig;
 import org.kohsuke.github.GHEventPayload;
 import org.kohsuke.github.GitHub;
 
@@ -43,13 +44,15 @@ void onDiscussionEvent(GitHubEvent event, GitHub github, DynamicGraphQLClient gr
 
         NoticeConfig noticeConfig = NoticeConfig.getNoticeConfig(repoConfigFile);
         queryHelper.updateConfiguration(payload.getRepository(), repoConfigFile);
-        if (noticeConfig.isDisabled()) {
+
+        RuleConfig ruleConfig = noticeConfig.discussion;
+        if (noticeConfig.isDisabled() || ruleConfig == null) {
             return;
         }
 
         EventData eventData = new EventData(event, payload);
         EventQueryContext qc = queryHelper.newQueryContext(eventData, github, graphQLClient);
-        Set<String> desiredActions = findMatchingActions(qc, noticeConfig.discussion.rules);
+        Set<String> desiredActions = findMatchingActions(qc, ruleConfig.rules);
 
         Log.infof("[%s] notice.onDiscussionEvent: triggered (%s) actions: %s", eventData.getLogId(),
                 desiredActions.size(), desiredActions);
@@ -71,14 +74,16 @@ void onIssueEvent(GitHubEvent event, GitHub github, DynamicGraphQLClient graphQL
 
         NoticeConfig noticeConfig = NoticeConfig.getNoticeConfig(repoConfigFile);
         queryHelper.updateConfiguration(payload.getRepository(), repoConfigFile);
-        if (noticeConfig.isDisabled()) {
+
+        RuleConfig ruleConfig = noticeConfig.issue;
+        if (noticeConfig.isDisabled() || ruleConfig == null) {
             return;
         }
 
         EventData eventData = new EventData(event, payload);
         EventQueryContext qc = queryHelper.newQueryContext(eventData, github, graphQLClient);
 
-        Set<String> desiredActions = findMatchingActions(qc, noticeConfig.issue.rules);
+        Set<String> desiredActions = findMatchingActions(qc, ruleConfig.rules);
         Log.infof("[%s] notice.onIssueEvent: triggered (%s) actions: %s", eventData.getLogId(),
                 desiredActions.size(), desiredActions);
 
@@ -99,14 +104,16 @@ void onPullRequestEvent(GitHubEvent event, GitHub github, DynamicGraphQLClient g
 
         NoticeConfig noticeConfig = NoticeConfig.getNoticeConfig(repoConfigFile);
         queryHelper.updateConfiguration(payload.getRepository(), repoConfigFile);
-        if (noticeConfig.isDisabled()) {
+
+        RuleConfig ruleConfig = noticeConfig.pullRequest;
+        if (noticeConfig.isDisabled() || ruleConfig == null) {
             return;
         }
 
         EventData eventData = new EventData(event, payload);
         EventQueryContext qc = queryHelper.newQueryContext(eventData, github, graphQLClient);
 
-        Set<String> desiredActions = findMatchingActions(qc, noticeConfig.pullRequest.rules);
+        Set<String> desiredActions = findMatchingActions(qc, ruleConfig.rules);
         Log.infof("[%s] notice.onPullRequestEvent: triggered (%s) actions: %s", eventData.getLogId(),
                 desiredActions.size(), desiredActions);