Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions packages/core/src/modules/kms/KeyManagementApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ export class KeyManagementApi {
const publicKey = await kms.getPublicKey(this.agentContext, keyId)

if (!publicKey) {
throw new KeyManagementKeyNotFoundError(keyId, backend)
throw new KeyManagementKeyNotFoundError(keyId, [backend])
}
}

Expand Down Expand Up @@ -317,12 +317,17 @@ export class KeyManagementApi {
}

if (operation) {
throw new KeyManagementError(
`No key management service supports ${getKmsOperationHumanDescription(operation)} that has a key with keyId '${keyId}'`
throw new KeyManagementKeyNotFoundError(
keyId,
this.keyManagementConfig.backends.map((b) => b.backend),
`It may be the key exists, but the key management servcie doe not support the operation ${getKmsOperationHumanDescription(operation)}`
)
}

throw new KeyManagementError(`No key management service has a key with keyId '${keyId}'`)
throw new KeyManagementKeyNotFoundError(
keyId,
this.keyManagementConfig.backends.map((b) => b.backend)
)
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
import { KeyManagementError } from './KeyManagementError'

export class KeyManagementKeyNotFoundError extends KeyManagementError {
public constructor(keyId: string, backend: string) {
super(`Key with key id '${keyId}' not found in backend '${backend}'`)
public constructor(keyId: string, backends: string[], extraMessage?: string) {
const base = `Key with key id '${keyId}' not found in backend`

const withBackends =
backends.length > 1 ? `${base}s ${backends.map((b) => `'${b}'`).join(', ')}` : `${base} '${backends[0]}'`

Check failure on line 8 in packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts

View workflow job for this annotation

GitHub Actions / Unit Tests (20, 1)

packages/node/src/kms/__tests__/NodeKeyManagementService.test.ts > NodeKeyManagementService > deleteKey > removes key from storage completely

TypeError: backends.map is not a function ❯ new KeyManagementKeyNotFoundError packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts:8:50 ❯ packages/node/src/kms/__tests__/NodeKeyManagementService.test.ts:1897:25

Check failure on line 8 in packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts

View workflow job for this annotation

GitHub Actions / Unit Tests (20, 1)

packages/node/src/kms/__tests__/NodeKeyManagementService.test.ts > NodeKeyManagementService > verify > throws error if key is not found

TypeError: backends.map is not a function ❯ new KeyManagementKeyNotFoundError packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts:8:50 ❯ packages/node/src/kms/__tests__/NodeKeyManagementService.test.ts:601:25

Check failure on line 8 in packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts

View workflow job for this annotation

GitHub Actions / Unit Tests (20, 1)

packages/node/src/kms/__tests__/NodeKeyManagementService.test.ts > NodeKeyManagementService > sign > throws error if key is not found

TypeError: backends.map is not a function ❯ new KeyManagementKeyNotFoundError packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts:8:50 ❯ packages/node/src/kms/__tests__/NodeKeyManagementService.test.ts:256:25

Check failure on line 8 in packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts

View workflow job for this annotation

GitHub Actions / Unit Tests (22, 1)

packages/node/src/kms/__tests__/NodeKeyManagementService.test.ts > NodeKeyManagementService > deleteKey > removes key from storage completely

TypeError: backends.map is not a function ❯ new KeyManagementKeyNotFoundError packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts:8:50 ❯ packages/node/src/kms/__tests__/NodeKeyManagementService.test.ts:1897:25

Check failure on line 8 in packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts

View workflow job for this annotation

GitHub Actions / Unit Tests (22, 1)

packages/node/src/kms/__tests__/NodeKeyManagementService.test.ts > NodeKeyManagementService > verify > throws error if key is not found

TypeError: backends.map is not a function ❯ new KeyManagementKeyNotFoundError packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts:8:50 ❯ packages/node/src/kms/__tests__/NodeKeyManagementService.test.ts:601:25

Check failure on line 8 in packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts

View workflow job for this annotation

GitHub Actions / Unit Tests (22, 1)

packages/node/src/kms/__tests__/NodeKeyManagementService.test.ts > NodeKeyManagementService > sign > throws error if key is not found

TypeError: backends.map is not a function ❯ new KeyManagementKeyNotFoundError packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts:8:50 ❯ packages/node/src/kms/__tests__/NodeKeyManagementService.test.ts:256:25

Check failure on line 8 in packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts

View workflow job for this annotation

GitHub Actions / Unit Tests (22, 2)

packages/askar/src/kms/__tests__/AskarKeyManagementService.test.ts > AskarKeyManagementService > encrypt > throws error if key is not found

TypeError: backends.map is not a function ❯ new KeyManagementKeyNotFoundError packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts:8:50 ❯ packages/askar/src/kms/__tests__/AskarKeyManagementService.test.ts:998:25

Check failure on line 8 in packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts

View workflow job for this annotation

GitHub Actions / Unit Tests (22, 2)

packages/askar/src/kms/__tests__/AskarKeyManagementService.test.ts > AskarKeyManagementService > deleteKey > removes key from storage completely

TypeError: backends.map is not a function ❯ new KeyManagementKeyNotFoundError packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts:8:50 ❯ packages/askar/src/kms/__tests__/AskarKeyManagementService.test.ts:974:25

Check failure on line 8 in packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts

View workflow job for this annotation

GitHub Actions / Unit Tests (22, 2)

packages/askar/src/kms/__tests__/AskarKeyManagementService.test.ts > AskarKeyManagementService > verify > throws error if key is not found

TypeError: backends.map is not a function ❯ new KeyManagementKeyNotFoundError packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts:8:50 ❯ packages/askar/src/kms/__tests__/AskarKeyManagementService.test.ts:424:25

Check failure on line 8 in packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts

View workflow job for this annotation

GitHub Actions / Unit Tests (22, 2)

packages/askar/src/kms/__tests__/AskarKeyManagementService.test.ts > AskarKeyManagementService > sign > throws error if key is not found

TypeError: backends.map is not a function ❯ new KeyManagementKeyNotFoundError packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts:8:50 ❯ packages/askar/src/kms/__tests__/AskarKeyManagementService.test.ts:290:25

Check failure on line 8 in packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts

View workflow job for this annotation

GitHub Actions / Unit Tests (20, 2)

packages/askar/src/kms/__tests__/AskarKeyManagementService.test.ts > AskarKeyManagementService > encrypt > throws error if key is not found

TypeError: backends.map is not a function ❯ new KeyManagementKeyNotFoundError packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts:8:50 ❯ packages/askar/src/kms/__tests__/AskarKeyManagementService.test.ts:998:25

Check failure on line 8 in packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts

View workflow job for this annotation

GitHub Actions / Unit Tests (20, 2)

packages/askar/src/kms/__tests__/AskarKeyManagementService.test.ts > AskarKeyManagementService > deleteKey > removes key from storage completely

TypeError: backends.map is not a function ❯ new KeyManagementKeyNotFoundError packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts:8:50 ❯ packages/askar/src/kms/__tests__/AskarKeyManagementService.test.ts:974:25

Check failure on line 8 in packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts

View workflow job for this annotation

GitHub Actions / Unit Tests (20, 2)

packages/askar/src/kms/__tests__/AskarKeyManagementService.test.ts > AskarKeyManagementService > verify > throws error if key is not found

TypeError: backends.map is not a function ❯ new KeyManagementKeyNotFoundError packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts:8:50 ❯ packages/askar/src/kms/__tests__/AskarKeyManagementService.test.ts:424:25

Check failure on line 8 in packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts

View workflow job for this annotation

GitHub Actions / Unit Tests (20, 2)

packages/askar/src/kms/__tests__/AskarKeyManagementService.test.ts > AskarKeyManagementService > sign > throws error if key is not found

TypeError: backends.map is not a function ❯ new KeyManagementKeyNotFoundError packages/core/src/modules/kms/error/KeyManagementKeyNotFoundError.ts:8:50 ❯ packages/askar/src/kms/__tests__/AskarKeyManagementService.test.ts:290:25

const withExtraMessage = extraMessage ? `${withBackends}. ${extraMessage}` : withBackends

super(withExtraMessage)
}
}
Loading