Skip to content

Commit 9f029b6

Browse files
samgst-amazonsamgst-amazon
authored
Revert "Add source to load registration metrics (#5075)"
This reverts commit 5f3cb69.
1 parent 5f3cb69 commit 9f029b6

File tree

6 files changed

+34
-41
lines changed

6 files changed

+34
-41
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,15 @@ class DiskCache(
101101
clientRegistrationCache(ssoRegion).tryDeleteIfExists()
102102
}
103103

104-
override fun loadClientRegistration(cacheKey: ClientRegistrationCacheKey, source: String): ClientRegistration? {
105-
LOG.info { "loadClientRegistration:$source for $cacheKey" }
104+
override fun loadClientRegistration(cacheKey: ClientRegistrationCacheKey): ClientRegistration? {
105+
LOG.info { "loadClientRegistration for $cacheKey" }
106106
val inputStream = clientRegistrationCache(cacheKey).tryInputStreamIfExists()
107107
if (inputStream == null) {
108108
val stage = LoadCredentialStage.ACCESS_FILE
109109
LOG.info { "Failed to load Client Registration: cache file does not exist" }
110110
AuthTelemetry.modifyConnection(
111111
action = "Load cache file",
112-
source = "loadClientRegistration:$source",
112+
source = "loadClientRegistration",
113113
result = Result.Failed,
114114
reason = "Failed to load Client Registration",
115115
reasonDesc = "Load Step:$stage failed. Cache file does not exist"

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

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ class SsoAccessTokenProvider(
194194

195195
@Deprecated("Device authorization grant flow is deprecated")
196196
private fun registerDAGClient(): ClientRegistration {
197-
loadDagClientRegistration(SourceOfLoadRegistration.REGISTER_CLIENT.toString())?.let {
197+
loadDagClientRegistration()?.let {
198198
return it
199199
}
200200

@@ -235,7 +235,7 @@ class SsoAccessTokenProvider(
235235
}
236236

237237
private fun registerPkceClient(): PKCEClientRegistration {
238-
loadPkceClientRegistration(SourceOfLoadRegistration.REGISTER_CLIENT.toString())?.let {
238+
loadPkceClientRegistration()?.let {
239239
return it
240240
}
241241

@@ -431,8 +431,8 @@ class SsoAccessTokenProvider(
431431
stageName = RefreshCredentialStage.LOAD_REGISTRATION
432432
val registration = try {
433433
when (currentToken) {
434-
is DeviceAuthorizationGrantToken -> loadDagClientRegistration(SourceOfLoadRegistration.REFRESH_TOKEN.toString())
435-
is PKCEAuthorizationGrantToken -> loadPkceClientRegistration(SourceOfLoadRegistration.REFRESH_TOKEN.toString())
434+
is DeviceAuthorizationGrantToken -> loadDagClientRegistration()
435+
is PKCEAuthorizationGrantToken -> loadPkceClientRegistration()
436436
}
437437
} catch (e: Exception) {
438438
val message = e.message ?: "$stageName: ${e::class.java.name}"
@@ -505,11 +505,6 @@ class SsoAccessTokenProvider(
505505
}
506506
}
507507

508-
enum class SourceOfLoadRegistration {
509-
REGISTER_CLIENT,
510-
REFRESH_TOKEN,
511-
}
512-
513508
private enum class RefreshCredentialStage {
514509
VALIDATE_REFRESH_TOKEN,
515510
LOAD_REGISTRATION,
@@ -519,13 +514,13 @@ class SsoAccessTokenProvider(
519514
SAVE_TOKEN,
520515
}
521516

522-
private fun loadDagClientRegistration(source: String): ClientRegistration? =
523-
cache.loadClientRegistration(dagClientRegistrationCacheKey, source)?.let {
517+
private fun loadDagClientRegistration(): ClientRegistration? =
518+
cache.loadClientRegistration(dagClientRegistrationCacheKey)?.let {
524519
return it
525520
}
526521

527-
private fun loadPkceClientRegistration(source: String): PKCEClientRegistration? =
528-
cache.loadClientRegistration(pkceClientRegistrationCacheKey, source)?.let {
522+
private fun loadPkceClientRegistration(): PKCEClientRegistration? =
523+
cache.loadClientRegistration(pkceClientRegistrationCacheKey)?.let {
529524
return it as PKCEClientRegistration
530525
}
531526

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ interface SsoCache {
77
fun invalidateClientRegistration(ssoRegion: String)
88
fun invalidateAccessToken(ssoUrl: String)
99

10-
fun loadClientRegistration(cacheKey: ClientRegistrationCacheKey, source: String): ClientRegistration?
10+
fun loadClientRegistration(cacheKey: ClientRegistrationCacheKey): ClientRegistration?
1111
fun saveClientRegistration(cacheKey: ClientRegistrationCacheKey, registration: ClientRegistration)
1212
fun invalidateClientRegistration(cacheKey: ClientRegistrationCacheKey)
1313

‎plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/sso/DiskCacheTest.kt‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ class DiskCacheTest {
5757
startUrl = ssoUrl,
5858
scopes = scopes,
5959
region = ssoRegion
60-
),
61-
"testSource"
60+
)
6261
)
6362
).isNull()
6463
}
@@ -72,7 +71,7 @@ class DiskCacheTest {
7271
)
7372
cacheLocation.resolve("223224b6f0b4702c1a984be8284fe2c9d9718759.json").writeText("badData")
7473

75-
assertThat(sut.loadClientRegistration(key, "testSource")).isNull()
74+
assertThat(sut.loadClientRegistration(key)).isNull()
7675
}
7776

7877
@Test
@@ -92,7 +91,7 @@ class DiskCacheTest {
9291
""".trimIndent()
9392
)
9493

95-
assertThat(sut.loadClientRegistration(key, "testSource")).isNull()
94+
assertThat(sut.loadClientRegistration(key)).isNull()
9695
}
9796

9897
@Test
@@ -113,7 +112,7 @@ class DiskCacheTest {
113112
""".trimIndent()
114113
)
115114

116-
assertThat(sut.loadClientRegistration(key, "testSource")).isNull()
115+
assertThat(sut.loadClientRegistration(key)).isNull()
117116
}
118117

119118
@Test
@@ -135,7 +134,7 @@ class DiskCacheTest {
135134
""".trimIndent()
136135
)
137136

138-
assertThat(sut.loadClientRegistration(key, "testSource"))
137+
assertThat(sut.loadClientRegistration(key))
139138
.usingRecursiveComparison()
140139
.isEqualTo(
141140
DeviceAuthorizationClientRegistration(
@@ -218,7 +217,7 @@ class DiskCacheTest {
218217
""".trimIndent()
219218
)
220219

221-
assertThat(sut.loadClientRegistration(key, "testSource"))
220+
assertThat(sut.loadClientRegistration(key))
222221
.usingRecursiveComparison()
223222
.isEqualTo(
224223
PKCEClientRegistration(
@@ -324,10 +323,10 @@ class DiskCacheTest {
324323
)
325324
)
326325

327-
assertThat(sut.loadClientRegistration(key1, "testSource"))
326+
assertThat(sut.loadClientRegistration(key1))
328327
.usingRecursiveComparison()
329328
.isEqualTo(
330-
sut.loadClientRegistration(key2, "testSource")
329+
sut.loadClientRegistration(key2)
331330
)
332331
}
333332

@@ -351,11 +350,11 @@ class DiskCacheTest {
351350
region = ssoRegion
352351
)
353352

354-
assertThat(sut.loadClientRegistration(key, "testSource")).isNotNull()
353+
assertThat(sut.loadClientRegistration(key)).isNotNull()
355354

356355
sut.invalidateClientRegistration(key)
357356

358-
assertThat(sut.loadClientRegistration(key, "testSource")).isNull()
357+
assertThat(sut.loadClientRegistration(key)).isNull()
359358
assertThat(cacheFile).doesNotExist()
360359
}
361360

@@ -620,7 +619,7 @@ class DiskCacheTest {
620619
registration.setPosixFilePermissions(emptySet())
621620
assertPosixPermissions(registration, "---------")
622621

623-
assertThat(sut.loadClientRegistration(key, "testSource")).isNotNull()
622+
assertThat(sut.loadClientRegistration(key)).isNotNull()
624623

625624
assertPosixPermissions(registration, "rw-------")
626625
}

‎plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/sso/SsoAccessTokenProviderTest.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class SsoAccessTokenProviderTest {
124124
verify(ssoOidcClient).startDeviceAuthorization(any<StartDeviceAuthorizationRequest>())
125125
verify(ssoOidcClient).createToken(any<CreateTokenRequest>())
126126
verify(ssoCache).loadAccessToken(argThat<DeviceGrantAccessTokenCacheKey> { startUrl == ssoUrl })
127-
verify(ssoCache).loadClientRegistration(argThat { region == ssoRegion }, any<String>())
127+
verify(ssoCache).loadClientRegistration(argThat { region == ssoRegion })
128128
verify(ssoCache).saveAccessToken(argThat<DeviceGrantAccessTokenCacheKey> { startUrl == ssoUrl }, eq(accessToken))
129129
}
130130

@@ -170,7 +170,7 @@ class SsoAccessTokenProviderTest {
170170
verify(ssoOidcClient).startDeviceAuthorization(any<StartDeviceAuthorizationRequest>())
171171
verify(ssoOidcClient).createToken(any<CreateTokenRequest>())
172172
verify(ssoCache).loadAccessToken(argThat<DeviceGrantAccessTokenCacheKey> { startUrl == ssoUrl })
173-
verify(ssoCache).loadClientRegistration(argThat<DeviceAuthorizationClientRegistrationCacheKey> { region == ssoRegion }, any<String>())
173+
verify(ssoCache).loadClientRegistration(argThat<DeviceAuthorizationClientRegistrationCacheKey> { region == ssoRegion })
174174
verify(ssoCache).saveClientRegistration(argThat<DeviceAuthorizationClientRegistrationCacheKey> { region == ssoRegion }, any())
175175
verify(ssoCache).saveAccessToken(argThat<DeviceGrantAccessTokenCacheKey> { startUrl == ssoUrl }, eq(accessToken))
176176
}
@@ -267,7 +267,7 @@ class SsoAccessTokenProviderTest {
267267
verify(ssoOidcClient).startDeviceAuthorization(any<StartDeviceAuthorizationRequest>())
268268
verify(ssoOidcClient, times(2)).createToken(any<CreateTokenRequest>())
269269
verify(ssoCache).loadAccessToken(argThat<DeviceGrantAccessTokenCacheKey> { startUrl == ssoUrl })
270-
verify(ssoCache).loadClientRegistration(argThat<DeviceAuthorizationClientRegistrationCacheKey> { region == ssoRegion }, any<String>())
270+
verify(ssoCache).loadClientRegistration(argThat<DeviceAuthorizationClientRegistrationCacheKey> { region == ssoRegion })
271271
verify(ssoCache).saveAccessToken(argThat<DeviceGrantAccessTokenCacheKey> { startUrl == ssoUrl }, eq(accessToken))
272272
}
273273

@@ -296,7 +296,7 @@ class SsoAccessTokenProviderTest {
296296
val refreshedToken = runBlocking { sut.refreshToken(sut.accessToken()) }
297297

298298
verify(ssoCache).loadAccessToken(argThat<DeviceGrantAccessTokenCacheKey> { startUrl == ssoUrl })
299-
verify(ssoCache).loadClientRegistration(argThat { region == ssoRegion }, any<String>())
299+
verify(ssoCache).loadClientRegistration(argThat { region == ssoRegion })
300300
verify(ssoOidcClient).createToken(any<CreateTokenRequest>())
301301
verify(ssoCache).saveAccessToken(argThat<DeviceGrantAccessTokenCacheKey> { startUrl == ssoUrl }, eq(refreshedToken))
302302
}
@@ -342,7 +342,7 @@ class SsoAccessTokenProviderTest {
342342
)
343343

344344
on(
345-
ssoCache.loadClientRegistration(any<PKCEClientRegistrationCacheKey>(), any<String>())
345+
ssoCache.loadClientRegistration(any<PKCEClientRegistrationCacheKey>())
346346
).thenReturn(
347347
PKCEClientRegistration(
348348
clientType = "public",
@@ -369,7 +369,7 @@ class SsoAccessTokenProviderTest {
369369
val refreshedToken = runBlocking { sut.refreshToken(sut.accessToken()) }
370370

371371
verify(ssoCache).loadAccessToken(any<PKCEAccessTokenCacheKey>())
372-
verify(ssoCache).loadClientRegistration(any<PKCEClientRegistrationCacheKey>(), any<String>())
372+
verify(ssoCache).loadClientRegistration(any<PKCEClientRegistrationCacheKey>())
373373
verify(ssoOidcClient).createToken(any<CreateTokenRequest>())
374374
verify(ssoCache).saveAccessToken(any<PKCEAccessTokenCacheKey>(), eq(refreshedToken))
375375
}
@@ -390,7 +390,7 @@ class SsoAccessTokenProviderTest {
390390
verify(ssoOidcClient).startDeviceAuthorization(any<StartDeviceAuthorizationRequest>())
391391
verify(ssoOidcClient).createToken(any<CreateTokenRequest>())
392392
verify(ssoCache).loadAccessToken(argThat<DeviceGrantAccessTokenCacheKey> { startUrl == ssoUrl })
393-
verify(ssoCache).loadClientRegistration(argThat<DeviceAuthorizationClientRegistrationCacheKey> { region == ssoRegion }, any<String>())
393+
verify(ssoCache).loadClientRegistration(argThat<DeviceAuthorizationClientRegistrationCacheKey> { region == ssoRegion })
394394
}
395395

396396
@Test
@@ -432,7 +432,7 @@ class SsoAccessTokenProviderTest {
432432
verify(ssoOidcClient).startDeviceAuthorization(any<StartDeviceAuthorizationRequest>())
433433
verify(ssoOidcClient, times(2)).createToken(any<CreateTokenRequest>())
434434
verify(ssoCache).loadAccessToken(argThat<DeviceGrantAccessTokenCacheKey> { startUrl == ssoUrl })
435-
verify(ssoCache).loadClientRegistration(argThat<DeviceAuthorizationClientRegistrationCacheKey> { region == ssoRegion }, any<String>())
435+
verify(ssoCache).loadClientRegistration(argThat<DeviceAuthorizationClientRegistrationCacheKey> { region == ssoRegion })
436436
verify(ssoCache).saveAccessToken(argThat<DeviceGrantAccessTokenCacheKey> { startUrl == ssoUrl }, eq(accessToken))
437437
}
438438

@@ -452,7 +452,7 @@ class SsoAccessTokenProviderTest {
452452

453453
verify(ssoOidcClient).registerClient(any<RegisterClientRequest>())
454454
verify(ssoCache).loadAccessToken(any())
455-
verify(ssoCache).loadClientRegistration(argThat { region == ssoRegion }, any<String>())
455+
verify(ssoCache).loadClientRegistration(argThat { region == ssoRegion })
456456
}
457457

458458
@Test
@@ -492,7 +492,7 @@ class SsoAccessTokenProviderTest {
492492
)
493493

494494
on(
495-
ssoCache.loadClientRegistration(argThat { region == ssoRegion }, any<String>())
495+
ssoCache.loadClientRegistration(argThat { region == ssoRegion })
496496
).thenReturn(
497497
returnValue
498498
)

‎plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/InteractiveBearerTokenProviderTest.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import org.junit.jupiter.api.assertThrows
1616
import org.mockito.Mockito
1717
import org.mockito.kotlin.any
1818
import org.mockito.kotlin.argThat
19-
import org.mockito.kotlin.eq
2019
import org.mockito.kotlin.mock
2120
import org.mockito.kotlin.spy
2221
import org.mockito.kotlin.times
@@ -274,7 +273,7 @@ class InteractiveBearerTokenProviderTest {
274273
)
275274

276275
private fun stubClientRegistration() {
277-
whenever(diskCache.loadClientRegistration(any<DeviceAuthorizationClientRegistrationCacheKey>(), eq("testSource"))).thenReturn(
276+
whenever(diskCache.loadClientRegistration(any<DeviceAuthorizationClientRegistrationCacheKey>())).thenReturn(
278277
DeviceAuthorizationClientRegistration(
279278
"",
280279
"",

0 commit comments

Comments
 (0)