Skip to content

Commit 9259d05

Browse files
authored
Stop passing the older AWS env vars (#2152)
1 parent 6dc12d4 commit 9259d05

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/CredentialManager.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,11 @@ class DefaultCredentialManager : CredentialManager() {
148148

149149
fun AwsCredentials.toEnvironmentVariables(): Map<String, String> {
150150
val map = mutableMapOf<String, String>()
151-
map["AWS_ACCESS_KEY"] = this.accessKeyId()
152151
map["AWS_ACCESS_KEY_ID"] = this.accessKeyId()
153-
map["AWS_SECRET_KEY"] = this.secretAccessKey()
154152
map["AWS_SECRET_ACCESS_KEY"] = this.secretAccessKey()
155153

156154
if (this is AwsSessionCredentials) {
157155
map["AWS_SESSION_TOKEN"] = this.sessionToken()
158-
map["AWS_SECURITY_TOKEN"] = this.sessionToken()
159156
}
160157

161158
return map

jetbrains-core/tst/software/aws/toolkits/jetbrains/core/ExecutableBackedCacheResourceTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class ExecutableBackedCacheResourceTest {
7878
createMockExecutable("validBinary")
7979

8080
executeCacheResource {
81-
assertThat(this.environment).containsKey("AWS_ACCESS_KEY").containsKey("AWS_SECRET_KEY")
81+
assertThat(this.environment).containsKey("AWS_ACCESS_KEY_ID").containsKey("AWS_SECRET_ACCESS_KEY")
8282
}
8383
}
8484

0 commit comments

Comments
 (0)