feat: Enabled /dev and /transform with builderId auth (#4214)

Author: kumsmrit

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/auth/AuthController.kt

@@ -28,10 +28,10 @@ class AuthController {
         val connectionState = checkBearerConnectionValidity(project, BearerTokenFeatureSet.Q)
         val codeWhispererState = checkBearerConnectionValidity(project, BearerTokenFeatureSet.CODEWHISPERER)
 
-        // CW chat is enabled for Builder and IDC users, Amazon Q is only valid for IDC users
+        // CW chat is enabled for Builder and IDC users, same for Amazon Q
         return AuthNeededStates(
             chat = getAuthNeededState(connectionState, codeWhispererState),
-            amazonQ = getAuthNeededState(connectionState, codeWhispererState, true)
+            amazonQ = getAuthNeededState(connectionState, codeWhispererState)
         )
     }
 

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/auth/FeatureDevAuthUtils.kt

@@ -11,5 +11,6 @@ import software.aws.toolkits.jetbrains.core.gettingstarted.editor.checkBearerCon
 
 fun isFeatureDevAvailable(project: Project): Boolean {
     val connection = checkBearerConnectionValidity(project, BearerTokenFeatureSet.Q)
-    return connection.connectionType == ActiveConnectionType.IAM_IDC && connection is ActiveConnection.ValidBearer
+    return (connection.connectionType == ActiveConnectionType.IAM_IDC || connection.connectionType == ActiveConnectionType.BUILDER_ID) &&
+        connection is ActiveConnection.ValidBearer
 }

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/toolwindow/CodeModernizerBottomToolWindowFactory.kt

@@ -9,11 +9,8 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.wm.ToolWindow
 import com.intellij.openapi.wm.ToolWindowFactory
 import com.intellij.ui.components.JBScrollPane
-import software.aws.toolkits.jetbrains.services.amazonq.isQSupportedInThisVersion
 import software.aws.toolkits.jetbrains.services.codemodernizer.panels.managers.CodeModernizerBottomWindowPanelManager
-import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isCodeWhispererEnabled
-import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isCodeWhispererExpired
-import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
+import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTransformAvailable
 import software.aws.toolkits.resources.message
 
 class CodeModernizerBottomToolWindowFactory : ToolWindowFactory, DumbAware {
@@ -35,7 +32,7 @@ class CodeModernizerBottomToolWindowFactory : ToolWindowFactory, DumbAware {
         toolWindow.stripeTitle = message("codemodernizer.toolwindow.label_no_job")
     }
     override fun shouldBeAvailable(project: Project): Boolean =
-        isCodeWhispererEnabled(project) && !isCodeWhispererExpired(project) && !isRunningOnRemoteBackend() && isQSupportedInThisVersion()
+        isCodeTransformAvailable(project)
 
     companion object {
         const val id = "aws.codewhisperer.codetransform"

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformSharedUtils.kt

@@ -9,6 +9,8 @@ import software.aws.toolkits.jetbrains.core.gettingstarted.editor.ActiveConnecti
 import software.aws.toolkits.jetbrains.core.gettingstarted.editor.ActiveConnectionType
 import software.aws.toolkits.jetbrains.core.gettingstarted.editor.BearerTokenFeatureSet
 import software.aws.toolkits.jetbrains.core.gettingstarted.editor.checkBearerConnectionValidity
+import software.aws.toolkits.jetbrains.services.amazonq.isQSupportedInThisVersion
+import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 import java.time.Instant
 
 fun calculateTotalLatency(startTime: Instant, endTime: Instant) = (endTime.toEpochMilli() - startTime.toEpochMilli()).toInt()
@@ -20,6 +22,8 @@ fun isIntellij(): Boolean {
 
 fun isCodeTransformAvailable(project: Project): Boolean {
     if (!isIntellij()) return false
+    if (isRunningOnRemoteBackend() || !isQSupportedInThisVersion()) return false
     val connection = checkBearerConnectionValidity(project, BearerTokenFeatureSet.Q)
-    return connection.connectionType == ActiveConnectionType.IAM_IDC && connection is ActiveConnection.ValidBearer
+    return (connection.connectionType == ActiveConnectionType.IAM_IDC || connection.connectionType == ActiveConnectionType.BUILDER_ID) &&
+        connection is ActiveConnection.ValidBearer
 }

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/pinning/QConnection.kt

@@ -6,18 +6,13 @@ package software.aws.toolkits.jetbrains.core.credentials.pinning
 import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnection
 import software.aws.toolkits.jetbrains.core.credentials.sono.Q_SCOPES
-import software.aws.toolkits.jetbrains.core.credentials.sono.Q_SCOPES_UNAVAILABLE_BUILDER_ID
-import software.aws.toolkits.jetbrains.core.credentials.sono.isSono
 
 class QConnection : FeatureWithPinnedConnection {
     override val featureId = "aws.q"
     override val featureName = "Amazon Q"
 
     override fun supportsConnectionType(connection: ToolkitConnection): Boolean {
         if (connection is AwsBearerTokenConnection) {
-            if (connection.isSono()) {
-                return (Q_SCOPES - Q_SCOPES_UNAVAILABLE_BUILDER_ID).all { it in connection.scopes }
-            }
             return Q_SCOPES.all { it in connection.scopes }
         }
 

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/SetupAuthenticationDialog.kt

@@ -42,7 +42,6 @@ import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.UserConfigSsoSessionProfile
 import software.aws.toolkits.jetbrains.core.credentials.loginSso
 import software.aws.toolkits.jetbrains.core.credentials.sono.IDENTITY_CENTER_ROLE_ACCESS_SCOPE
-import software.aws.toolkits.jetbrains.core.credentials.sono.Q_SCOPES_UNAVAILABLE_BUILDER_ID
 import software.aws.toolkits.jetbrains.core.credentials.sono.SONO_REGION
 import software.aws.toolkits.jetbrains.core.credentials.sono.SONO_URL
 import software.aws.toolkits.jetbrains.core.gettingstarted.editor.getSourceOfEntry
@@ -344,8 +343,7 @@ class SetupAuthenticationDialog(
 
             SetupAuthenticationTabs.BUILDER_ID -> {
                 authType = CredentialSourceId.AwsId
-                val newScopes = if (featureId == FeatureId.Q || featureId == FeatureId.Codewhisperer) scopes - Q_SCOPES_UNAVAILABLE_BUILDER_ID else scopes
-                loginSso(project, SONO_URL, SONO_REGION, newScopes)
+                loginSso(project, SONO_URL, SONO_REGION, scopes)
             }
 
             SetupAuthenticationTabs.IAM_LONG_LIVED -> {

plugins/toolkit/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

@@ -647,7 +647,7 @@ codemodernizer.notification.info.view_troubleshooting_guide=View troubleshooting
 codemodernizer.notification.warn.invalid_project.description.reason.invalid_jdk_versions=We could not find an upgrade eligible application.
 codemodernizer.notification.warn.invalid_project.description.reason.missing_content_roots=We could not find an upgrade eligible application. We currently support upgrade of Maven Java applications of version 8 and 11.
 codemodernizer.notification.warn.invalid_project.description.reason.no_valid_files=We could not find a valid configuration file for the project. We currently support Maven build tool and require a POM.xml to identify build configurations.
-codemodernizer.notification.warn.invalid_project.description.reason.not_logged_in=We can not start the transform as you are not logged in with sso, please log in to CodeWhisperer using SSO.
+codemodernizer.notification.warn.invalid_project.description.reason.not_logged_in=We cannot start the transformation as you are not logged in with Identity Center or Builder ID. Also ensure that you are not using IntelliJ version 232.8660.185 and that you are not developing on a remote host (uncommon).
 codemodernizer.notification.warn.invalid_project.description.reason.remote_backend=We do not support transforming projects running on a remote backend.
 codemodernizer.notification.warn.invalid_project.description.reason.unknown=We could not find an upgrade eligible application. We currently support upgrade of Java applications of version 8 and 11.
 codemodernizer.notification.warn.maven_failed.content=We were unable to build and package your project and its dependencies. Please fix the issues shown in the opened build window and try again.