Merge branch 'main' into cleanup

Author: dhasani23

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanManager.kt

@@ -475,7 +475,8 @@ class CodeWhispererCodeScanManager(val project: Project) {
                             codeScanStatus,
                             codeScanResponseContext.payloadContext.srcPayloadSize.toDouble() ?: 0.0,
                             connection,
-                            scope
+                            scope,
+                            initiatedByChat
                         )
                     )
                     sendCodeScanTelemetryToServiceAPI(project, language, codeScanResponseContext, scope)

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/model/CodeWhispererModel.kt

@@ -254,6 +254,7 @@ data class CodeScanTelemetryEvent(
     val totalProjectSizeInBytes: Double?,
     val connection: ToolkitConnection?,
     val codeAnalysisScope: CodeWhispererConstants.CodeAnalysisScope,
+    val initiatedByChat: Boolean = false,
 )
 
 data class CreateUploadUrlServiceInvocationContext(

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererTelemetryService.kt

@@ -283,6 +283,18 @@ class CodeWhispererTelemetryService {
         )
     }
 
+    private fun mapToTelemetryScope(codeAnalysisScope: CodeWhispererConstants.CodeAnalysisScope, initiatedByChat: Boolean): CodewhispererCodeScanScope =
+        when (codeAnalysisScope) {
+            CodeWhispererConstants.CodeAnalysisScope.FILE -> {
+                if (initiatedByChat) {
+                    CodewhispererCodeScanScope.FILEONDEMAND
+                } else {
+                    CodewhispererCodeScanScope.FILEAUTO
+                }
+            }
+            CodeWhispererConstants.CodeAnalysisScope.PROJECT -> CodewhispererCodeScanScope.PROJECT
+        }
+
     fun sendSecurityScanEvent(codeScanEvent: CodeScanTelemetryEvent, project: Project? = null) {
         val payloadContext = codeScanEvent.codeScanResponseContext.payloadContext
         val serviceInvocationContext = codeScanEvent.codeScanResponseContext.serviceInvocationContext
@@ -291,8 +303,9 @@ class CodeWhispererTelemetryService {
         val issuesWithFixes = codeScanEvent.codeScanResponseContext.codeScanIssuesWithFixes
         val reason = codeScanEvent.codeScanResponseContext.reason
         val startUrl = getConnectionStartUrl(codeScanEvent.connection)
-        val codeAnalysisScope = codeScanEvent.codeAnalysisScope
-        val passive = codeAnalysisScope == CodeWhispererConstants.CodeAnalysisScope.FILE
+        val codeAnalysisScope = mapToTelemetryScope(codeScanEvent.codeAnalysisScope, codeScanEvent.initiatedByChat)
+        val passive = codeAnalysisScope == CodewhispererCodeScanScope.FILEAUTO
+        val source = if (codeScanEvent.initiatedByChat) "chat" else "menu"
 
         LOG.debug {
             "Recording code security scan event. \n" +
@@ -309,8 +322,9 @@ class CodeWhispererTelemetryService {
                 "Service invocation duration in milliseconds: ${serviceInvocationContext.serviceInvocationDuration}, \n" +
                 "Total number of lines scanned: ${payloadContext.totalLines}, \n" +
                 "Reason: $reason \n" +
-                "Scope: ${codeAnalysisScope.value} \n" +
-                "Passive: $passive \n"
+                "Scope: $codeAnalysisScope \n" +
+                "Passive: $passive \n" +
+                "Source: $source \n"
         }
         CodewhispererTelemetry.securityScan(
             project = project,
@@ -330,8 +344,9 @@ class CodeWhispererTelemetryService {
             reason = reason,
             result = codeScanEvent.result,
             credentialStartUrl = startUrl,
-            codewhispererCodeScanScope = CodewhispererCodeScanScope.from(codeAnalysisScope.value),
-            passive = passive
+            codewhispererCodeScanScope = codeAnalysisScope,
+            passive = passive,
+            source = source
         )
     }
 

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/RulesEngine.kt

@@ -56,6 +56,7 @@ object RulesEngine {
         if (notificationExtension.isNullOrEmpty()) return true
         val extensionsToBeChecked = notificationExtension.map { it.id }
         val pluginVersions = actualPluginVersions.filterKeys { extensionsToBeChecked.contains(it) }
+        if (pluginVersions.isEmpty()) return false
         return notificationExtension.all { extension ->
             val actualVersion = pluginVersions[extension.id]
             if (actualVersion == null) {

plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtilsTest.kt

@@ -36,6 +36,7 @@ class NotificationFormatUtilsTest {
     val projectRule = ProjectRule()
 
     private lateinit var mockSystemDetails: SystemDetails
+    private lateinit var mockSystemDetailsWithNoPlugin: SystemDetails
     private lateinit var exampleNotification: InputStream
 
     @BeforeEach
@@ -53,6 +54,18 @@ class NotificationFormatUtilsTest {
             )
         )
 
+        mockSystemDetailsWithNoPlugin = SystemDetails(
+            computeType = "Local",
+            computeArchitecture = "x86_64",
+            osType = "Linux",
+            osVersion = "5.4.0",
+            ideType = "IC",
+            ideVersion = "2023.1",
+            pluginVersions = mapOf(
+                "aws.toolkit" to "1.0",
+            )
+        )
+
         exampleNotification = javaClass.getResource("/exampleNotification2.json")?.let {
             Paths.get(it.toURI()).takeIf { f -> f.exists() }
         }?.inputStream() ?: throw RuntimeException("Test not found")
@@ -98,6 +111,13 @@ class NotificationFormatUtilsTest {
         }
     }
 
+    @Test
+    fun `If plugin is not present, notification is not shown`() {
+        every { getCurrentSystemAndConnectionDetails() } returns mockSystemDetailsWithNoPlugin
+        val shouldShow = RulesEngine.displayNotification(projectRule.project, pluginNotPresentData)
+        assertThat(shouldShow).isFalse
+    }
+
     @ParameterizedTest
     @MethodSource("validNotifications")
     fun `The notification is shown`(notification: String, expectedData: NotificationData) {

plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtilsTestCases.kt

@@ -360,3 +360,29 @@ val invalidIdeTypeAndVersionData = NotificationData(
         )
     )
 )
+
+val pluginNotPresentData = NotificationData(
+    id = "example_id_12344",
+    schedule = NotificationSchedule(type = "StartUp"),
+    severity = "Critical",
+    condition = NotificationDisplayCondition(
+        compute = null,
+        os = null,
+        ide = null,
+        extension = mutableListOf(
+            ExtensionType(
+                "amazon.q",
+                version = NotificationExpression.NotEqualsCondition("1.3334")
+            )
+        ),
+        authx = null
+
+    ),
+    actions = emptyList(),
+    content = NotificationContentDescriptionLocale(
+        NotificationContentDescription(
+            title = "Look at this!",
+            description = "Some bug is there"
+        )
+    )
+)