Skip to content

Commit fdd5dfe

Browse files
committed
fix: remove dummy settings from unknown profiles and wrap sendGetMfaCode in lambda
1 parent 0760577 commit fdd5dfe

File tree

4 files changed

+8
-16
lines changed

4 files changed

+8
-16
lines changed

server/aws-lsp-identity/src/language-server/identityServer.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
PartialInitializeResult,
1212
ShowMessageRequestParams,
1313
GetIamCredentialParams,
14+
GetMfaCodeParams,
1415
} from '@aws/language-server-runtimes/server-interface'
1516
import { SharedConfigProfileStore } from './profiles/sharedConfigProfileStore'
1617
import { IdentityService } from './identityService'
@@ -41,7 +42,8 @@ export class IdentityServer extends ServerBase {
4142
const showMessageRequest: ShowMessageRequest = (params: ShowMessageRequestParams) =>
4243
this.features.lsp.window.showMessageRequest(params)
4344
const showProgress: ShowProgress = this.features.lsp.sendProgress
44-
const sendGetMfaCode: SendGetMfaCode = this.features.identityManagement.sendGetMfaCode
45+
const sendGetMfaCode: SendGetMfaCode = (params: GetMfaCodeParams) =>
46+
this.features.identityManagement.sendGetMfaCode(params)
4547

4648
// Initialize dependencies
4749
const profileStore = new SharedConfigProfileStore(this.observability)

server/aws-lsp-identity/src/language-server/identityService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ export class IdentityService {
181181
emitMetric('Succeeded')
182182

183183
return {
184-
credential: { id: params.profileName, credentials: credentials },
184+
credential: { id: params.profileName, kinds: profile.kinds, credentials: credentials },
185185
updateCredentialsParams: { data: credentials, encrypted: false },
186186
}
187187
} catch (e) {

server/aws-lsp-identity/src/language-server/profiles/sharedConfigProfileStore.test.ts

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,7 @@ describe('SharedConfigProfileStore', async () => {
9999
{
100100
kinds: [ProfileKind.Unknown],
101101
name: 'subsettings',
102-
settings: {
103-
region: undefined,
104-
},
102+
settings: {},
105103
},
106104
{
107105
kinds: [ProfileKind.SsoTokenProfile],
@@ -192,9 +190,7 @@ describe('SharedConfigProfileStore', async () => {
192190
{
193191
kinds: [ProfileKind.Unknown],
194192
name: 'subsettings',
195-
settings: {
196-
region: undefined,
197-
},
193+
settings: {},
198194
},
199195
{
200196
kinds: [ProfileKind.SsoTokenProfile],
@@ -290,9 +286,7 @@ describe('SharedConfigProfileStore', async () => {
290286
{
291287
kinds: [ProfileKind.Unknown],
292288
name: 'subsettings',
293-
settings: {
294-
region: undefined,
295-
},
289+
settings: {},
296290
},
297291
{
298292
kinds: ['SsoTokenProfile'],
@@ -440,9 +434,7 @@ describe('SharedConfigProfileStore', async () => {
440434
{
441435
kinds: [ProfileKind.Unknown],
442436
name: 'subsettings',
443-
settings: {
444-
region: undefined,
445-
},
437+
settings: {},
446438
},
447439
],
448440
ssoSessions: [

server/aws-lsp-identity/src/language-server/profiles/sharedConfigProfileStore.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ export class SharedConfigProfileStore implements ProfileStore {
6767
// If the profile does not match any profile type, mark it as an unknown profile
6868
if (profile.kinds.length === 0) {
6969
profile.kinds.push(ProfileKind.Unknown)
70-
// Dummy field to avoid deleting profile when loading and saving 0 changes to the profile
71-
profile.settings!['region'] = settings['region']
7270
}
7371
result.profiles.push(profile)
7472
break

0 commit comments

Comments
 (0)