Merge branch 'main' into feature/cid-3370-send-org-in-new-installation

Author: henriq-amaral-leanix

src/main/kotlin/net/leanix/githubagent/config/AgentSetupValidation.kt

@@ -1,16 +1,19 @@
 package net.leanix.githubagent.config
 
-import jakarta.annotation.PostConstruct
 import net.leanix.githubagent.exceptions.GitHubEnterpriseConfigurationMissingException
+import org.springframework.context.event.ContextRefreshedEvent
+import org.springframework.context.event.EventListener
 import org.springframework.stereotype.Component
 
 @Component
 class AgentSetupValidation(
-    private val gitHubEnterpriseProperties: GitHubEnterpriseProperties
+    private val gitHubEnterpriseProperties: GitHubEnterpriseProperties,
+    private val leanIXProperties: LeanIXProperties
 ) {
 
-    @PostConstruct
-    fun validateConfiguration() {
+    @EventListener
+    @SuppressWarnings("UnusedParameter")
+    fun onApplicationEvent(event: ContextRefreshedEvent) {
         val missingProperties = mutableListOf<String>()
 
         if (gitHubEnterpriseProperties.baseUrl.isBlank()) {
@@ -23,6 +26,14 @@ class AgentSetupValidation(
             missingProperties.add("GITHUB_ENTERPRISE_PEM_FILE")
         }
 
+        if (leanIXProperties.wsBaseUrl.isBlank()) {
+            missingProperties.add("LEANIX_WS_BASE_URL")
+        }
+
+        if (leanIXProperties.auth.accessTokenUri.isBlank()) {
+            missingProperties.add("LEANIX_AUTH_ACCESS_TOKEN_URI")
+        }
+
         if (missingProperties.isNotEmpty()) {
             throw GitHubEnterpriseConfigurationMissingException(missingProperties.joinToString(", "))
         }

src/main/kotlin/net/leanix/githubagent/dto/PushEventPayload.kt

@@ -9,7 +9,7 @@ data class PushEventPayload(
     val repository: PushEventRepository,
     val installation: PushEventInstallation,
     @JsonProperty("head_commit")
-    val headCommit: PushEventCommit
+    val headCommit: PushEventCommit?
 )
 
 @JsonIgnoreProperties(ignoreUnknown = true)

src/main/kotlin/net/leanix/githubagent/services/GitHubEnterpriseService.kt

@@ -12,7 +12,7 @@ class GitHubEnterpriseService(private val githubClient: GitHubClient) {
 
     companion object {
         val expectedPermissions = listOf("administration", "contents", "metadata")
-        val expectedEvents = listOf("label", "public", "repository")
+        val expectedEvents = listOf("label", "public", "repository", "push", "installation")
     }
     private val logger = LoggerFactory.getLogger(GitHubEnterpriseService::class.java)
 

src/main/kotlin/net/leanix/githubagent/services/WebhookEventService.kt

@@ -51,7 +51,7 @@ class WebhookEventService(
 
         val installationToken = getInstallationToken(pushEventPayload.installation.id)
 
-        if (pushEventPayload.ref == "refs/heads/$defaultBranch") {
+        if (headCommit != null && pushEventPayload.ref == "refs/heads/$defaultBranch") {
             handleManifestFileChanges(
                 defaultBranch,
                 headCommit,

src/test/kotlin/net/leanix/githubagent/services/GitHubEnterpriseServiceTest.kt

@@ -21,7 +21,7 @@ class GitHubEnterpriseServiceTest {
         val githubApp = GitHubAppResponse(
             slug = "validApp",
             permissions = mapOf("administration" to "read", "contents" to "read", "metadata" to "read"),
-            events = listOf("label", "public", "repository")
+            events = listOf("label", "public", "repository", "push", "installation")
         )
         every { githubClient.getApp(any()) } returns githubApp
 
@@ -41,7 +41,7 @@ class GitHubEnterpriseServiceTest {
         val response = GitHubAppResponse(
             slug = "validApp",
             permissions = mapOf("administration" to "read", "contents" to "read", "metadata" to "read"),
-            events = listOf("label", "public", "repository")
+            events = listOf("label", "public", "repository", "push", "installation")
         )
 
         assertDoesNotThrow { service.validateGithubAppResponse(response) }

src/test/kotlin/net/leanix/githubagent/services/WebhookEventServiceTest.kt

@@ -345,6 +345,26 @@ class WebhookEventServiceTest {
         verify(exactly = 6) { cachingService.get("runId") }
     }
 
+    @Test
+    fun `should ignore push events without a head commit`() {
+        val payload = """{
+            "repository": {
+                "name": "repo",
+                "full_name": "owner/repo",
+                "owner": {"name": "owner"},
+                "default_branch": "main"
+            },
+            "installation": {"id": 1},
+            "ref": "refs/heads/main"
+        }"""
+
+        webhookEventService.consumeWebhookEvent("PUSH", payload)
+
+        verify(exactly = 0) {
+            webSocketService.sendMessage(any(), any())
+        }
+    }
+
     @Test
     fun `should send the org to the backend when an new installation is created`() {
         val runId = UUID.randomUUID()