Skip to content

Commit 6b78e1f

Browse files
committed
refactor: let toolkit compile and run core tests and clean some tests
1 parent 39f8402 commit 6b78e1f

File tree

14 files changed

+37
-42
lines changed

14 files changed

+37
-42
lines changed

plugins/core/jetbrains-community/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ sourceSets {
2323
main {
2424
java.srcDir(generatedSrcDir)
2525
}
26+
test {
27+
java.setSrcDirs(emptySet<String>())
28+
}
2629
}
2730

2831
idea {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ class DefaultAwsResourceCache(
249249
}
250250

251251
@VisibleForTesting
252-
internal fun doRunCacheMaintenance() {
252+
fun doRunCacheMaintenance() {
253253
var totalWeight = 0
254254
cache.entries.removeIf { it.value.value.isCompletedExceptionally }
255255
val entries = cache.entries.asSequence().filter { it.value.value.isCompleted }.onEach { totalWeight += it.value.weight }.toList()
@@ -362,7 +362,7 @@ class DefaultAwsResourceCache(
362362
private val Entry<*>.notExpired get() = value.isActive || clock.instant().isBefore(expiry)
363363

364364
@VisibleForTesting
365-
internal fun hasCacheEntry(resourceId: String): Boolean = cache.filterKeys { it.resourceId == resourceId }.isNotEmpty()
365+
fun hasCacheEntry(resourceId: String): Boolean = cache.filterKeys { it.resourceId == resourceId }.isNotEmpty()
366366

367367
companion object {
368368
private val LOG = getLogger<DefaultAwsResourceCache>()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ abstract class AwsConnectionManager(private val project: Project) : SimpleModifi
287287

288288
private val LOGGER = getLogger<AwsConnectionManager>()
289289
private const val MAX_HISTORY = 5
290-
internal val AwsConnectionManager.selectedPartition get() = selectedRegion?.let { AwsRegionProvider.getInstance().partitions()[it.partitionId] }
290+
val AwsConnectionManager.selectedPartition get() = selectedRegion?.let { AwsRegionProvider.getInstance().partitions()[it.partitionId] }
291291
}
292292
}
293293

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ interface CredentialsRegionHandler {
2525
}
2626
}
2727

28-
internal class DefaultCredentialsRegionHandler(private val project: Project) : CredentialsRegionHandler {
28+
class DefaultCredentialsRegionHandler(private val project: Project) : CredentialsRegionHandler {
2929
override fun determineSelectedRegion(identifier: CredentialIdentifier, selectedRegion: AwsRegion?): AwsRegion? {
3030
val settings = AwsSettings.getInstance()
3131
if (settings.useDefaultCredentialRegion == UseAwsCredentialRegion.Never) {

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileAssumeRoleProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import software.aws.toolkits.jetbrains.core.AwsClientManager
1818
import software.aws.toolkits.jetbrains.core.credentials.promptForMfaToken
1919
import java.util.function.Supplier
2020

21-
class ProfileAssumeRoleProvider(@get:TestOnly internal val parentProvider: AwsCredentialsProvider, region: AwsRegion, profile: Profile) :
21+
class ProfileAssumeRoleProvider(@get:TestOnly val parentProvider: AwsCredentialsProvider, region: AwsRegion, profile: Profile) :
2222
AwsCredentialsProvider, SdkAutoCloseable {
2323
private val stsClient: StsClient
2424
private val credentialsProvider: StsAssumeRoleCredentialsProvider

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/BearerTokenProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ interface BearerTokenProvider : SdkTokenProvider, SdkAutoCloseable, ToolkitBeare
7272
companion object {
7373
private fun tokenExpired(accessToken: AccessToken, clock: Clock) = clock.instant().isAfter(accessToken.expiresAt)
7474

75-
internal fun state(accessToken: AccessToken?, clock: Clock = Clock.systemUTC()) = when {
75+
fun state(accessToken: AccessToken?, clock: Clock = Clock.systemUTC()) = when {
7676
accessToken == null -> BearerTokenAuthState.NOT_AUTHENTICATED
7777
tokenExpired(accessToken, clock) -> {
7878
if (accessToken.refreshToken != null) {

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/IdcRolePopup.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class IdcRolePopup(
124124
}
125125

126126
@VisibleForTesting
127-
internal fun doOkActionWithRoleInfo(roleInfo: RoleInfo) {
127+
fun doOkActionWithRoleInfo(roleInfo: RoleInfo) {
128128
val profileName = "$sessionName-${roleInfo.accountId()}-${roleInfo.roleName()}"
129129
if (profileName !in configFilesFacade.readAllProfiles().keys) {
130130
configFilesFacade.appendProfileToConfig(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ object NotificationEndpoint {
4545
}
4646

4747
@Service(Service.Level.APP)
48-
internal final class NotificationPollingService : Disposable {
48+
final class NotificationPollingService : Disposable {
4949
private val observers = mutableListOf<() -> Unit>()
5050
private val alarm = AlarmFactory.getInstance().create(Alarm.ThreadToUse.POOLED_THREAD, this)
5151
private val pollingIntervalMs = Duration.ofMinutes(10).toMillis()

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LoginBrowser.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ abstract class LoginBrowser(
7979
protected var currentAuthorization: PendingAuthorization? = null
8080

8181
@VisibleForTesting
82-
internal val objectMapper = jacksonObjectMapper()
82+
val objectMapper = jacksonObjectMapper()
8383

8484
abstract fun handleBrowserMessage(message: BrowserMessage?)
8585

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/otel/OTelService.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ private object StdoutSpanProcessor : SpanProcessor {
132132
}
133133

134134
@Service
135-
class OTelService @NonInjectable internal constructor(spanProcessors: List<SpanProcessor>) : Disposable {
135+
class OTelService @NonInjectable constructor(spanProcessors: List<SpanProcessor>) : Disposable {
136136
@Suppress("unused")
137137
constructor() : this(listOf(ToolkitTelemetryOTelSpanProcessor()))
138138

@@ -159,7 +159,7 @@ class OTelService @NonInjectable internal constructor(spanProcessors: List<SpanP
159159
.setPropagators(ContextPropagators.create(W3CTraceContextPropagator.getInstance()))
160160
.build()
161161
}
162-
internal val sdk: OpenTelemetrySdk by sdkDelegate
162+
val sdk: OpenTelemetrySdk by sdkDelegate
163163

164164
override fun dispose() {
165165
if (sdkDelegate.isInitialized()) {

0 commit comments

Comments
 (0)