Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(amazonq): generate scanName from workspace config #5409

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+31 −2
Open

feat(amazonq): generate scanName from workspace config #5409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
647227a
feat(amazonq): generate scanName from workspace config
ctlai95 Feb 26, 2025
a8862a9
multi-module support
ctlai95 Feb 26, 2025
c693fa4
Merge branch 'main' into scan-name
ctlai95 Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion ...re/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanSession.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,21 @@ import com.fasterxml.jackson.databind.DeserializationFeature
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.fasterxml.jackson.module.kotlin.readValue
import com.intellij.openapi.application.ApplicationInfo
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.application.runInEdt
import com.intellij.openapi.application.runReadAction
import com.intellij.openapi.fileEditor.FileDocumentManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.project.modules
import com.intellij.openapi.roots.ModuleRootManager
import com.intellij.openapi.vfs.LocalFileSystem
import kotlinx.coroutines.delay
import kotlinx.coroutines.ensureActive
import kotlinx.coroutines.isActive
import kotlinx.coroutines.time.withTimeout
import kotlinx.coroutines.withContext
import migration.software.aws.toolkits.jetbrains.settings.AwsSettings
import org.apache.commons.codec.digest.DigestUtils
import software.amazon.awssdk.services.codewhisperer.model.ArtifactType
import software.amazon.awssdk.services.codewhisperer.model.CodeScanFindingsSchema
import software.amazon.awssdk.services.codewhisperer.model.CodeScanStatus
Expand All @@ -33,12 +38,14 @@ import software.aws.toolkits.core.utils.Waiters.waitUntil
import software.aws.toolkits.core.utils.debug
import software.aws.toolkits.core.utils.getLogger
import software.aws.toolkits.core.utils.info
import software.aws.toolkits.core.utils.toHexString
import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.sessionconfig.CodeScanSessionConfig
import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.sessionconfig.PayloadContext
import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
import software.aws.toolkits.jetbrains.services.codewhisperer.model.CodeScanResponseContext
import software.aws.toolkits.jetbrains.services.codewhisperer.model.CreateUploadUrlServiceInvocationContext
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererTelemetryService
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.CODE_SCAN_POLLING_INTERVAL_IN_SECONDS
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.FILE_SCANS_THROTTLING_MESSAGE
Expand All @@ -52,12 +59,14 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhisperer
import software.aws.toolkits.jetbrains.services.codewhisperer.util.getTelemetryErrorMessage
import software.aws.toolkits.jetbrains.utils.assertIsNonDispatchThread
import software.aws.toolkits.resources.message
import software.aws.toolkits.telemetry.CodewhispererCodeScanScope
import software.aws.toolkits.telemetry.CodewhispererLanguage
import java.nio.file.Path
import java.time.Duration
import java.time.Instant
import java.util.UUID
import kotlin.coroutines.coroutineContext
import kotlin.io.path.pathString

class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
private val clientToken: UUID = UUID.randomUUID()
Expand Down Expand Up @@ -103,7 +112,7 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
// 2 & 3. CreateUploadURL and upload the context.
currentCoroutineContext.ensureActive()
val artifactsUploadStartTime = now()
val codeScanName = UUID.randomUUID().toString()
val codeScanName = generateScanName()

val taskType = if (sessionContext.codeAnalysisScope == CodeWhispererConstants.CodeAnalysisScope.PROJECT) {
CodeWhispererConstants.UploadTaskType.SCAN_PROJECT
Expand Down Expand Up @@ -366,6 +375,26 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
private fun isAutoScan(): Boolean =
sessionContext.codeAnalysisScope == CodeWhispererConstants.CodeAnalysisScope.FILE && !sessionContext.sessionConfig.isInitiatedByChat()

private fun generateScanName(): String {
val clientId = AwsSettings.getInstance().clientId
val filePath = sessionContext.sessionConfig.getSelectedFile()?.toNioPath()?.pathString
val scope = CodeWhispererTelemetryService.getInstance().mapToTelemetryScope(
sessionContext.codeAnalysisScope,
sessionContext.sessionConfig.isInitiatedByChat()
)
val projectId = if (scope != CodewhispererCodeScanScope.PROJECT && filePath != null) {
filePath
} else {
ApplicationManager.getApplication().runReadAction<String> {
sessionContext.project.modules.map { module ->
ModuleRootManager.getInstance(module).contentRoots.firstOrNull()?.path
}.joinToString(",")
}
}

return DigestUtils.sha256("$clientId::$projectId::$scope").toHexString()
}

companion object {
private val LOG = getLogger<CodeWhispererCodeScanSession>()
private val MAPPER = jacksonObjectMapper()
Expand Down
2 changes: 1 addition & 1 deletion .../aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererTelemetryService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ class CodeWhispererTelemetryService {
)
}

private fun mapToTelemetryScope(codeAnalysisScope: CodeWhispererConstants.CodeAnalysisScope, initiatedByChat: Boolean): CodewhispererCodeScanScope =
fun mapToTelemetryScope(codeAnalysisScope: CodeWhispererConstants.CodeAnalysisScope, initiatedByChat: Boolean): CodewhispererCodeScanScope =
when (codeAnalysisScope) {
CodeWhispererConstants.CodeAnalysisScope.FILE -> {
if (initiatedByChat) {
Expand Down
Loading