Skip to content

Fix: [AEA-6028] - Switched deployApi to accept resolved values for client cert / key #530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MatthewPopat-NHS merged 3 commits into from
Feb 20, 2026
+10 −14
Merged

Fix: [AEA-6028] - Switched deployApi to accept resolved values for client cert / key #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1348893
Switched deployApi to accept resolved values for client cert / key
MatthewPopat-NHS Feb 19, 2026
496646c
Merge branch 'main' into AEA-6028
MatthewPopat-NHS Feb 19, 2026
0d9608e
Merge branch 'main' into AEA-6028
MatthewPopat-NHS Feb 20, 2026
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
14 changes: 6 additions & 8 deletions packages/deploymentUtils/src/specifications/deployApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ export type ApiConfig = {
awsEnvironment: string
stackName: string
mtlsSecretName: string
clientCertExportName: string
clientPrivateKeyExportName: string
clientCert: string
clientPrivateKey: string
proxygenPrivateKeyExportName: string
proxygenKid: string
hiddenPaths: Array<string>
Expand All @@ -30,8 +30,8 @@ export async function deployApi(
awsEnvironment,
stackName,
mtlsSecretName,
clientCertExportName,
clientPrivateKeyExportName,
clientCert,
clientPrivateKey,
proxygenPrivateKeyExportName,
proxygenKid,
hiddenPaths
Expand All @@ -53,8 +53,6 @@ export async function deployApi(
})

const exports = await getCloudFormationExports()
const clientCertArn = getCFConfigValue(exports, `account-resources:${clientCertExportName}`)
const clientPrivateKeyArn = getCFConfigValue(exports, `account-resources:${clientPrivateKeyExportName}`)
const proxygenPrivateKeyArn = getCFConfigValue(exports, `account-resources:${proxygenPrivateKeyExportName}`)

let put_secret_lambda = "lambda-resources-ProxygenPTLMTLSSecretPut"
Expand All @@ -76,8 +74,8 @@ export async function deployApi(
apiName,
environment: apigeeEnvironment,
secretName: mtlsSecretName,
secretKeyName: clientPrivateKeyArn,
secretCertName: clientCertArn,
secretKey: clientPrivateKey,
secretCert: clientCert,
kid: proxygenKid,
proxygenSecretName: proxygenPrivateKeyArn
}
Expand Down
10 changes: 4 additions & 6 deletions packages/deploymentUtils/tests/specifications/deployApi.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ function createSpec(overrides: SpecOverrides = {}) {
}

const defaultExportsMap = {
"account-resources:clientCert": "arn:client-cert",
"account-resources:clientKey": "arn:client-key",
"account-resources:proxygenKey": "arn:proxygen-key"
}

Expand All @@ -80,8 +78,8 @@ function buildConfig(overrides: Partial<ApiConfig> = {}): ApiConfig {
awsEnvironment: "nonprod",
stackName: "eps-stack-001",
mtlsSecretName: "mtls/secret",
clientCertExportName: "clientCert",
clientPrivateKeyExportName: "clientKey",
clientCert: "clientCert",
clientPrivateKey: "clientKey",
proxygenPrivateKeyExportName: "proxygenKey",
proxygenKid: "kid-123",
hiddenPaths: [],
Expand Down Expand Up @@ -125,8 +123,8 @@ describe("deployApi", () => {
apiName: "eps",
environment: "internal-dev",
secretName: "mtls/secret",
secretKeyName: "arn:client-key",
secretCertName: "arn:client-cert",
secretKey: "clientKey",
secretCert: "clientCert",
kid: "kid-123",
proxygenSecretName: "arn:proxygen-key"
})
Expand Down