Revert "feat(amazonq): expose 'Manage Subscriptions' action for builder id paid tier (#5777)"

This reverts commit 2e70fc3.

Author: rli

plugins/amazonq/codewhisperer/jetbrains-community/resources/META-INF/plugin-codewhisperer.xml

@@ -139,7 +139,5 @@
                 class="software.aws.toolkits.jetbrains.services.cwc.commands.codescan.actions.CodeScanCompleteAction" />
         </group>
 
-        <action id="q.manage.subscription"
-                class="software.aws.toolkits.jetbrains.services.codewhisperer.actions.ManageSubscription"/>
     </actions>
 </idea-plugin>

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/explorer/QStatusBarLoggedInActionGroup.kt

@@ -12,12 +12,15 @@ import com.intellij.openapi.project.Project
 import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.actions.SsoLogoutAction
+import software.aws.toolkits.jetbrains.core.credentials.pinning.CodeWhispererConnection
 import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
 import software.aws.toolkits.jetbrains.core.credentials.sono.isSono
+import software.aws.toolkits.jetbrains.services.amazonq.actions.QSwitchProfilesAction
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager
 import software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererConnectOnGithubAction
 import software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererLearnMoreAction
 import software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererProvideFeedbackAction
+import software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererShowSettingsAction
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.actions.CodeWhispererCodeScanRunAction
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.actions.ActionProvider
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.actions.Customize
@@ -51,7 +54,6 @@ class QStatusBarLoggedInActionGroup : DefaultActionGroup() {
 
     override fun getChildren(e: AnActionEvent?) = e?.project?.let {
         val isPendingActiveProfile = QRegionProfileManager.getInstance().hasValidConnectionButNoActiveProfile(it)
-        val actionManager = ActionManager.getInstance()
         buildList {
             if (!isPendingActiveProfile) {
                 addAll(buildActionListForActiveProfileSelected(it, actionProvider))
@@ -62,18 +64,15 @@ class QStatusBarLoggedInActionGroup : DefaultActionGroup() {
             addAll(buildActionListForConnectHelp(actionProvider))
 
             add(Separator.create())
-            add(actionManager.getAction("codewhisperer.settings"))
-
-            val connection = ToolkitConnectionManager.getInstance(it).activeConnectionForFeature(QConnection.getInstance()) as? AwsBearerTokenConnection
-
-            if (connection != null) {
-                if (!connection.isSono()) {
-                    add(actionManager.getAction("codewhisperer.switchProfiles"))
-                } else {
-                    add(actionManager.getAction("q.manage.subscription"))
+            add(CodeWhispererShowSettingsAction())
+            (
+                ToolkitConnectionManager.getInstance(it).activeConnectionForFeature(QConnection.getInstance()) as? AwsBearerTokenConnection
+                )?.takeIf { !it.isSono() }
+                ?.let { add(QSwitchProfilesAction()) }
+            ToolkitConnectionManager.getInstance(it).activeConnectionForFeature(CodeWhispererConnection.getInstance())?.let { c ->
+                (c as? AwsBearerTokenConnection)?.let { connection ->
+                    add(SsoLogoutAction(connection))
                 }
-
-                add(SsoLogoutAction(connection))
             }
         }.toTypedArray()
     }.orEmpty()

plugins/amazonq/shared/jetbrains-community/resources/software/aws/toolkits/resources/AmazonQBundle.properties

@@ -9,7 +9,6 @@ amazonqInlineChat.popup.title=Enter Instructions for Q
 amazonq.refresh.panel=Refresh Chat Session
 amazonq.title=Amazon Q
 amazonq.workspace.settings.open.prompt=Workspace index is now enabled. You can disable it from Amazon Q settings.
-action.q.manage.subscription.text=Manage Subscription
 action.q.profile.usage.text=You changed your profile
 action.q.profile.usage=You''re using the ''<b>{0}</b>'' profile for Amazon Q.
 action.q.switchProfiles.text=Change Profile