Skip to content

Commit 35c295d

Browse files
rlirli
authored
Resolve 'message()' deprecation in plugin-core (#4810)
1 parent ca9fe95 commit 35c295d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+259
-231
lines changed

‎plugins/core/jetbrains-community/detekt-baseline-main.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<ID>UseOrEmpty:NotificationUtils.kt$&lt;no name provided>$title ?: ""</ID>
1515
<ID>UseOrEmpty:ProfileCredentialProviderFactory.kt$ProfileCredentialProviderFactory$e.message?.let { ": $it" } ?: ""</ID>
1616
<ID>UseOrEmpty:ToolkitCredentialProcessProvider.kt$ToolkitCredentialProcessProvider$errorOutput?.let { ": $it" } ?: ""</ID>
17-
<ID>UseRequire:ProfileUtils.kt$throw IllegalArgumentException(message("credentials.profile.assume_role.duplicate_source", currentProfileName))</ID>
18-
<ID>UseRequire:ProfileUtils.kt$throw IllegalArgumentException(message("credentials.profile.assume_role.missing_source", currentProfileName))</ID>
17+
<ID>UseRequire:ProfileUtils.kt$throw IllegalArgumentException(AwsCoreBundle.message("credentials.profile.assume_role.duplicate_source", currentProfileName))</ID>
18+
<ID>UseRequire:ProfileUtils.kt$throw IllegalArgumentException(AwsCoreBundle.message("credentials.profile.assume_role.missing_source", currentProfileName))</ID>
1919
</CurrentIssues>
2020
</SmellBaseline>

‎plugins/core/jetbrains-community/src/migration/software/aws/toolkits/jetbrains/core/credentials/CredentialManager.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import software.aws.toolkits.core.credentials.ToolkitCredentialsChangeListener
1818
import software.aws.toolkits.core.credentials.ToolkitCredentialsProvider
1919
import software.aws.toolkits.core.region.AwsRegion
2020
import software.aws.toolkits.jetbrains.utils.runUnderProgressIfNeeded
21-
import software.aws.toolkits.resources.message
21+
import software.aws.toolkits.resources.AwsCoreBundle
2222
import java.util.concurrent.ConcurrentHashMap
2323

2424
abstract class CredentialManager : SimpleModificationTracker() {
@@ -99,7 +99,7 @@ abstract class CredentialManager : SimpleModificationTracker() {
9999
* as loading from disk when new values.
100100
*/
101101
private inner class AwsCredentialProviderProxy(private val providerId: String, private val region: AwsRegion) : AwsCredentialsProvider {
102-
override fun resolveCredentials(): AwsCredentials = runUnderProgressIfNeeded(null, message("credentials.retrieving"), cancelable = true) {
102+
override fun resolveCredentials(): AwsCredentials = runUnderProgressIfNeeded(null, AwsCoreBundle.message("credentials.retrieving"), cancelable = true) {
103103
getOrCreateAwsCredentialsProvider(providerId, region).resolveCredentials()
104104
}
105105

‎plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/PluginVersionChecker.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import software.aws.toolkits.core.utils.tryOrNull
2020
import software.aws.toolkits.core.utils.warn
2121
import software.aws.toolkits.jetbrains.AwsToolkit.TOOLKIT_PLUGIN_ID
2222
import software.aws.toolkits.jetbrains.core.plugin.PluginUpdateManager
23-
import software.aws.toolkits.resources.message
23+
import software.aws.toolkits.resources.AwsCoreBundle
2424
import javax.swing.SwingUtilities
2525

2626
class PluginVersionChecker : ApplicationInitializedListener {
@@ -65,13 +65,13 @@ class PluginVersionChecker : ApplicationInitializedListener {
6565

6666
val notificationGroup = SingletonNotificationManager("aws.plugin.version.mismatch", NotificationType.WARNING)
6767
notificationGroup.notify(
68-
message("plugin.incompatible.title"),
69-
message("plugin.incompatible.message"),
68+
AwsCoreBundle.message("plugin.incompatible.title"),
69+
AwsCoreBundle.message("plugin.incompatible.message"),
7070
null
7171
) {
7272
it.isImportant = true
7373
it.addAction(
74-
NotificationAction.createSimpleExpiring(message("plugin.incompatible.fix")) {
74+
NotificationAction.createSimpleExpiring(AwsCoreBundle.message("plugin.incompatible.fix")) {
7575
// try update core and disable everything else
7676
val coreDescriptor = core.descriptor as? IdeaPluginDescriptor
7777
tryOrNull {

‎plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/AwsTelemetryPrompter.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import com.intellij.openapi.project.Project
1010
import com.intellij.openapi.startup.ProjectActivity
1111
import software.aws.toolkits.jetbrains.settings.AwsSettings
1212
import software.aws.toolkits.jetbrains.settings.AwsSettingsSharedConfigurable
13-
import software.aws.toolkits.resources.message
13+
import software.aws.toolkits.resources.AwsCoreBundle
1414

1515
class AwsTelemetryPrompter : ProjectActivity {
1616
override suspend fun execute(project: Project) {
@@ -20,8 +20,8 @@ class AwsTelemetryPrompter : ProjectActivity {
2020

2121
val notification = Notification(
2222
"aws.toolkit_telemetry",
23-
message("aws.settings.telemetry.prompt.title"),
24-
message("aws.settings.telemetry.prompt.message"),
23+
AwsCoreBundle.message("aws.settings.telemetry.prompt.title"),
24+
AwsCoreBundle.message("aws.settings.telemetry.prompt.message"),
2525
NotificationType.INFORMATION
2626
).also {
2727
it.setListener { notification, _ ->

‎plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/AwsConnectionManager.kt‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import software.aws.toolkits.jetbrains.core.region.AwsRegionProvider
2828
import software.aws.toolkits.jetbrains.services.sts.StsResources
2929
import software.aws.toolkits.jetbrains.utils.MRUList
3030
import software.aws.toolkits.jetbrains.utils.pluginAwareExecuteOnPooledThread
31-
import software.aws.toolkits.resources.message
31+
import software.aws.toolkits.resources.AwsCoreBundle
3232
import software.aws.toolkits.telemetry.AwsTelemetry
3333
import java.util.concurrent.atomic.AtomicReference
3434

@@ -188,7 +188,7 @@ abstract class AwsConnectionManager(private val project: Project) : SimpleModifi
188188

189189
promise.setResult(ConnectionState.ValidConnection(credentialsProvider, region))
190190
} catch (e: Exception) {
191-
LOGGER.warn(e) { message("credentials.profile.validation_error", credentialsIdentifier.displayName) }
191+
LOGGER.warn(e) { AwsCoreBundle.message("credentials.profile.validation_error", credentialsIdentifier.displayName) }
192192
val result = if (credentialsIdentifier is PostValidateInteractiveCredential) {
193193
try {
194194
credentialsIdentifier.handleValidationException(e)
@@ -240,7 +240,7 @@ abstract class AwsConnectionManager(private val project: Project) : SimpleModifi
240240
}
241241
}
242242

243-
throw CredentialProviderNotFoundException(message("credentials.profile.not_configured"))
243+
throw CredentialProviderNotFoundException(AwsCoreBundle.message("credentials.profile.not_configured"))
244244
}
245245
}
246246

@@ -318,10 +318,10 @@ sealed class ConnectionState(val displayMessage: String, val isTerminal: Boolean
318318

319319
open val actions: List<AnAction> = emptyList()
320320

321-
object InitializingToolkit : ConnectionState(message("settings.states.initializing"), isTerminal = false)
321+
object InitializingToolkit : ConnectionState(AwsCoreBundle.message("settings.states.initializing"), isTerminal = false)
322322

323-
object ValidatingConnection : ConnectionState(message("settings.states.validating"), isTerminal = false) {
324-
override val shortMessage: String = message("settings.states.validating.short")
323+
object ValidatingConnection : ConnectionState(AwsCoreBundle.message("settings.states.validating"), isTerminal = false) {
324+
override val shortMessage: String = AwsCoreBundle.message("settings.states.validating.short")
325325
}
326326

327327
class ValidConnection(val credentials: ToolkitCredentialsProvider, val region: AwsRegion) :
@@ -332,9 +332,9 @@ sealed class ConnectionState(val displayMessage: String, val isTerminal: Boolean
332332

333333
class IncompleteConfiguration(credentials: CredentialIdentifier?, region: AwsRegion?) : ConnectionState(
334334
when {
335-
region == null && credentials == null -> message("settings.none_selected")
336-
region == null -> message("settings.regions.none_selected")
337-
credentials == null -> message("settings.credentials.none_selected")
335+
region == null && credentials == null -> AwsCoreBundle.message("settings.none_selected")
336+
region == null -> AwsCoreBundle.message("settings.regions.none_selected")
337+
credentials == null -> AwsCoreBundle.message("settings.credentials.none_selected")
338338
else -> throw IllegalArgumentException("At least one of regionId ($region) or toolkitCredentialsIdentifier ($credentials) must be null")
339339
},
340340
isTerminal = true
@@ -343,10 +343,13 @@ sealed class ConnectionState(val displayMessage: String, val isTerminal: Boolean
343343
}
344344

345345
class InvalidConnection(private val cause: Exception) :
346-
ConnectionState(message("settings.states.invalid", ExceptionUtil.getMessage(cause) ?: ExceptionUtil.getThrowableText(cause)), isTerminal = true) {
347-
override val shortMessage = message("settings.states.invalid.short")
346+
ConnectionState(
347+
AwsCoreBundle.message("settings.states.invalid", ExceptionUtil.getMessage(cause) ?: ExceptionUtil.getThrowableText(cause)),
348+
isTerminal = true
349+
) {
350+
override val shortMessage = AwsCoreBundle.message("settings.states.invalid.short")
348351

349-
override val actions: List<AnAction> = listOf(RefreshConnectionAction(message("settings.retry")), gettingStartedAction, editCredsAction)
352+
override val actions: List<AnAction> = listOf(RefreshConnectionAction(AwsCoreBundle.message("settings.retry")), gettingStartedAction, editCredsAction)
350353
}
351354

352355
class RequiresUserAction(interactiveCredentials: InteractiveCredential) :

‎plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/CreateOrUpdateCredentialProfilesAction.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ import icons.AwsIcons
2020
import org.jetbrains.annotations.TestOnly
2121
import software.amazon.awssdk.profiles.ProfileFileLocation
2222
import software.aws.toolkits.core.utils.exists
23-
import software.aws.toolkits.resources.message
23+
import software.aws.toolkits.resources.AwsCoreBundle
2424
import software.aws.toolkits.telemetry.AwsTelemetry
2525
import java.nio.file.Path
2626

2727
class CreateOrUpdateCredentialProfilesAction @TestOnly constructor(
2828
private val writer: ConfigFilesFacade
2929
) : AnAction(
30-
message("configure.toolkit.upsert_credentials.action"),
30+
AwsCoreBundle.message("configure.toolkit.upsert_credentials.action"),
3131
null,
3232
AwsIcons.Logos.AWS
3333
),
@@ -62,7 +62,7 @@ class CreateOrUpdateCredentialProfilesAction @TestOnly constructor(
6262
// credential file is opened last since it takes precedence over the config file
6363
val virtualFiles = listOf(writer.configPath.toFile(), writer.credentialsPath.toFile()).filter { it.exists() }.map {
6464
localFileSystem.refreshAndFindFileByIoFile(it) ?: throw RuntimeException(
65-
message(
65+
AwsCoreBundle.message(
6666
"credentials.could_not_open",
6767
it
6868
)
@@ -84,7 +84,7 @@ class CreateOrUpdateCredentialProfilesAction @TestOnly constructor(
8484

8585
if (fileEditorManager.openTextEditor(OpenFileDescriptor(project, it), true) == null) {
8686
AwsTelemetry.openCredentials(project, success = false)
87-
throw RuntimeException(message("credentials.could_not_open", it))
87+
throw RuntimeException(AwsCoreBundle.message("credentials.could_not_open", it))
8888
}
8989
AwsTelemetry.openCredentials(project, success = true)
9090
}
@@ -93,9 +93,9 @@ class CreateOrUpdateCredentialProfilesAction @TestOnly constructor(
9393

9494
private fun confirm(project: Project, file: Path): Boolean = Messages.showOkCancelDialog(
9595
project,
96-
message("configure.toolkit.upsert_credentials.confirm_file_create", file),
97-
message("configure.toolkit.upsert_credentials.confirm_file_create.title"),
98-
message("configure.toolkit.upsert_credentials.confirm_file_create.okay"),
96+
AwsCoreBundle.message("configure.toolkit.upsert_credentials.confirm_file_create", file),
97+
AwsCoreBundle.message("configure.toolkit.upsert_credentials.confirm_file_create.title"),
98+
AwsCoreBundle.message("configure.toolkit.upsert_credentials.confirm_file_create.okay"),
9999
Messages.getCancelButton(),
100100
AllIcons.General.QuestionDialog,
101101
null

‎plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/CredentialsRegionHandler.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import software.aws.toolkits.jetbrains.core.region.AwsRegionProvider
1212
import software.aws.toolkits.jetbrains.settings.AwsSettings
1313
import software.aws.toolkits.jetbrains.settings.UseAwsCredentialRegion
1414
import software.aws.toolkits.jetbrains.utils.notifyInfo
15-
import software.aws.toolkits.resources.message
15+
import software.aws.toolkits.resources.AwsCoreBundle
1616

1717
/**
1818
* Encapsulates logic for handling of regions when a new credential identifier is selected
@@ -45,18 +45,18 @@ internal class DefaultCredentialsRegionHandler(private val project: Project) : C
4545

4646
private fun promptForRegionChange(defaultCredentialRegion: AwsRegion) {
4747
notifyInfo(
48-
message("aws.notification.title"),
49-
message("settings.credentials.prompt_for_default_region_switch", defaultCredentialRegion.id),
48+
AwsCoreBundle.message("aws.notification.title"),
49+
AwsCoreBundle.message("settings.credentials.prompt_for_default_region_switch", defaultCredentialRegion.id),
5050
project = project,
5151
notificationActions = listOf(
52-
NotificationAction.createSimpleExpiring(message("settings.credentials.prompt_for_default_region_switch.yes")) {
52+
NotificationAction.createSimpleExpiring(AwsCoreBundle.message("settings.credentials.prompt_for_default_region_switch.yes")) {
5353
AwsConnectionManager.getInstance(project).changeRegion(defaultCredentialRegion)
5454
},
55-
NotificationAction.createSimpleExpiring(message("settings.credentials.prompt_for_default_region_switch.always")) {
55+
NotificationAction.createSimpleExpiring(AwsCoreBundle.message("settings.credentials.prompt_for_default_region_switch.always")) {
5656
AwsSettings.getInstance().useDefaultCredentialRegion = UseAwsCredentialRegion.Always
5757
AwsConnectionManager.getInstance(project).changeRegion(defaultCredentialRegion)
5858
},
59-
NotificationAction.createSimpleExpiring(message("settings.credentials.prompt_for_default_region_switch.never")) {
59+
NotificationAction.createSimpleExpiring(AwsCoreBundle.message("settings.credentials.prompt_for_default_region_switch.never")) {
6060
AwsSettings.getInstance().useDefaultCredentialRegion = UseAwsCredentialRegion.Never
6161
}
6262
)

‎plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/LoginUtils.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import software.aws.toolkits.jetbrains.core.credentials.sono.SONO_REGION
2626
import software.aws.toolkits.jetbrains.core.credentials.sono.SONO_URL
2727
import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.InteractiveBearerTokenProvider
2828
import software.aws.toolkits.jetbrains.utils.runUnderProgressIfNeeded
29-
import software.aws.toolkits.resources.message
29+
import software.aws.toolkits.resources.AwsCoreBundle
3030
import software.aws.toolkits.telemetry.CredentialSourceId
3131
import java.io.IOException
3232

@@ -114,7 +114,7 @@ sealed interface Login {
114114
}
115115

116116
val callerIdentity = tryOrNull {
117-
runUnderProgressIfNeeded(project, message("settings.states.validating.short"), cancelable = true) {
117+
runUnderProgressIfNeeded(project, AwsCoreBundle.message("settings.states.validating.short"), cancelable = true) {
118118
AwsClientManager.getInstance().createUnmanagedClient<StsClient>(
119119
StaticCredentialsProvider.create(AwsBasicCredentials.create(accessKey, secretKey)),
120120
Region.AWS_GLOBAL
@@ -203,16 +203,16 @@ fun authAndUpdateConfig(
203203
}
204204

205205
internal fun ssoErrorMessageFromException(e: Exception) = when (e) {
206-
is IllegalStateException -> e.message ?: message("general.unknown_error")
207-
is ProcessCanceledException -> message("codewhisperer.credential.login.dialog.exception.cancel_login")
208-
is InvalidRequestException -> message("codewhisperer.credential.login.exception.invalid_input")
209-
is InvalidGrantException, is SsoOidcException -> e.message ?: message("codewhisperer.credential.login.exception.invalid_grant")
206+
is IllegalStateException -> e.message ?: AwsCoreBundle.message("general.unknown_error")
207+
is ProcessCanceledException -> AwsCoreBundle.message("codewhisperer.credential.login.dialog.exception.cancel_login")
208+
is InvalidRequestException -> AwsCoreBundle.message("codewhisperer.credential.login.exception.invalid_input")
209+
is InvalidGrantException, is SsoOidcException -> e.message ?: AwsCoreBundle.message("codewhisperer.credential.login.exception.invalid_grant")
210210
else -> {
211211
val baseMessage = when (e) {
212212
is IOException -> "codewhisperer.credential.login.exception.io"
213213
else -> "codewhisperer.credential.login.exception.general"
214214
}
215215

216-
message(baseMessage, "${e.javaClass.name}: ${e.message}")
216+
AwsCoreBundle.message(baseMessage, "${e.javaClass.name}: ${e.message}")
217217
}
218218
}

‎plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/MfaRequiredInteractiveCredentials.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
package software.aws.toolkits.jetbrains.core.credentials
55

66
import com.intellij.openapi.actionSystem.AnAction
7-
import software.aws.toolkits.resources.message
7+
import software.aws.toolkits.resources.AwsCoreBundle
88

99
interface MfaRequiredInteractiveCredentials : InteractiveCredential {
10-
override val userActionDisplayMessage: String get() = message("credentials.mfa.display", displayName)
11-
override val userActionShortDisplayMessage: String get() = message("credentials.mfa.display.short")
10+
override val userActionDisplayMessage: String get() = AwsCoreBundle.message("credentials.mfa.display", displayName)
11+
override val userActionShortDisplayMessage: String get() = AwsCoreBundle.message("credentials.mfa.display.short")
1212

13-
override val userAction: AnAction get() = RefreshConnectionAction(message("credentials.mfa.action"))
13+
override val userAction: AnAction get() = RefreshConnectionAction(AwsCoreBundle.message("credentials.mfa.action"))
1414

1515
override fun userActionRequired(): Boolean = true
1616
}

‎plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/MfaSupport.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ package software.aws.toolkits.jetbrains.core.credentials
66
import com.intellij.openapi.progress.ProcessCanceledException
77
import com.intellij.openapi.ui.Messages
88
import software.aws.toolkits.jetbrains.utils.computeOnEdt
9-
import software.aws.toolkits.resources.message
9+
import software.aws.toolkits.resources.AwsCoreBundle
1010

1111
fun promptForMfaToken(name: String, mfaSerial: String): String = computeOnEdt {
1212
Messages.showInputDialog(
13-
message("credentials.mfa.message", mfaSerial),
14-
message("credentials.mfa.title", name),
13+
AwsCoreBundle.message("credentials.mfa.message", mfaSerial),
14+
AwsCoreBundle.message("credentials.mfa.title", name),
1515
null
1616
) ?: throw ProcessCanceledException(IllegalStateException("MFA challenge is required"))
1717
}

0 commit comments

Comments
 (0)