diff --git a/packages/@aws-cdk/aws-eks/lib/oidc-provider.ts b/packages/@aws-cdk/aws-eks/lib/oidc-provider.ts index 5a3e90b1bdc38..ae0e7b0411689 100644 --- a/packages/@aws-cdk/aws-eks/lib/oidc-provider.ts +++ b/packages/@aws-cdk/aws-eks/lib/oidc-provider.ts @@ -41,18 +41,10 @@ export class OpenIdConnectProvider extends iam.OpenIdConnectProvider { * @param props Initialization properties */ public constructor(scope: Construct, id: string, props: OpenIdConnectProviderProps) { - /** - * For some reason EKS isn't validating the root certificate but a intermediate certificate - * which is one level up in the tree. Because of the a constant thumbprint value has to be - * stated with this OpenID Connect provider. The certificate thumbprint is the same for all the regions. - */ - const thumbprints = ['9e99a48a9960b14926bb7f3b02e22da2b0ab7280']; - const clientIds = ['sts.amazonaws.com']; super(scope, id, { url: props.url, - thumbprints, clientIds, }); } diff --git a/packages/@aws-cdk/aws-eks/test/cluster.test.ts b/packages/@aws-cdk/aws-eks/test/cluster.test.ts index 23041760e452f..2469264f6de28 100644 --- a/packages/@aws-cdk/aws-eks/test/cluster.test.ts +++ b/packages/@aws-cdk/aws-eks/test/cluster.test.ts @@ -2156,9 +2156,6 @@ describe('cluster', () => { ClientIDList: [ 'sts.amazonaws.com', ], - ThumbprintList: [ - '9e99a48a9960b14926bb7f3b02e22da2b0ab7280', - ], Url: { 'Fn::GetAtt': [ 'Cluster9EE0221C', diff --git a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.4288ebb3652acdf2d828b7db7ca44a7162a401ace50ebb4026e84b18a02a06ee.zip b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.4288ebb3652acdf2d828b7db7ca44a7162a401ace50ebb4026e84b18a02a06ee.zip index bea20c7049002..4b95260872643 100644 Binary files a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.4288ebb3652acdf2d828b7db7ca44a7162a401ace50ebb4026e84b18a02a06ee.zip and b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.4288ebb3652acdf2d828b7db7ca44a7162a401ace50ebb4026e84b18a02a06ee.zip differ diff --git a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.d.ts b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.d.ts deleted file mode 100644 index 53962e1f09938..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export declare function arrayDiff(oldValues: string[], newValues: string[]): { - adds: string[]; - deletes: string[]; -}; diff --git a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.ts b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.ts deleted file mode 100644 index 8a91e6ebddc53..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.ts +++ /dev/null @@ -1,17 +0,0 @@ -export function arrayDiff(oldValues: string[], newValues: string[]) { - const deletes = new Set(oldValues); - const adds = new Set(); - - for (const v of new Set(newValues)) { - if (deletes.has(v)) { - deletes.delete(v); - } else { - adds.add(v); - } - } - - return { - adds: Array.from(adds), - deletes: Array.from(deletes), - }; -} diff --git a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.d.ts b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.d.ts deleted file mode 100644 index 8fe88b8f82209..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.d.ts +++ /dev/null @@ -1,24 +0,0 @@ -import * as aws from 'aws-sdk'; -declare function defaultLogger(fmt: string, ...args: any[]): void; -/** - * Downloads the CA thumbprint from the issuer URL - */ -declare function downloadThumbprint(issuerUrl: string): Promise; -export declare const external: { - downloadThumbprint: typeof downloadThumbprint; - log: typeof defaultLogger; - createOpenIDConnectProvider: (req: aws.IAM.CreateOpenIDConnectProviderRequest) => Promise>; - deleteOpenIDConnectProvider: (req: aws.IAM.DeleteOpenIDConnectProviderRequest) => Promise<{ - $response: aws.Response<{}, aws.AWSError>; - }>; - updateOpenIDConnectProviderThumbprint: (req: aws.IAM.UpdateOpenIDConnectProviderThumbprintRequest) => Promise<{ - $response: aws.Response<{}, aws.AWSError>; - }>; - addClientIDToOpenIDConnectProvider: (req: aws.IAM.AddClientIDToOpenIDConnectProviderRequest) => Promise<{ - $response: aws.Response<{}, aws.AWSError>; - }>; - removeClientIDFromOpenIDConnectProvider: (req: aws.IAM.RemoveClientIDFromOpenIDConnectProviderRequest) => Promise<{ - $response: aws.Response<{}, aws.AWSError>; - }>; -}; -export {}; diff --git a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.js b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.js deleted file mode 100644 index 2f6632aed7b13..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.js +++ /dev/null @@ -1,53 +0,0 @@ -"use strict"; -/* istanbul ignore file */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.external = void 0; -const tls = require("tls"); -const url = require("url"); -// eslint-disable-next-line import/no-extraneous-dependencies -const aws = require("aws-sdk"); -let client; -function iam() { - if (!client) { - client = new aws.IAM(); - } - return client; -} -function defaultLogger(fmt, ...args) { - // eslint-disable-next-line no-console - console.log(fmt, ...args); -} -/** - * Downloads the CA thumbprint from the issuer URL - */ -async function downloadThumbprint(issuerUrl) { - exports.external.log(`downloading certificate authority thumbprint for ${issuerUrl}`); - return new Promise((ok, ko) => { - const purl = url.parse(issuerUrl); - const port = purl.port ? parseInt(purl.port, 10) : 443; - if (!purl.host) { - return ko(new Error(`unable to determine host from issuer url ${issuerUrl}`)); - } - const socket = tls.connect(port, purl.host, { rejectUnauthorized: false, servername: purl.host }); - socket.once('error', ko); - socket.once('secureConnect', () => { - const cert = socket.getPeerCertificate(); - socket.end(); - const thumbprint = cert.fingerprint.split(':').join(''); - exports.external.log(`certificate authority thumbprint for ${issuerUrl} is ${thumbprint}`); - ok(thumbprint); - }); - }); -} -// allows unit test to replace with mocks -/* eslint-disable max-len */ -exports.external = { - downloadThumbprint, - log: defaultLogger, - createOpenIDConnectProvider: (req) => iam().createOpenIDConnectProvider(req).promise(), - deleteOpenIDConnectProvider: (req) => iam().deleteOpenIDConnectProvider(req).promise(), - updateOpenIDConnectProviderThumbprint: (req) => iam().updateOpenIDConnectProviderThumbprint(req).promise(), - addClientIDToOpenIDConnectProvider: (req) => iam().addClientIDToOpenIDConnectProvider(req).promise(), - removeClientIDFromOpenIDConnectProvider: (req) => iam().removeClientIDFromOpenIDConnectProvider(req).promise(), -}; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXh0ZXJuYWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJleHRlcm5hbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQTBCOzs7QUFFMUIsMkJBQTJCO0FBQzNCLDJCQUEyQjtBQUMzQiw2REFBNkQ7QUFDN0QsK0JBQStCO0FBRS9CLElBQUksTUFBZSxDQUFDO0FBRXBCLFNBQVMsR0FBRztJQUNWLElBQUksQ0FBQyxNQUFNLEVBQUU7UUFBRSxNQUFNLEdBQUcsSUFBSSxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUM7S0FBRTtJQUN4QyxPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDO0FBRUQsU0FBUyxhQUFhLENBQUMsR0FBVyxFQUFFLEdBQUcsSUFBVztJQUNoRCxzQ0FBc0M7SUFDdEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQztBQUM1QixDQUFDO0FBRUQ7O0dBRUc7QUFDSCxLQUFLLFVBQVUsa0JBQWtCLENBQUMsU0FBaUI7SUFDakQsZ0JBQVEsQ0FBQyxHQUFHLENBQUMsb0RBQW9ELFNBQVMsRUFBRSxDQUFDLENBQUM7SUFDOUUsT0FBTyxJQUFJLE9BQU8sQ0FBUyxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRTtRQUNwQyxNQUFNLElBQUksR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ2xDLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUM7UUFDdkQsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUU7WUFDZCxPQUFPLEVBQUUsQ0FBQyxJQUFJLEtBQUssQ0FBQyw0Q0FBNEMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDO1NBQy9FO1FBQ0QsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxFQUFFLGtCQUFrQixFQUFFLEtBQUssRUFBRSxVQUFVLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7UUFDbEcsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDekIsTUFBTSxDQUFDLElBQUksQ0FBQyxlQUFlLEVBQUUsR0FBRyxFQUFFO1lBQ2hDLE1BQU0sSUFBSSxHQUFHLE1BQU0sQ0FBQyxrQkFBa0IsRUFBRSxDQUFDO1lBQ3pDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUNiLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUN4RCxnQkFBUSxDQUFDLEdBQUcsQ0FBQyx3Q0FBd0MsU0FBUyxPQUFPLFVBQVUsRUFBRSxDQUFDLENBQUM7WUFDbkYsRUFBRSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ2pCLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBRUQseUNBQXlDO0FBQ3pDLDRCQUE0QjtBQUNmLFFBQUEsUUFBUSxHQUFHO0lBQ3RCLGtCQUFrQjtJQUNsQixHQUFHLEVBQUUsYUFBYTtJQUNsQiwyQkFBMkIsRUFBRSxDQUFDLEdBQStDLEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLDJCQUEyQixDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtJQUNsSSwyQkFBMkIsRUFBRSxDQUFDLEdBQStDLEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLDJCQUEyQixDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtJQUNsSSxxQ0FBcUMsRUFBRSxDQUFDLEdBQXlELEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLHFDQUFxQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtJQUNoSyxrQ0FBa0MsRUFBRSxDQUFDLEdBQXNELEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLGtDQUFrQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtJQUN2Six1Q0FBdUMsRUFBRSxDQUFDLEdBQTJELEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLHVDQUF1QyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtDQUN2SyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyogaXN0YW5idWwgaWdub3JlIGZpbGUgKi9cblxuaW1wb3J0ICogYXMgdGxzIGZyb20gJ3Rscyc7XG5pbXBvcnQgKiBhcyB1cmwgZnJvbSAndXJsJztcbi8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBpbXBvcnQvbm8tZXh0cmFuZW91cy1kZXBlbmRlbmNpZXNcbmltcG9ydCAqIGFzIGF3cyBmcm9tICdhd3Mtc2RrJztcblxubGV0IGNsaWVudDogYXdzLklBTTtcblxuZnVuY3Rpb24gaWFtKCkge1xuICBpZiAoIWNsaWVudCkgeyBjbGllbnQgPSBuZXcgYXdzLklBTSgpOyB9XG4gIHJldHVybiBjbGllbnQ7XG59XG5cbmZ1bmN0aW9uIGRlZmF1bHRMb2dnZXIoZm10OiBzdHJpbmcsIC4uLmFyZ3M6IGFueVtdKSB7XG4gIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBuby1jb25zb2xlXG4gIGNvbnNvbGUubG9nKGZtdCwgLi4uYXJncyk7XG59XG5cbi8qKlxuICogRG93bmxvYWRzIHRoZSBDQSB0aHVtYnByaW50IGZyb20gdGhlIGlzc3VlciBVUkxcbiAqL1xuYXN5bmMgZnVuY3Rpb24gZG93bmxvYWRUaHVtYnByaW50KGlzc3VlclVybDogc3RyaW5nKSB7XG4gIGV4dGVybmFsLmxvZyhgZG93bmxvYWRpbmcgY2VydGlmaWNhdGUgYXV0aG9yaXR5IHRodW1icHJpbnQgZm9yICR7aXNzdWVyVXJsfWApO1xuICByZXR1cm4gbmV3IFByb21pc2U8c3RyaW5nPigob2ssIGtvKSA9PiB7XG4gICAgY29uc3QgcHVybCA9IHVybC5wYXJzZShpc3N1ZXJVcmwpO1xuICAgIGNvbnN0IHBvcnQgPSBwdXJsLnBvcnQgPyBwYXJzZUludChwdXJsLnBvcnQsIDEwKSA6IDQ0MztcbiAgICBpZiAoIXB1cmwuaG9zdCkge1xuICAgICAgcmV0dXJuIGtvKG5ldyBFcnJvcihgdW5hYmxlIHRvIGRldGVybWluZSBob3N0IGZyb20gaXNzdWVyIHVybCAke2lzc3VlclVybH1gKSk7XG4gICAgfVxuICAgIGNvbnN0IHNvY2tldCA9IHRscy5jb25uZWN0KHBvcnQsIHB1cmwuaG9zdCwgeyByZWplY3RVbmF1dGhvcml6ZWQ6IGZhbHNlLCBzZXJ2ZXJuYW1lOiBwdXJsLmhvc3QgfSk7XG4gICAgc29ja2V0Lm9uY2UoJ2Vycm9yJywga28pO1xuICAgIHNvY2tldC5vbmNlKCdzZWN1cmVDb25uZWN0JywgKCkgPT4ge1xuICAgICAgY29uc3QgY2VydCA9IHNvY2tldC5nZXRQZWVyQ2VydGlmaWNhdGUoKTtcbiAgICAgIHNvY2tldC5lbmQoKTtcbiAgICAgIGNvbnN0IHRodW1icHJpbnQgPSBjZXJ0LmZpbmdlcnByaW50LnNwbGl0KCc6Jykuam9pbignJyk7XG4gICAgICBleHRlcm5hbC5sb2coYGNlcnRpZmljYXRlIGF1dGhvcml0eSB0aHVtYnByaW50IGZvciAke2lzc3VlclVybH0gaXMgJHt0aHVtYnByaW50fWApO1xuICAgICAgb2sodGh1bWJwcmludCk7XG4gICAgfSk7XG4gIH0pO1xufVxuXG4vLyBhbGxvd3MgdW5pdCB0ZXN0IHRvIHJlcGxhY2Ugd2l0aCBtb2Nrc1xuLyogZXNsaW50LWRpc2FibGUgbWF4LWxlbiAqL1xuZXhwb3J0IGNvbnN0IGV4dGVybmFsID0ge1xuICBkb3dubG9hZFRodW1icHJpbnQsXG4gIGxvZzogZGVmYXVsdExvZ2dlcixcbiAgY3JlYXRlT3BlbklEQ29ubmVjdFByb3ZpZGVyOiAocmVxOiBhd3MuSUFNLkNyZWF0ZU9wZW5JRENvbm5lY3RQcm92aWRlclJlcXVlc3QpID0+IGlhbSgpLmNyZWF0ZU9wZW5JRENvbm5lY3RQcm92aWRlcihyZXEpLnByb21pc2UoKSxcbiAgZGVsZXRlT3BlbklEQ29ubmVjdFByb3ZpZGVyOiAocmVxOiBhd3MuSUFNLkRlbGV0ZU9wZW5JRENvbm5lY3RQcm92aWRlclJlcXVlc3QpID0+IGlhbSgpLmRlbGV0ZU9wZW5JRENvbm5lY3RQcm92aWRlcihyZXEpLnByb21pc2UoKSxcbiAgdXBkYXRlT3BlbklEQ29ubmVjdFByb3ZpZGVyVGh1bWJwcmludDogKHJlcTogYXdzLklBTS5VcGRhdGVPcGVuSURDb25uZWN0UHJvdmlkZXJUaHVtYnByaW50UmVxdWVzdCkgPT4gaWFtKCkudXBkYXRlT3BlbklEQ29ubmVjdFByb3ZpZGVyVGh1bWJwcmludChyZXEpLnByb21pc2UoKSxcbiAgYWRkQ2xpZW50SURUb09wZW5JRENvbm5lY3RQcm92aWRlcjogKHJlcTogYXdzLklBTS5BZGRDbGllbnRJRFRvT3BlbklEQ29ubmVjdFByb3ZpZGVyUmVxdWVzdCkgPT4gaWFtKCkuYWRkQ2xpZW50SURUb09wZW5JRENvbm5lY3RQcm92aWRlcihyZXEpLnByb21pc2UoKSxcbiAgcmVtb3ZlQ2xpZW50SURGcm9tT3BlbklEQ29ubmVjdFByb3ZpZGVyOiAocmVxOiBhd3MuSUFNLlJlbW92ZUNsaWVudElERnJvbU9wZW5JRENvbm5lY3RQcm92aWRlclJlcXVlc3QpID0+IGlhbSgpLnJlbW92ZUNsaWVudElERnJvbU9wZW5JRENvbm5lY3RQcm92aWRlcihyZXEpLnByb21pc2UoKSxcbn07XG4iXX0= \ No newline at end of file diff --git a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.ts b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.ts deleted file mode 100644 index 4ad18aed4f17d..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.ts +++ /dev/null @@ -1,53 +0,0 @@ -/* istanbul ignore file */ - -import * as tls from 'tls'; -import * as url from 'url'; -// eslint-disable-next-line import/no-extraneous-dependencies -import * as aws from 'aws-sdk'; - -let client: aws.IAM; - -function iam() { - if (!client) { client = new aws.IAM(); } - return client; -} - -function defaultLogger(fmt: string, ...args: any[]) { - // eslint-disable-next-line no-console - console.log(fmt, ...args); -} - -/** - * Downloads the CA thumbprint from the issuer URL - */ -async function downloadThumbprint(issuerUrl: string) { - external.log(`downloading certificate authority thumbprint for ${issuerUrl}`); - return new Promise((ok, ko) => { - const purl = url.parse(issuerUrl); - const port = purl.port ? parseInt(purl.port, 10) : 443; - if (!purl.host) { - return ko(new Error(`unable to determine host from issuer url ${issuerUrl}`)); - } - const socket = tls.connect(port, purl.host, { rejectUnauthorized: false, servername: purl.host }); - socket.once('error', ko); - socket.once('secureConnect', () => { - const cert = socket.getPeerCertificate(); - socket.end(); - const thumbprint = cert.fingerprint.split(':').join(''); - external.log(`certificate authority thumbprint for ${issuerUrl} is ${thumbprint}`); - ok(thumbprint); - }); - }); -} - -// allows unit test to replace with mocks -/* eslint-disable max-len */ -export const external = { - downloadThumbprint, - log: defaultLogger, - createOpenIDConnectProvider: (req: aws.IAM.CreateOpenIDConnectProviderRequest) => iam().createOpenIDConnectProvider(req).promise(), - deleteOpenIDConnectProvider: (req: aws.IAM.DeleteOpenIDConnectProviderRequest) => iam().deleteOpenIDConnectProvider(req).promise(), - updateOpenIDConnectProviderThumbprint: (req: aws.IAM.UpdateOpenIDConnectProviderThumbprintRequest) => iam().updateOpenIDConnectProviderThumbprint(req).promise(), - addClientIDToOpenIDConnectProvider: (req: aws.IAM.AddClientIDToOpenIDConnectProviderRequest) => iam().addClientIDToOpenIDConnectProvider(req).promise(), - removeClientIDFromOpenIDConnectProvider: (req: aws.IAM.RemoveClientIDFromOpenIDConnectProviderRequest) => iam().removeClientIDFromOpenIDConnectProvider(req).promise(), -}; diff --git a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.d.ts b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.d.ts deleted file mode 100644 index 038b626561d4a..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export declare function handler(event: AWSLambda.CloudFormationCustomResourceEvent): Promise; diff --git a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.ts b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.ts deleted file mode 100644 index ee276edd3fa9b..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.ts +++ /dev/null @@ -1,89 +0,0 @@ -import { arrayDiff } from './diff'; -import { external } from './external'; - -export async function handler(event: AWSLambda.CloudFormationCustomResourceEvent) { - if (event.RequestType === 'Create') { return onCreate(event); } - if (event.RequestType === 'Update') { return onUpdate(event); } - if (event.RequestType === 'Delete') { return onDelete(event); } - throw new Error('invalid request type'); -} - -async function onCreate(event: AWSLambda.CloudFormationCustomResourceCreateEvent) { - const issuerUrl = event.ResourceProperties.Url; - const thumbprints: string[] = (event.ResourceProperties.ThumbprintList ?? []).sort(); // keep sorted for UPDATE - const clients: string[] = (event.ResourceProperties.ClientIDList ?? []).sort(); - - if (thumbprints.length === 0) { - thumbprints.push(await external.downloadThumbprint(issuerUrl)); - } - - const resp = await external.createOpenIDConnectProvider({ - Url: issuerUrl, - ClientIDList: clients, - ThumbprintList: thumbprints, - }); - - return { - PhysicalResourceId: resp.OpenIDConnectProviderArn, - }; -} - -async function onUpdate(event: AWSLambda.CloudFormationCustomResourceUpdateEvent) { - const issuerUrl = event.ResourceProperties.Url; - const thumbprints: string[] = (event.ResourceProperties.ThumbprintList ?? []).sort(); // keep sorted for UPDATE - const clients: string[] = (event.ResourceProperties.ClientIDList ?? []).sort(); - - // determine which update we are talking about. - const oldIssuerUrl = event.OldResourceProperties.Url; - - // if this is a URL update, then we basically create a new resource and cfn will delete the old one - // since the physical resource ID will change. - if (oldIssuerUrl !== issuerUrl) { - return onCreate({ ...event, RequestType: 'Create' }); - } - - const providerArn = event.PhysicalResourceId; - - // if thumbprints changed, we can update in-place, but bear in mind that if the new thumbprint list - // is empty, we will grab it from the server like we do in CREATE - const oldThumbprints = (event.OldResourceProperties.ThumbprintList || []).sort(); - if (JSON.stringify(oldThumbprints) !== JSON.stringify(thumbprints)) { - const thumbprintList = thumbprints.length > 0 ? thumbprints : [await external.downloadThumbprint(issuerUrl)]; - external.log('updating thumbprint list from', oldThumbprints, 'to', thumbprints); - await external.updateOpenIDConnectProviderThumbprint({ - OpenIDConnectProviderArn: providerArn, - ThumbprintList: thumbprintList, - }); - - // don't return, we might have more updates... - } - - // if client ID list has changed, determine "diff" because the API is add/remove - const oldClients: string[] = (event.OldResourceProperties.ClientIDList || []).sort(); - const diff = arrayDiff(oldClients, clients); - external.log(`client ID diff: ${JSON.stringify(diff)}`); - - for (const addClient of diff.adds) { - external.log(`adding client id "${addClient}" to provider ${providerArn}`); - await external.addClientIDToOpenIDConnectProvider({ - OpenIDConnectProviderArn: providerArn, - ClientID: addClient, - }); - } - - for (const deleteClient of diff.deletes) { - external.log(`removing client id "${deleteClient}" from provider ${providerArn}`); - await external.removeClientIDFromOpenIDConnectProvider({ - OpenIDConnectProviderArn: providerArn, - ClientID: deleteClient, - }); - } - - return; -} - -async function onDelete(deleteEvent: AWSLambda.CloudFormationCustomResourceDeleteEvent) { - await external.deleteOpenIDConnectProvider({ - OpenIDConnectProviderArn: deleteEvent.PhysicalResourceId, - }); -} diff --git a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/__entrypoint__.js b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/__entrypoint__.js similarity index 100% rename from packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/__entrypoint__.js rename to packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/__entrypoint__.js diff --git a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.js b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/diff.js similarity index 100% rename from packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.js rename to packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/diff.js diff --git a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/external.js b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/external.js new file mode 100644 index 0000000000000..7d8c6e611c70b --- /dev/null +++ b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/external.js @@ -0,0 +1,88 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.external = exports.downloadThumbprint = void 0; +const util = require("node:util"); +const tls = require("tls"); +const url = require("url"); +// eslint-disable-next-line import/no-extraneous-dependencies +const aws = require("aws-sdk"); +let client; +function iam() { + if (!client) { + client = new aws.IAM(); + } + return client; +} +function defaultLogger(fmt, ...args) { + // eslint-disable-next-line no-console + console.log(fmt, ...args); +} +/** + * Downloads the CA thumbprint from the issuer URL + */ +async function downloadThumbprint(issuerUrl) { + exports.external.log(`Downloading certificate authority thumbprint for ${issuerUrl}`); + return new Promise((ok, ko) => { + const purl = url.parse(issuerUrl); + const port = purl.port ? parseInt(purl.port, 10) : 443; + if (!purl.host) { + return ko(new Error(`unable to determine host from issuer url ${issuerUrl}`)); + } + const socket = tls.connect(port, purl.host, { rejectUnauthorized: false, servername: purl.host }); + socket.once('error', ko); + socket.once('secureConnect', () => { + // This set to `true` would return the entire chain of certificates as a circular reference object + let cert = socket.getPeerCertificate(true); + const unqiueCerts = new Set(); + do { + unqiueCerts.add(cert); + cert = cert.issuerCertificate; + } while (cert && typeof cert === 'object' && !unqiueCerts.has(cert)); + // The last `cert` obtained must be the root certificate in the certificate chain + const rootCert = [...unqiueCerts].pop(); + // Add `ca: true` when node merges the feature. Awaiting resolution: https://github.com/nodejs/node/issues/44905 + if (!(util.isDeepStrictEqual(rootCert.issuer, rootCert.subject))) { + return ko(new Error(`Subject and Issuer of certificate received are different. + Received: \'Subject\' is ${JSON.stringify(rootCert.subject, null, 4)} and \'Issuer\':${JSON.stringify(rootCert.issuer, null, 4)}`)); + } + const validTo = new Date(rootCert.valid_to); + const certificateValidity = getCertificateValidity(validTo); + if (certificateValidity < 0) { + return ko(new Error(`The certificate has already expired on: ${validTo.toUTCString()}`)); + } + // Warning user if certificate validity is expiring within 6 months + if (certificateValidity < 180) { + /* eslint-disable-next-line no-console */ + console.warn(`The root certificate obtained would expire in ${certificateValidity} days!`); + } + socket.end(); + const thumbprint = rootCert.fingerprint.split(':').join(''); + exports.external.log(`Certificate Authority thumbprint for ${issuerUrl} is ${thumbprint}`); + ok(thumbprint); + }); + }); +} +exports.downloadThumbprint = downloadThumbprint; +/** + * To get the validity timeline for the certificate + * @param certDate The valid to date for the certificate + * @returns The number of days the certificate is valid wrt current date + */ +function getCertificateValidity(certDate) { + const millisecondsInDay = 24 * 60 * 60 * 1000; + const currentDate = new Date(); + const validity = Math.round((certDate.getTime() - currentDate.getTime()) / millisecondsInDay); + return validity; +} +// allows unit test to replace with mocks +/* eslint-disable max-len */ +exports.external = { + downloadThumbprint, + log: defaultLogger, + createOpenIDConnectProvider: (req) => iam().createOpenIDConnectProvider(req).promise(), + deleteOpenIDConnectProvider: (req) => iam().deleteOpenIDConnectProvider(req).promise(), + updateOpenIDConnectProviderThumbprint: (req) => iam().updateOpenIDConnectProviderThumbprint(req).promise(), + addClientIDToOpenIDConnectProvider: (req) => iam().addClientIDToOpenIDConnectProvider(req).promise(), + removeClientIDFromOpenIDConnectProvider: (req) => iam().removeClientIDFromOpenIDConnectProvider(req).promise(), +}; +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"external.js","sourceRoot":"","sources":["external.ts"],"names":[],"mappings":"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","sourcesContent":["/* istanbul ignore file */\nimport { DetailedPeerCertificate } from 'node:tls';\nimport * as util from 'node:util';\nimport * as tls from 'tls';\nimport * as url from 'url';\n// eslint-disable-next-line import/no-extraneous-dependencies\nimport * as aws from 'aws-sdk';\n\nlet client: aws.IAM;\n\nfunction iam() {\n  if (!client) { client = new aws.IAM(); }\n  return client;\n}\n\nfunction defaultLogger(fmt: string, ...args: any[]) {\n  // eslint-disable-next-line no-console\n  console.log(fmt, ...args);\n}\n\n/**\n * Downloads the CA thumbprint from the issuer URL\n */\nexport async function downloadThumbprint(issuerUrl: string) {\n\n  external.log(`Downloading certificate authority thumbprint for ${issuerUrl}`);\n\n  return new Promise<string>((ok, ko) => {\n    const purl = url.parse(issuerUrl);\n    const port = purl.port ? parseInt(purl.port, 10) : 443;\n\n    if (!purl.host) {\n      return ko(new Error(`unable to determine host from issuer url ${issuerUrl}`));\n    }\n\n    const socket = tls.connect(port, purl.host, { rejectUnauthorized: false, servername: purl.host });\n    socket.once('error', ko);\n\n    socket.once('secureConnect', () => {\n      // This set to `true` would return the entire chain of certificates as a circular reference object\n      let cert = socket.getPeerCertificate(true);\n\n      const unqiueCerts = new Set<DetailedPeerCertificate>();\n      do {\n        unqiueCerts.add(cert);\n        cert = cert.issuerCertificate;\n      } while ( cert && typeof cert === 'object' && !unqiueCerts.has(cert));\n\n      // The last `cert` obtained must be the root certificate in the certificate chain\n      const rootCert = [...unqiueCerts].pop()!;\n\n      // Add `ca: true` when node merges the feature. Awaiting resolution: https://github.com/nodejs/node/issues/44905\n      if (!(util.isDeepStrictEqual(rootCert.issuer, rootCert.subject))) {\n        return ko(new Error(`Subject and Issuer of certificate received are different. \n        Received: \\'Subject\\' is ${JSON.stringify(rootCert.subject, null, 4)} and \\'Issuer\\':${JSON.stringify(rootCert.issuer, null, 4)}`));\n      }\n\n      const validTo = new Date(rootCert.valid_to);\n      const certificateValidity = getCertificateValidity(validTo);\n\n      if (certificateValidity < 0) {\n        return ko(new Error(`The certificate has already expired on: ${validTo.toUTCString()}`));\n      }\n\n      // Warning user if certificate validity is expiring within 6 months\n      if (certificateValidity < 180) {\n        /* eslint-disable-next-line no-console */\n        console.warn(`The root certificate obtained would expire in ${certificateValidity} days!`);\n      }\n\n      socket.end();\n\n      const thumbprint = rootCert.fingerprint.split(':').join('');\n      external.log(`Certificate Authority thumbprint for ${issuerUrl} is ${thumbprint}`);\n\n      ok(thumbprint);\n    });\n  });\n}\n\n/**\n * To get the validity timeline for the certificate\n * @param certDate The valid to date for the certificate\n * @returns The number of days the certificate is valid wrt current date\n */\nfunction getCertificateValidity(certDate: Date): Number {\n  const millisecondsInDay = 24 * 60 * 60 * 1000;\n  const currentDate = new Date();\n\n  const validity = Math.round((certDate.getTime() - currentDate.getTime()) / millisecondsInDay);\n\n  return validity;\n}\n\n// allows unit test to replace with mocks\n/* eslint-disable max-len */\nexport const external = {\n  downloadThumbprint,\n  log: defaultLogger,\n  createOpenIDConnectProvider: (req: aws.IAM.CreateOpenIDConnectProviderRequest) => iam().createOpenIDConnectProvider(req).promise(),\n  deleteOpenIDConnectProvider: (req: aws.IAM.DeleteOpenIDConnectProviderRequest) => iam().deleteOpenIDConnectProvider(req).promise(),\n  updateOpenIDConnectProviderThumbprint: (req: aws.IAM.UpdateOpenIDConnectProviderThumbprintRequest) => iam().updateOpenIDConnectProviderThumbprint(req).promise(),\n  addClientIDToOpenIDConnectProvider: (req: aws.IAM.AddClientIDToOpenIDConnectProviderRequest) => iam().addClientIDToOpenIDConnectProvider(req).promise(),\n  removeClientIDFromOpenIDConnectProvider: (req: aws.IAM.RemoveClientIDFromOpenIDConnectProviderRequest) => iam().removeClientIDFromOpenIDConnectProvider(req).promise(),\n};\n"]} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.js b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/index.js similarity index 100% rename from packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.js rename to packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/index.js diff --git a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.d.ts b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.d.ts deleted file mode 100644 index 35c3d8f5c637f..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.d.ts +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Supported resource type. - */ -export declare const enum CfnUtilsResourceType { - /** - * CfnJson - */ - CFN_JSON = "Custom::AWSCDKCfnJson", - /** - * CfnJsonStringify - */ - CFN_JSON_STRINGIFY = "Custom::AWSCDKCfnJsonStringify" -} diff --git a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.ts b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.ts deleted file mode 100644 index 9718dcef40645..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.ts +++ /dev/null @@ -1,14 +0,0 @@ -/** - * Supported resource type. - */ -export const enum CfnUtilsResourceType { - /** - * CfnJson - */ - CFN_JSON = 'Custom::AWSCDKCfnJson', - - /** - * CfnJsonStringify - */ - CFN_JSON_STRINGIFY = 'Custom::AWSCDKCfnJsonStringify', -} diff --git a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.d.ts b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.d.ts deleted file mode 100644 index b228aec7fd8cc..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/** - * Parses the value of "Value" and reflects it back as attribute. - */ -export declare function handler(event: AWSLambda.CloudFormationCustomResourceEvent): Promise<{ - Data: { - Value: any; - }; -}>; diff --git a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.ts b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.ts deleted file mode 100644 index f082001f80159..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { CfnUtilsResourceType } from './consts'; - -/** - * Parses the value of "Value" and reflects it back as attribute. - */ -export async function handler(event: AWSLambda.CloudFormationCustomResourceEvent) { - - // dispatch based on resource type - if (event.ResourceType === CfnUtilsResourceType.CFN_JSON) { - return cfnJsonHandler(event); - } - if (event.ResourceType === CfnUtilsResourceType.CFN_JSON_STRINGIFY) { - return cfnJsonStringifyHandler(event); - } - - throw new Error(`unexpected resource type "${event.ResourceType}`); -} - -function cfnJsonHandler(event: AWSLambda.CloudFormationCustomResourceEvent) { - return { - Data: { - Value: JSON.parse(event.ResourceProperties.Value), - }, - }; -} - -function cfnJsonStringifyHandler(event: AWSLambda.CloudFormationCustomResourceEvent) { - return { - Data: { - Value: JSON.stringify(event.ResourceProperties.Value), - }, - }; -} diff --git a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip index 4b3aea09155c1..8097ad2422b72 100644 Binary files a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip and b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip differ diff --git a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/__entrypoint__.js b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a/__entrypoint__.js similarity index 100% rename from packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/__entrypoint__.js rename to packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a/__entrypoint__.js diff --git a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.js b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a/consts.js similarity index 100% rename from packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.js rename to packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a/consts.js diff --git a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.js b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a/index.js similarity index 100% rename from packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.js rename to packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/asset.f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a/index.js diff --git a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/aws-cdk-eks-cluster-alb-controller-test.assets.json b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/aws-cdk-eks-cluster-alb-controller-test.assets.json index a5a15070c9784..67b4bfa356a5d 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/aws-cdk-eks-cluster-alb-controller-test.assets.json +++ b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/aws-cdk-eks-cluster-alb-controller-test.assets.json @@ -79,28 +79,28 @@ } } }, - "42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174": { + "b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3": { "source": { - "path": "asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174", + "path": "asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3", "packaging": "zip" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174.zip", + "objectKey": "b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3": { + "f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a": { "source": { - "path": "asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3", + "path": "asset.f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a", "packaging": "zip" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3.zip", + "objectKey": "f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } @@ -144,7 +144,7 @@ } } }, - "b979a26c3b4dd2602b0c309245ef44500e5b3879b1823d4dc7c488bd93b98fa0": { + "2a37b5f78157b93b9cbdc03beb4a8849536cb7108aa484032e7921ddcf3c129b": { "source": { "path": "aws-cdk-eks-cluster-alb-controller-test.template.json", "packaging": "file" @@ -152,7 +152,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "b979a26c3b4dd2602b0c309245ef44500e5b3879b1823d4dc7c488bd93b98fa0.json", + "objectKey": "2a37b5f78157b93b9cbdc03beb4a8849536cb7108aa484032e7921ddcf3c129b.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/aws-cdk-eks-cluster-alb-controller-test.template.json b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/aws-cdk-eks-cluster-alb-controller-test.template.json index 759e0ceb37a58..d95b81b5ba13a 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/aws-cdk-eks-cluster-alb-controller-test.template.json +++ b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/aws-cdk-eks-cluster-alb-controller-test.template.json @@ -790,9 +790,6 @@ "ClientIDList": [ "sts.amazonaws.com" ], - "ThumbprintList": [ - "9e99a48a9960b14926bb7f3b02e22da2b0ab7280" - ], "Url": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1490,7 +1487,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174.zip" + "S3Key": "b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3.zip" }, "Timeout": 900, "MemorySize": 128, @@ -1536,7 +1533,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3.zip" + "S3Key": "f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/manifest.json b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/manifest.json index 086975ebc37eb..2c463459d9e21 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/manifest.json +++ b/packages/@aws-cdk/aws-eks/test/integ.alb-controller.js.snapshot/manifest.json @@ -23,7 +23,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/b979a26c3b4dd2602b0c309245ef44500e5b3879b1823d4dc7c488bd93b98fa0.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/2a37b5f78157b93b9cbdc03beb4a8849536cb7108aa484032e7921ddcf3c129b.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.4288ebb3652acdf2d828b7db7ca44a7162a401ace50ebb4026e84b18a02a06ee.zip b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.4288ebb3652acdf2d828b7db7ca44a7162a401ace50ebb4026e84b18a02a06ee.zip index 2b34405599fa0..4b95260872643 100644 Binary files a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.4288ebb3652acdf2d828b7db7ca44a7162a401ace50ebb4026e84b18a02a06ee.zip and b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.4288ebb3652acdf2d828b7db7ca44a7162a401ace50ebb4026e84b18a02a06ee.zip differ diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.d.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.d.ts deleted file mode 100644 index 53962e1f09938..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export declare function arrayDiff(oldValues: string[], newValues: string[]): { - adds: string[]; - deletes: string[]; -}; diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.ts deleted file mode 100644 index 8a91e6ebddc53..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.ts +++ /dev/null @@ -1,17 +0,0 @@ -export function arrayDiff(oldValues: string[], newValues: string[]) { - const deletes = new Set(oldValues); - const adds = new Set(); - - for (const v of new Set(newValues)) { - if (deletes.has(v)) { - deletes.delete(v); - } else { - adds.add(v); - } - } - - return { - adds: Array.from(adds), - deletes: Array.from(deletes), - }; -} diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.d.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.d.ts deleted file mode 100644 index 8fe88b8f82209..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.d.ts +++ /dev/null @@ -1,24 +0,0 @@ -import * as aws from 'aws-sdk'; -declare function defaultLogger(fmt: string, ...args: any[]): void; -/** - * Downloads the CA thumbprint from the issuer URL - */ -declare function downloadThumbprint(issuerUrl: string): Promise; -export declare const external: { - downloadThumbprint: typeof downloadThumbprint; - log: typeof defaultLogger; - createOpenIDConnectProvider: (req: aws.IAM.CreateOpenIDConnectProviderRequest) => Promise>; - deleteOpenIDConnectProvider: (req: aws.IAM.DeleteOpenIDConnectProviderRequest) => Promise<{ - $response: aws.Response<{}, aws.AWSError>; - }>; - updateOpenIDConnectProviderThumbprint: (req: aws.IAM.UpdateOpenIDConnectProviderThumbprintRequest) => Promise<{ - $response: aws.Response<{}, aws.AWSError>; - }>; - addClientIDToOpenIDConnectProvider: (req: aws.IAM.AddClientIDToOpenIDConnectProviderRequest) => Promise<{ - $response: aws.Response<{}, aws.AWSError>; - }>; - removeClientIDFromOpenIDConnectProvider: (req: aws.IAM.RemoveClientIDFromOpenIDConnectProviderRequest) => Promise<{ - $response: aws.Response<{}, aws.AWSError>; - }>; -}; -export {}; diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.js b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.js deleted file mode 100644 index 2f6632aed7b13..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.js +++ /dev/null @@ -1,53 +0,0 @@ -"use strict"; -/* istanbul ignore file */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.external = void 0; -const tls = require("tls"); -const url = require("url"); -// eslint-disable-next-line import/no-extraneous-dependencies -const aws = require("aws-sdk"); -let client; -function iam() { - if (!client) { - client = new aws.IAM(); - } - return client; -} -function defaultLogger(fmt, ...args) { - // eslint-disable-next-line no-console - console.log(fmt, ...args); -} -/** - * Downloads the CA thumbprint from the issuer URL - */ -async function downloadThumbprint(issuerUrl) { - exports.external.log(`downloading certificate authority thumbprint for ${issuerUrl}`); - return new Promise((ok, ko) => { - const purl = url.parse(issuerUrl); - const port = purl.port ? parseInt(purl.port, 10) : 443; - if (!purl.host) { - return ko(new Error(`unable to determine host from issuer url ${issuerUrl}`)); - } - const socket = tls.connect(port, purl.host, { rejectUnauthorized: false, servername: purl.host }); - socket.once('error', ko); - socket.once('secureConnect', () => { - const cert = socket.getPeerCertificate(); - socket.end(); - const thumbprint = cert.fingerprint.split(':').join(''); - exports.external.log(`certificate authority thumbprint for ${issuerUrl} is ${thumbprint}`); - ok(thumbprint); - }); - }); -} -// allows unit test to replace with mocks -/* eslint-disable max-len */ -exports.external = { - downloadThumbprint, - log: defaultLogger, - createOpenIDConnectProvider: (req) => iam().createOpenIDConnectProvider(req).promise(), - deleteOpenIDConnectProvider: (req) => iam().deleteOpenIDConnectProvider(req).promise(), - updateOpenIDConnectProviderThumbprint: (req) => iam().updateOpenIDConnectProviderThumbprint(req).promise(), - addClientIDToOpenIDConnectProvider: (req) => iam().addClientIDToOpenIDConnectProvider(req).promise(), - removeClientIDFromOpenIDConnectProvider: (req) => iam().removeClientIDFromOpenIDConnectProvider(req).promise(), -}; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXh0ZXJuYWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJleHRlcm5hbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQTBCOzs7QUFFMUIsMkJBQTJCO0FBQzNCLDJCQUEyQjtBQUMzQiw2REFBNkQ7QUFDN0QsK0JBQStCO0FBRS9CLElBQUksTUFBZSxDQUFDO0FBRXBCLFNBQVMsR0FBRztJQUNWLElBQUksQ0FBQyxNQUFNLEVBQUU7UUFBRSxNQUFNLEdBQUcsSUFBSSxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUM7S0FBRTtJQUN4QyxPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDO0FBRUQsU0FBUyxhQUFhLENBQUMsR0FBVyxFQUFFLEdBQUcsSUFBVztJQUNoRCxzQ0FBc0M7SUFDdEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQztBQUM1QixDQUFDO0FBRUQ7O0dBRUc7QUFDSCxLQUFLLFVBQVUsa0JBQWtCLENBQUMsU0FBaUI7SUFDakQsZ0JBQVEsQ0FBQyxHQUFHLENBQUMsb0RBQW9ELFNBQVMsRUFBRSxDQUFDLENBQUM7SUFDOUUsT0FBTyxJQUFJLE9BQU8sQ0FBUyxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRTtRQUNwQyxNQUFNLElBQUksR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ2xDLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUM7UUFDdkQsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUU7WUFDZCxPQUFPLEVBQUUsQ0FBQyxJQUFJLEtBQUssQ0FBQyw0Q0FBNEMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDO1NBQy9FO1FBQ0QsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxFQUFFLGtCQUFrQixFQUFFLEtBQUssRUFBRSxVQUFVLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7UUFDbEcsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDekIsTUFBTSxDQUFDLElBQUksQ0FBQyxlQUFlLEVBQUUsR0FBRyxFQUFFO1lBQ2hDLE1BQU0sSUFBSSxHQUFHLE1BQU0sQ0FBQyxrQkFBa0IsRUFBRSxDQUFDO1lBQ3pDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUNiLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUN4RCxnQkFBUSxDQUFDLEdBQUcsQ0FBQyx3Q0FBd0MsU0FBUyxPQUFPLFVBQVUsRUFBRSxDQUFDLENBQUM7WUFDbkYsRUFBRSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ2pCLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBRUQseUNBQXlDO0FBQ3pDLDRCQUE0QjtBQUNmLFFBQUEsUUFBUSxHQUFHO0lBQ3RCLGtCQUFrQjtJQUNsQixHQUFHLEVBQUUsYUFBYTtJQUNsQiwyQkFBMkIsRUFBRSxDQUFDLEdBQStDLEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLDJCQUEyQixDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtJQUNsSSwyQkFBMkIsRUFBRSxDQUFDLEdBQStDLEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLDJCQUEyQixDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtJQUNsSSxxQ0FBcUMsRUFBRSxDQUFDLEdBQXlELEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLHFDQUFxQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtJQUNoSyxrQ0FBa0MsRUFBRSxDQUFDLEdBQXNELEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLGtDQUFrQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtJQUN2Six1Q0FBdUMsRUFBRSxDQUFDLEdBQTJELEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLHVDQUF1QyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtDQUN2SyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyogaXN0YW5idWwgaWdub3JlIGZpbGUgKi9cblxuaW1wb3J0ICogYXMgdGxzIGZyb20gJ3Rscyc7XG5pbXBvcnQgKiBhcyB1cmwgZnJvbSAndXJsJztcbi8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBpbXBvcnQvbm8tZXh0cmFuZW91cy1kZXBlbmRlbmNpZXNcbmltcG9ydCAqIGFzIGF3cyBmcm9tICdhd3Mtc2RrJztcblxubGV0IGNsaWVudDogYXdzLklBTTtcblxuZnVuY3Rpb24gaWFtKCkge1xuICBpZiAoIWNsaWVudCkgeyBjbGllbnQgPSBuZXcgYXdzLklBTSgpOyB9XG4gIHJldHVybiBjbGllbnQ7XG59XG5cbmZ1bmN0aW9uIGRlZmF1bHRMb2dnZXIoZm10OiBzdHJpbmcsIC4uLmFyZ3M6IGFueVtdKSB7XG4gIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBuby1jb25zb2xlXG4gIGNvbnNvbGUubG9nKGZtdCwgLi4uYXJncyk7XG59XG5cbi8qKlxuICogRG93bmxvYWRzIHRoZSBDQSB0aHVtYnByaW50IGZyb20gdGhlIGlzc3VlciBVUkxcbiAqL1xuYXN5bmMgZnVuY3Rpb24gZG93bmxvYWRUaHVtYnByaW50KGlzc3VlclVybDogc3RyaW5nKSB7XG4gIGV4dGVybmFsLmxvZyhgZG93bmxvYWRpbmcgY2VydGlmaWNhdGUgYXV0aG9yaXR5IHRodW1icHJpbnQgZm9yICR7aXNzdWVyVXJsfWApO1xuICByZXR1cm4gbmV3IFByb21pc2U8c3RyaW5nPigob2ssIGtvKSA9PiB7XG4gICAgY29uc3QgcHVybCA9IHVybC5wYXJzZShpc3N1ZXJVcmwpO1xuICAgIGNvbnN0IHBvcnQgPSBwdXJsLnBvcnQgPyBwYXJzZUludChwdXJsLnBvcnQsIDEwKSA6IDQ0MztcbiAgICBpZiAoIXB1cmwuaG9zdCkge1xuICAgICAgcmV0dXJuIGtvKG5ldyBFcnJvcihgdW5hYmxlIHRvIGRldGVybWluZSBob3N0IGZyb20gaXNzdWVyIHVybCAke2lzc3VlclVybH1gKSk7XG4gICAgfVxuICAgIGNvbnN0IHNvY2tldCA9IHRscy5jb25uZWN0KHBvcnQsIHB1cmwuaG9zdCwgeyByZWplY3RVbmF1dGhvcml6ZWQ6IGZhbHNlLCBzZXJ2ZXJuYW1lOiBwdXJsLmhvc3QgfSk7XG4gICAgc29ja2V0Lm9uY2UoJ2Vycm9yJywga28pO1xuICAgIHNvY2tldC5vbmNlKCdzZWN1cmVDb25uZWN0JywgKCkgPT4ge1xuICAgICAgY29uc3QgY2VydCA9IHNvY2tldC5nZXRQZWVyQ2VydGlmaWNhdGUoKTtcbiAgICAgIHNvY2tldC5lbmQoKTtcbiAgICAgIGNvbnN0IHRodW1icHJpbnQgPSBjZXJ0LmZpbmdlcnByaW50LnNwbGl0KCc6Jykuam9pbignJyk7XG4gICAgICBleHRlcm5hbC5sb2coYGNlcnRpZmljYXRlIGF1dGhvcml0eSB0aHVtYnByaW50IGZvciAke2lzc3VlclVybH0gaXMgJHt0aHVtYnByaW50fWApO1xuICAgICAgb2sodGh1bWJwcmludCk7XG4gICAgfSk7XG4gIH0pO1xufVxuXG4vLyBhbGxvd3MgdW5pdCB0ZXN0IHRvIHJlcGxhY2Ugd2l0aCBtb2Nrc1xuLyogZXNsaW50LWRpc2FibGUgbWF4LWxlbiAqL1xuZXhwb3J0IGNvbnN0IGV4dGVybmFsID0ge1xuICBkb3dubG9hZFRodW1icHJpbnQsXG4gIGxvZzogZGVmYXVsdExvZ2dlcixcbiAgY3JlYXRlT3BlbklEQ29ubmVjdFByb3ZpZGVyOiAocmVxOiBhd3MuSUFNLkNyZWF0ZU9wZW5JRENvbm5lY3RQcm92aWRlclJlcXVlc3QpID0+IGlhbSgpLmNyZWF0ZU9wZW5JRENvbm5lY3RQcm92aWRlcihyZXEpLnByb21pc2UoKSxcbiAgZGVsZXRlT3BlbklEQ29ubmVjdFByb3ZpZGVyOiAocmVxOiBhd3MuSUFNLkRlbGV0ZU9wZW5JRENvbm5lY3RQcm92aWRlclJlcXVlc3QpID0+IGlhbSgpLmRlbGV0ZU9wZW5JRENvbm5lY3RQcm92aWRlcihyZXEpLnByb21pc2UoKSxcbiAgdXBkYXRlT3BlbklEQ29ubmVjdFByb3ZpZGVyVGh1bWJwcmludDogKHJlcTogYXdzLklBTS5VcGRhdGVPcGVuSURDb25uZWN0UHJvdmlkZXJUaHVtYnByaW50UmVxdWVzdCkgPT4gaWFtKCkudXBkYXRlT3BlbklEQ29ubmVjdFByb3ZpZGVyVGh1bWJwcmludChyZXEpLnByb21pc2UoKSxcbiAgYWRkQ2xpZW50SURUb09wZW5JRENvbm5lY3RQcm92aWRlcjogKHJlcTogYXdzLklBTS5BZGRDbGllbnRJRFRvT3BlbklEQ29ubmVjdFByb3ZpZGVyUmVxdWVzdCkgPT4gaWFtKCkuYWRkQ2xpZW50SURUb09wZW5JRENvbm5lY3RQcm92aWRlcihyZXEpLnByb21pc2UoKSxcbiAgcmVtb3ZlQ2xpZW50SURGcm9tT3BlbklEQ29ubmVjdFByb3ZpZGVyOiAocmVxOiBhd3MuSUFNLlJlbW92ZUNsaWVudElERnJvbU9wZW5JRENvbm5lY3RQcm92aWRlclJlcXVlc3QpID0+IGlhbSgpLnJlbW92ZUNsaWVudElERnJvbU9wZW5JRENvbm5lY3RQcm92aWRlcihyZXEpLnByb21pc2UoKSxcbn07XG4iXX0= \ No newline at end of file diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.ts deleted file mode 100644 index 4ad18aed4f17d..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.ts +++ /dev/null @@ -1,53 +0,0 @@ -/* istanbul ignore file */ - -import * as tls from 'tls'; -import * as url from 'url'; -// eslint-disable-next-line import/no-extraneous-dependencies -import * as aws from 'aws-sdk'; - -let client: aws.IAM; - -function iam() { - if (!client) { client = new aws.IAM(); } - return client; -} - -function defaultLogger(fmt: string, ...args: any[]) { - // eslint-disable-next-line no-console - console.log(fmt, ...args); -} - -/** - * Downloads the CA thumbprint from the issuer URL - */ -async function downloadThumbprint(issuerUrl: string) { - external.log(`downloading certificate authority thumbprint for ${issuerUrl}`); - return new Promise((ok, ko) => { - const purl = url.parse(issuerUrl); - const port = purl.port ? parseInt(purl.port, 10) : 443; - if (!purl.host) { - return ko(new Error(`unable to determine host from issuer url ${issuerUrl}`)); - } - const socket = tls.connect(port, purl.host, { rejectUnauthorized: false, servername: purl.host }); - socket.once('error', ko); - socket.once('secureConnect', () => { - const cert = socket.getPeerCertificate(); - socket.end(); - const thumbprint = cert.fingerprint.split(':').join(''); - external.log(`certificate authority thumbprint for ${issuerUrl} is ${thumbprint}`); - ok(thumbprint); - }); - }); -} - -// allows unit test to replace with mocks -/* eslint-disable max-len */ -export const external = { - downloadThumbprint, - log: defaultLogger, - createOpenIDConnectProvider: (req: aws.IAM.CreateOpenIDConnectProviderRequest) => iam().createOpenIDConnectProvider(req).promise(), - deleteOpenIDConnectProvider: (req: aws.IAM.DeleteOpenIDConnectProviderRequest) => iam().deleteOpenIDConnectProvider(req).promise(), - updateOpenIDConnectProviderThumbprint: (req: aws.IAM.UpdateOpenIDConnectProviderThumbprintRequest) => iam().updateOpenIDConnectProviderThumbprint(req).promise(), - addClientIDToOpenIDConnectProvider: (req: aws.IAM.AddClientIDToOpenIDConnectProviderRequest) => iam().addClientIDToOpenIDConnectProvider(req).promise(), - removeClientIDFromOpenIDConnectProvider: (req: aws.IAM.RemoveClientIDFromOpenIDConnectProviderRequest) => iam().removeClientIDFromOpenIDConnectProvider(req).promise(), -}; diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.d.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.d.ts deleted file mode 100644 index 038b626561d4a..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export declare function handler(event: AWSLambda.CloudFormationCustomResourceEvent): Promise; diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.ts deleted file mode 100644 index ee276edd3fa9b..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.ts +++ /dev/null @@ -1,89 +0,0 @@ -import { arrayDiff } from './diff'; -import { external } from './external'; - -export async function handler(event: AWSLambda.CloudFormationCustomResourceEvent) { - if (event.RequestType === 'Create') { return onCreate(event); } - if (event.RequestType === 'Update') { return onUpdate(event); } - if (event.RequestType === 'Delete') { return onDelete(event); } - throw new Error('invalid request type'); -} - -async function onCreate(event: AWSLambda.CloudFormationCustomResourceCreateEvent) { - const issuerUrl = event.ResourceProperties.Url; - const thumbprints: string[] = (event.ResourceProperties.ThumbprintList ?? []).sort(); // keep sorted for UPDATE - const clients: string[] = (event.ResourceProperties.ClientIDList ?? []).sort(); - - if (thumbprints.length === 0) { - thumbprints.push(await external.downloadThumbprint(issuerUrl)); - } - - const resp = await external.createOpenIDConnectProvider({ - Url: issuerUrl, - ClientIDList: clients, - ThumbprintList: thumbprints, - }); - - return { - PhysicalResourceId: resp.OpenIDConnectProviderArn, - }; -} - -async function onUpdate(event: AWSLambda.CloudFormationCustomResourceUpdateEvent) { - const issuerUrl = event.ResourceProperties.Url; - const thumbprints: string[] = (event.ResourceProperties.ThumbprintList ?? []).sort(); // keep sorted for UPDATE - const clients: string[] = (event.ResourceProperties.ClientIDList ?? []).sort(); - - // determine which update we are talking about. - const oldIssuerUrl = event.OldResourceProperties.Url; - - // if this is a URL update, then we basically create a new resource and cfn will delete the old one - // since the physical resource ID will change. - if (oldIssuerUrl !== issuerUrl) { - return onCreate({ ...event, RequestType: 'Create' }); - } - - const providerArn = event.PhysicalResourceId; - - // if thumbprints changed, we can update in-place, but bear in mind that if the new thumbprint list - // is empty, we will grab it from the server like we do in CREATE - const oldThumbprints = (event.OldResourceProperties.ThumbprintList || []).sort(); - if (JSON.stringify(oldThumbprints) !== JSON.stringify(thumbprints)) { - const thumbprintList = thumbprints.length > 0 ? thumbprints : [await external.downloadThumbprint(issuerUrl)]; - external.log('updating thumbprint list from', oldThumbprints, 'to', thumbprints); - await external.updateOpenIDConnectProviderThumbprint({ - OpenIDConnectProviderArn: providerArn, - ThumbprintList: thumbprintList, - }); - - // don't return, we might have more updates... - } - - // if client ID list has changed, determine "diff" because the API is add/remove - const oldClients: string[] = (event.OldResourceProperties.ClientIDList || []).sort(); - const diff = arrayDiff(oldClients, clients); - external.log(`client ID diff: ${JSON.stringify(diff)}`); - - for (const addClient of diff.adds) { - external.log(`adding client id "${addClient}" to provider ${providerArn}`); - await external.addClientIDToOpenIDConnectProvider({ - OpenIDConnectProviderArn: providerArn, - ClientID: addClient, - }); - } - - for (const deleteClient of diff.deletes) { - external.log(`removing client id "${deleteClient}" from provider ${providerArn}`); - await external.removeClientIDFromOpenIDConnectProvider({ - OpenIDConnectProviderArn: providerArn, - ClientID: deleteClient, - }); - } - - return; -} - -async function onDelete(deleteEvent: AWSLambda.CloudFormationCustomResourceDeleteEvent) { - await external.deleteOpenIDConnectProvider({ - OpenIDConnectProviderArn: deleteEvent.PhysicalResourceId, - }); -} diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/__entrypoint__.js b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/__entrypoint__.js similarity index 100% rename from packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/__entrypoint__.js rename to packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/__entrypoint__.js diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.js b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/diff.js similarity index 100% rename from packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.js rename to packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/diff.js diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/external.js b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/external.js new file mode 100644 index 0000000000000..7d8c6e611c70b --- /dev/null +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/external.js @@ -0,0 +1,88 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.external = exports.downloadThumbprint = void 0; +const util = require("node:util"); +const tls = require("tls"); +const url = require("url"); +// eslint-disable-next-line import/no-extraneous-dependencies +const aws = require("aws-sdk"); +let client; +function iam() { + if (!client) { + client = new aws.IAM(); + } + return client; +} +function defaultLogger(fmt, ...args) { + // eslint-disable-next-line no-console + console.log(fmt, ...args); +} +/** + * Downloads the CA thumbprint from the issuer URL + */ +async function downloadThumbprint(issuerUrl) { + exports.external.log(`Downloading certificate authority thumbprint for ${issuerUrl}`); + return new Promise((ok, ko) => { + const purl = url.parse(issuerUrl); + const port = purl.port ? parseInt(purl.port, 10) : 443; + if (!purl.host) { + return ko(new Error(`unable to determine host from issuer url ${issuerUrl}`)); + } + const socket = tls.connect(port, purl.host, { rejectUnauthorized: false, servername: purl.host }); + socket.once('error', ko); + socket.once('secureConnect', () => { + // This set to `true` would return the entire chain of certificates as a circular reference object + let cert = socket.getPeerCertificate(true); + const unqiueCerts = new Set(); + do { + unqiueCerts.add(cert); + cert = cert.issuerCertificate; + } while (cert && typeof cert === 'object' && !unqiueCerts.has(cert)); + // The last `cert` obtained must be the root certificate in the certificate chain + const rootCert = [...unqiueCerts].pop(); + // Add `ca: true` when node merges the feature. Awaiting resolution: https://github.com/nodejs/node/issues/44905 + if (!(util.isDeepStrictEqual(rootCert.issuer, rootCert.subject))) { + return ko(new Error(`Subject and Issuer of certificate received are different. + Received: \'Subject\' is ${JSON.stringify(rootCert.subject, null, 4)} and \'Issuer\':${JSON.stringify(rootCert.issuer, null, 4)}`)); + } + const validTo = new Date(rootCert.valid_to); + const certificateValidity = getCertificateValidity(validTo); + if (certificateValidity < 0) { + return ko(new Error(`The certificate has already expired on: ${validTo.toUTCString()}`)); + } + // Warning user if certificate validity is expiring within 6 months + if (certificateValidity < 180) { + /* eslint-disable-next-line no-console */ + console.warn(`The root certificate obtained would expire in ${certificateValidity} days!`); + } + socket.end(); + const thumbprint = rootCert.fingerprint.split(':').join(''); + exports.external.log(`Certificate Authority thumbprint for ${issuerUrl} is ${thumbprint}`); + ok(thumbprint); + }); + }); +} +exports.downloadThumbprint = downloadThumbprint; +/** + * To get the validity timeline for the certificate + * @param certDate The valid to date for the certificate + * @returns The number of days the certificate is valid wrt current date + */ +function getCertificateValidity(certDate) { + const millisecondsInDay = 24 * 60 * 60 * 1000; + const currentDate = new Date(); + const validity = Math.round((certDate.getTime() - currentDate.getTime()) / millisecondsInDay); + return validity; +} +// allows unit test to replace with mocks +/* eslint-disable max-len */ +exports.external = { + downloadThumbprint, + log: defaultLogger, + createOpenIDConnectProvider: (req) => iam().createOpenIDConnectProvider(req).promise(), + deleteOpenIDConnectProvider: (req) => iam().deleteOpenIDConnectProvider(req).promise(), + updateOpenIDConnectProviderThumbprint: (req) => iam().updateOpenIDConnectProviderThumbprint(req).promise(), + addClientIDToOpenIDConnectProvider: (req) => iam().addClientIDToOpenIDConnectProvider(req).promise(), + removeClientIDFromOpenIDConnectProvider: (req) => iam().removeClientIDFromOpenIDConnectProvider(req).promise(), +}; +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"external.js","sourceRoot":"","sources":["external.ts"],"names":[],"mappings":"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","sourcesContent":["/* istanbul ignore file */\nimport { DetailedPeerCertificate } from 'node:tls';\nimport * as util from 'node:util';\nimport * as tls from 'tls';\nimport * as url from 'url';\n// eslint-disable-next-line import/no-extraneous-dependencies\nimport * as aws from 'aws-sdk';\n\nlet client: aws.IAM;\n\nfunction iam() {\n  if (!client) { client = new aws.IAM(); }\n  return client;\n}\n\nfunction defaultLogger(fmt: string, ...args: any[]) {\n  // eslint-disable-next-line no-console\n  console.log(fmt, ...args);\n}\n\n/**\n * Downloads the CA thumbprint from the issuer URL\n */\nexport async function downloadThumbprint(issuerUrl: string) {\n\n  external.log(`Downloading certificate authority thumbprint for ${issuerUrl}`);\n\n  return new Promise<string>((ok, ko) => {\n    const purl = url.parse(issuerUrl);\n    const port = purl.port ? parseInt(purl.port, 10) : 443;\n\n    if (!purl.host) {\n      return ko(new Error(`unable to determine host from issuer url ${issuerUrl}`));\n    }\n\n    const socket = tls.connect(port, purl.host, { rejectUnauthorized: false, servername: purl.host });\n    socket.once('error', ko);\n\n    socket.once('secureConnect', () => {\n      // This set to `true` would return the entire chain of certificates as a circular reference object\n      let cert = socket.getPeerCertificate(true);\n\n      const unqiueCerts = new Set<DetailedPeerCertificate>();\n      do {\n        unqiueCerts.add(cert);\n        cert = cert.issuerCertificate;\n      } while ( cert && typeof cert === 'object' && !unqiueCerts.has(cert));\n\n      // The last `cert` obtained must be the root certificate in the certificate chain\n      const rootCert = [...unqiueCerts].pop()!;\n\n      // Add `ca: true` when node merges the feature. Awaiting resolution: https://github.com/nodejs/node/issues/44905\n      if (!(util.isDeepStrictEqual(rootCert.issuer, rootCert.subject))) {\n        return ko(new Error(`Subject and Issuer of certificate received are different. \n        Received: \\'Subject\\' is ${JSON.stringify(rootCert.subject, null, 4)} and \\'Issuer\\':${JSON.stringify(rootCert.issuer, null, 4)}`));\n      }\n\n      const validTo = new Date(rootCert.valid_to);\n      const certificateValidity = getCertificateValidity(validTo);\n\n      if (certificateValidity < 0) {\n        return ko(new Error(`The certificate has already expired on: ${validTo.toUTCString()}`));\n      }\n\n      // Warning user if certificate validity is expiring within 6 months\n      if (certificateValidity < 180) {\n        /* eslint-disable-next-line no-console */\n        console.warn(`The root certificate obtained would expire in ${certificateValidity} days!`);\n      }\n\n      socket.end();\n\n      const thumbprint = rootCert.fingerprint.split(':').join('');\n      external.log(`Certificate Authority thumbprint for ${issuerUrl} is ${thumbprint}`);\n\n      ok(thumbprint);\n    });\n  });\n}\n\n/**\n * To get the validity timeline for the certificate\n * @param certDate The valid to date for the certificate\n * @returns The number of days the certificate is valid wrt current date\n */\nfunction getCertificateValidity(certDate: Date): Number {\n  const millisecondsInDay = 24 * 60 * 60 * 1000;\n  const currentDate = new Date();\n\n  const validity = Math.round((certDate.getTime() - currentDate.getTime()) / millisecondsInDay);\n\n  return validity;\n}\n\n// allows unit test to replace with mocks\n/* eslint-disable max-len */\nexport const external = {\n  downloadThumbprint,\n  log: defaultLogger,\n  createOpenIDConnectProvider: (req: aws.IAM.CreateOpenIDConnectProviderRequest) => iam().createOpenIDConnectProvider(req).promise(),\n  deleteOpenIDConnectProvider: (req: aws.IAM.DeleteOpenIDConnectProviderRequest) => iam().deleteOpenIDConnectProvider(req).promise(),\n  updateOpenIDConnectProviderThumbprint: (req: aws.IAM.UpdateOpenIDConnectProviderThumbprintRequest) => iam().updateOpenIDConnectProviderThumbprint(req).promise(),\n  addClientIDToOpenIDConnectProvider: (req: aws.IAM.AddClientIDToOpenIDConnectProviderRequest) => iam().addClientIDToOpenIDConnectProvider(req).promise(),\n  removeClientIDFromOpenIDConnectProvider: (req: aws.IAM.RemoveClientIDFromOpenIDConnectProviderRequest) => iam().removeClientIDFromOpenIDConnectProvider(req).promise(),\n};\n"]} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.js b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/index.js similarity index 100% rename from packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.js rename to packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/index.js diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.d.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.d.ts deleted file mode 100644 index 35c3d8f5c637f..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.d.ts +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Supported resource type. - */ -export declare const enum CfnUtilsResourceType { - /** - * CfnJson - */ - CFN_JSON = "Custom::AWSCDKCfnJson", - /** - * CfnJsonStringify - */ - CFN_JSON_STRINGIFY = "Custom::AWSCDKCfnJsonStringify" -} diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.ts deleted file mode 100644 index 9718dcef40645..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.ts +++ /dev/null @@ -1,14 +0,0 @@ -/** - * Supported resource type. - */ -export const enum CfnUtilsResourceType { - /** - * CfnJson - */ - CFN_JSON = 'Custom::AWSCDKCfnJson', - - /** - * CfnJsonStringify - */ - CFN_JSON_STRINGIFY = 'Custom::AWSCDKCfnJsonStringify', -} diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.d.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.d.ts deleted file mode 100644 index b228aec7fd8cc..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/** - * Parses the value of "Value" and reflects it back as attribute. - */ -export declare function handler(event: AWSLambda.CloudFormationCustomResourceEvent): Promise<{ - Data: { - Value: any; - }; -}>; diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.ts deleted file mode 100644 index f082001f80159..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { CfnUtilsResourceType } from './consts'; - -/** - * Parses the value of "Value" and reflects it back as attribute. - */ -export async function handler(event: AWSLambda.CloudFormationCustomResourceEvent) { - - // dispatch based on resource type - if (event.ResourceType === CfnUtilsResourceType.CFN_JSON) { - return cfnJsonHandler(event); - } - if (event.ResourceType === CfnUtilsResourceType.CFN_JSON_STRINGIFY) { - return cfnJsonStringifyHandler(event); - } - - throw new Error(`unexpected resource type "${event.ResourceType}`); -} - -function cfnJsonHandler(event: AWSLambda.CloudFormationCustomResourceEvent) { - return { - Data: { - Value: JSON.parse(event.ResourceProperties.Value), - }, - }; -} - -function cfnJsonStringifyHandler(event: AWSLambda.CloudFormationCustomResourceEvent) { - return { - Data: { - Value: JSON.stringify(event.ResourceProperties.Value), - }, - }; -} diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip index 352f28b6701e5..8097ad2422b72 100644 Binary files a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip and b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip differ diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/__entrypoint__.js b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a/__entrypoint__.js similarity index 100% rename from packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/__entrypoint__.js rename to packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a/__entrypoint__.js diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.js b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a/consts.js similarity index 100% rename from packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.js rename to packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a/consts.js diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.js b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a/index.js similarity index 100% rename from packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.js rename to packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a/index.js diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster-test.assets.json b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster-test.assets.json index 655fd2161eecc..9440b57680a26 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster-test.assets.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster-test.assets.json @@ -99,29 +99,29 @@ } } }, - "42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174": { + "b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3": { "source": { - "path": "asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174", + "path": "asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3", "packaging": "zip" }, "destinations": { "current_account-us-east-1": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1", - "objectKey": "42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174.zip", + "objectKey": "b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3.zip", "region": "us-east-1", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-us-east-1" } } }, - "b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3": { + "f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a": { "source": { - "path": "asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3", + "path": "asset.f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a", "packaging": "zip" }, "destinations": { "current_account-us-east-1": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1", - "objectKey": "b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3.zip", + "objectKey": "f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a.zip", "region": "us-east-1", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-us-east-1" } @@ -155,7 +155,7 @@ } } }, - "cd7379f454bce263be9bdb8610853e73586b9e3605d095098feaf5088680667a": { + "c9e0ac0505f6d702ce628b027fcfd077437f08b5a0e7fffb71865c5d7dd1311f": { "source": { "path": "aws-cdk-eks-cluster-test.template.json", "packaging": "file" @@ -163,7 +163,7 @@ "destinations": { "current_account-us-east-1": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1", - "objectKey": "cd7379f454bce263be9bdb8610853e73586b9e3605d095098feaf5088680667a.json", + "objectKey": "c9e0ac0505f6d702ce628b027fcfd077437f08b5a0e7fffb71865c5d7dd1311f.json", "region": "us-east-1", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-us-east-1" } diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster-test.template.json b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster-test.template.json index 6831fd9bd50d0..019c9f4f8247b 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster-test.template.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster-test.template.json @@ -3232,9 +3232,6 @@ "ClientIDList": [ "sts.amazonaws.com" ], - "ThumbprintList": [ - "9e99a48a9960b14926bb7f3b02e22da2b0ab7280" - ], "Url": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -3553,7 +3550,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174.zip" + "S3Key": "b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3.zip" }, "Timeout": 900, "MemorySize": 128, @@ -3599,7 +3596,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1" }, - "S3Key": "b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3.zip" + "S3Key": "f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/manifest.json b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/manifest.json index 91794333007cc..faecdb2f3e4df 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/manifest.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/manifest.json @@ -23,7 +23,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-us-east-1", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-us-east-1", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1/cd7379f454bce263be9bdb8610853e73586b9e3605d095098feaf5088680667a.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1/c9e0ac0505f6d702ce628b027fcfd077437f08b5a0e7fffb71865c5d7dd1311f.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.4288ebb3652acdf2d828b7db7ca44a7162a401ace50ebb4026e84b18a02a06ee.zip b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.4288ebb3652acdf2d828b7db7ca44a7162a401ace50ebb4026e84b18a02a06ee.zip index bea20c7049002..4b95260872643 100644 Binary files a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.4288ebb3652acdf2d828b7db7ca44a7162a401ace50ebb4026e84b18a02a06ee.zip and b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.4288ebb3652acdf2d828b7db7ca44a7162a401ace50ebb4026e84b18a02a06ee.zip differ diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.d.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.d.ts deleted file mode 100644 index 53962e1f09938..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export declare function arrayDiff(oldValues: string[], newValues: string[]): { - adds: string[]; - deletes: string[]; -}; diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.ts deleted file mode 100644 index 8a91e6ebddc53..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.ts +++ /dev/null @@ -1,17 +0,0 @@ -export function arrayDiff(oldValues: string[], newValues: string[]) { - const deletes = new Set(oldValues); - const adds = new Set(); - - for (const v of new Set(newValues)) { - if (deletes.has(v)) { - deletes.delete(v); - } else { - adds.add(v); - } - } - - return { - adds: Array.from(adds), - deletes: Array.from(deletes), - }; -} diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.d.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.d.ts deleted file mode 100644 index 8fe88b8f82209..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.d.ts +++ /dev/null @@ -1,24 +0,0 @@ -import * as aws from 'aws-sdk'; -declare function defaultLogger(fmt: string, ...args: any[]): void; -/** - * Downloads the CA thumbprint from the issuer URL - */ -declare function downloadThumbprint(issuerUrl: string): Promise; -export declare const external: { - downloadThumbprint: typeof downloadThumbprint; - log: typeof defaultLogger; - createOpenIDConnectProvider: (req: aws.IAM.CreateOpenIDConnectProviderRequest) => Promise>; - deleteOpenIDConnectProvider: (req: aws.IAM.DeleteOpenIDConnectProviderRequest) => Promise<{ - $response: aws.Response<{}, aws.AWSError>; - }>; - updateOpenIDConnectProviderThumbprint: (req: aws.IAM.UpdateOpenIDConnectProviderThumbprintRequest) => Promise<{ - $response: aws.Response<{}, aws.AWSError>; - }>; - addClientIDToOpenIDConnectProvider: (req: aws.IAM.AddClientIDToOpenIDConnectProviderRequest) => Promise<{ - $response: aws.Response<{}, aws.AWSError>; - }>; - removeClientIDFromOpenIDConnectProvider: (req: aws.IAM.RemoveClientIDFromOpenIDConnectProviderRequest) => Promise<{ - $response: aws.Response<{}, aws.AWSError>; - }>; -}; -export {}; diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.js b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.js deleted file mode 100644 index 2f6632aed7b13..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.js +++ /dev/null @@ -1,53 +0,0 @@ -"use strict"; -/* istanbul ignore file */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.external = void 0; -const tls = require("tls"); -const url = require("url"); -// eslint-disable-next-line import/no-extraneous-dependencies -const aws = require("aws-sdk"); -let client; -function iam() { - if (!client) { - client = new aws.IAM(); - } - return client; -} -function defaultLogger(fmt, ...args) { - // eslint-disable-next-line no-console - console.log(fmt, ...args); -} -/** - * Downloads the CA thumbprint from the issuer URL - */ -async function downloadThumbprint(issuerUrl) { - exports.external.log(`downloading certificate authority thumbprint for ${issuerUrl}`); - return new Promise((ok, ko) => { - const purl = url.parse(issuerUrl); - const port = purl.port ? parseInt(purl.port, 10) : 443; - if (!purl.host) { - return ko(new Error(`unable to determine host from issuer url ${issuerUrl}`)); - } - const socket = tls.connect(port, purl.host, { rejectUnauthorized: false, servername: purl.host }); - socket.once('error', ko); - socket.once('secureConnect', () => { - const cert = socket.getPeerCertificate(); - socket.end(); - const thumbprint = cert.fingerprint.split(':').join(''); - exports.external.log(`certificate authority thumbprint for ${issuerUrl} is ${thumbprint}`); - ok(thumbprint); - }); - }); -} -// allows unit test to replace with mocks -/* eslint-disable max-len */ -exports.external = { - downloadThumbprint, - log: defaultLogger, - createOpenIDConnectProvider: (req) => iam().createOpenIDConnectProvider(req).promise(), - deleteOpenIDConnectProvider: (req) => iam().deleteOpenIDConnectProvider(req).promise(), - updateOpenIDConnectProviderThumbprint: (req) => iam().updateOpenIDConnectProviderThumbprint(req).promise(), - addClientIDToOpenIDConnectProvider: (req) => iam().addClientIDToOpenIDConnectProvider(req).promise(), - removeClientIDFromOpenIDConnectProvider: (req) => iam().removeClientIDFromOpenIDConnectProvider(req).promise(), -}; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXh0ZXJuYWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJleHRlcm5hbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQTBCOzs7QUFFMUIsMkJBQTJCO0FBQzNCLDJCQUEyQjtBQUMzQiw2REFBNkQ7QUFDN0QsK0JBQStCO0FBRS9CLElBQUksTUFBZSxDQUFDO0FBRXBCLFNBQVMsR0FBRztJQUNWLElBQUksQ0FBQyxNQUFNLEVBQUU7UUFBRSxNQUFNLEdBQUcsSUFBSSxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUM7S0FBRTtJQUN4QyxPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDO0FBRUQsU0FBUyxhQUFhLENBQUMsR0FBVyxFQUFFLEdBQUcsSUFBVztJQUNoRCxzQ0FBc0M7SUFDdEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQztBQUM1QixDQUFDO0FBRUQ7O0dBRUc7QUFDSCxLQUFLLFVBQVUsa0JBQWtCLENBQUMsU0FBaUI7SUFDakQsZ0JBQVEsQ0FBQyxHQUFHLENBQUMsb0RBQW9ELFNBQVMsRUFBRSxDQUFDLENBQUM7SUFDOUUsT0FBTyxJQUFJLE9BQU8sQ0FBUyxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRTtRQUNwQyxNQUFNLElBQUksR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ2xDLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUM7UUFDdkQsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUU7WUFDZCxPQUFPLEVBQUUsQ0FBQyxJQUFJLEtBQUssQ0FBQyw0Q0FBNEMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDO1NBQy9FO1FBQ0QsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxFQUFFLGtCQUFrQixFQUFFLEtBQUssRUFBRSxVQUFVLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7UUFDbEcsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDekIsTUFBTSxDQUFDLElBQUksQ0FBQyxlQUFlLEVBQUUsR0FBRyxFQUFFO1lBQ2hDLE1BQU0sSUFBSSxHQUFHLE1BQU0sQ0FBQyxrQkFBa0IsRUFBRSxDQUFDO1lBQ3pDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUNiLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUN4RCxnQkFBUSxDQUFDLEdBQUcsQ0FBQyx3Q0FBd0MsU0FBUyxPQUFPLFVBQVUsRUFBRSxDQUFDLENBQUM7WUFDbkYsRUFBRSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ2pCLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBRUQseUNBQXlDO0FBQ3pDLDRCQUE0QjtBQUNmLFFBQUEsUUFBUSxHQUFHO0lBQ3RCLGtCQUFrQjtJQUNsQixHQUFHLEVBQUUsYUFBYTtJQUNsQiwyQkFBMkIsRUFBRSxDQUFDLEdBQStDLEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLDJCQUEyQixDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtJQUNsSSwyQkFBMkIsRUFBRSxDQUFDLEdBQStDLEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLDJCQUEyQixDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtJQUNsSSxxQ0FBcUMsRUFBRSxDQUFDLEdBQXlELEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLHFDQUFxQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtJQUNoSyxrQ0FBa0MsRUFBRSxDQUFDLEdBQXNELEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLGtDQUFrQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtJQUN2Six1Q0FBdUMsRUFBRSxDQUFDLEdBQTJELEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLHVDQUF1QyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtDQUN2SyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyogaXN0YW5idWwgaWdub3JlIGZpbGUgKi9cblxuaW1wb3J0ICogYXMgdGxzIGZyb20gJ3Rscyc7XG5pbXBvcnQgKiBhcyB1cmwgZnJvbSAndXJsJztcbi8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBpbXBvcnQvbm8tZXh0cmFuZW91cy1kZXBlbmRlbmNpZXNcbmltcG9ydCAqIGFzIGF3cyBmcm9tICdhd3Mtc2RrJztcblxubGV0IGNsaWVudDogYXdzLklBTTtcblxuZnVuY3Rpb24gaWFtKCkge1xuICBpZiAoIWNsaWVudCkgeyBjbGllbnQgPSBuZXcgYXdzLklBTSgpOyB9XG4gIHJldHVybiBjbGllbnQ7XG59XG5cbmZ1bmN0aW9uIGRlZmF1bHRMb2dnZXIoZm10OiBzdHJpbmcsIC4uLmFyZ3M6IGFueVtdKSB7XG4gIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBuby1jb25zb2xlXG4gIGNvbnNvbGUubG9nKGZtdCwgLi4uYXJncyk7XG59XG5cbi8qKlxuICogRG93bmxvYWRzIHRoZSBDQSB0aHVtYnByaW50IGZyb20gdGhlIGlzc3VlciBVUkxcbiAqL1xuYXN5bmMgZnVuY3Rpb24gZG93bmxvYWRUaHVtYnByaW50KGlzc3VlclVybDogc3RyaW5nKSB7XG4gIGV4dGVybmFsLmxvZyhgZG93bmxvYWRpbmcgY2VydGlmaWNhdGUgYXV0aG9yaXR5IHRodW1icHJpbnQgZm9yICR7aXNzdWVyVXJsfWApO1xuICByZXR1cm4gbmV3IFByb21pc2U8c3RyaW5nPigob2ssIGtvKSA9PiB7XG4gICAgY29uc3QgcHVybCA9IHVybC5wYXJzZShpc3N1ZXJVcmwpO1xuICAgIGNvbnN0IHBvcnQgPSBwdXJsLnBvcnQgPyBwYXJzZUludChwdXJsLnBvcnQsIDEwKSA6IDQ0MztcbiAgICBpZiAoIXB1cmwuaG9zdCkge1xuICAgICAgcmV0dXJuIGtvKG5ldyBFcnJvcihgdW5hYmxlIHRvIGRldGVybWluZSBob3N0IGZyb20gaXNzdWVyIHVybCAke2lzc3VlclVybH1gKSk7XG4gICAgfVxuICAgIGNvbnN0IHNvY2tldCA9IHRscy5jb25uZWN0KHBvcnQsIHB1cmwuaG9zdCwgeyByZWplY3RVbmF1dGhvcml6ZWQ6IGZhbHNlLCBzZXJ2ZXJuYW1lOiBwdXJsLmhvc3QgfSk7XG4gICAgc29ja2V0Lm9uY2UoJ2Vycm9yJywga28pO1xuICAgIHNvY2tldC5vbmNlKCdzZWN1cmVDb25uZWN0JywgKCkgPT4ge1xuICAgICAgY29uc3QgY2VydCA9IHNvY2tldC5nZXRQZWVyQ2VydGlmaWNhdGUoKTtcbiAgICAgIHNvY2tldC5lbmQoKTtcbiAgICAgIGNvbnN0IHRodW1icHJpbnQgPSBjZXJ0LmZpbmdlcnByaW50LnNwbGl0KCc6Jykuam9pbignJyk7XG4gICAgICBleHRlcm5hbC5sb2coYGNlcnRpZmljYXRlIGF1dGhvcml0eSB0aHVtYnByaW50IGZvciAke2lzc3VlclVybH0gaXMgJHt0aHVtYnByaW50fWApO1xuICAgICAgb2sodGh1bWJwcmludCk7XG4gICAgfSk7XG4gIH0pO1xufVxuXG4vLyBhbGxvd3MgdW5pdCB0ZXN0IHRvIHJlcGxhY2Ugd2l0aCBtb2Nrc1xuLyogZXNsaW50LWRpc2FibGUgbWF4LWxlbiAqL1xuZXhwb3J0IGNvbnN0IGV4dGVybmFsID0ge1xuICBkb3dubG9hZFRodW1icHJpbnQsXG4gIGxvZzogZGVmYXVsdExvZ2dlcixcbiAgY3JlYXRlT3BlbklEQ29ubmVjdFByb3ZpZGVyOiAocmVxOiBhd3MuSUFNLkNyZWF0ZU9wZW5JRENvbm5lY3RQcm92aWRlclJlcXVlc3QpID0+IGlhbSgpLmNyZWF0ZU9wZW5JRENvbm5lY3RQcm92aWRlcihyZXEpLnByb21pc2UoKSxcbiAgZGVsZXRlT3BlbklEQ29ubmVjdFByb3ZpZGVyOiAocmVxOiBhd3MuSUFNLkRlbGV0ZU9wZW5JRENvbm5lY3RQcm92aWRlclJlcXVlc3QpID0+IGlhbSgpLmRlbGV0ZU9wZW5JRENvbm5lY3RQcm92aWRlcihyZXEpLnByb21pc2UoKSxcbiAgdXBkYXRlT3BlbklEQ29ubmVjdFByb3ZpZGVyVGh1bWJwcmludDogKHJlcTogYXdzLklBTS5VcGRhdGVPcGVuSURDb25uZWN0UHJvdmlkZXJUaHVtYnByaW50UmVxdWVzdCkgPT4gaWFtKCkudXBkYXRlT3BlbklEQ29ubmVjdFByb3ZpZGVyVGh1bWJwcmludChyZXEpLnByb21pc2UoKSxcbiAgYWRkQ2xpZW50SURUb09wZW5JRENvbm5lY3RQcm92aWRlcjogKHJlcTogYXdzLklBTS5BZGRDbGllbnRJRFRvT3BlbklEQ29ubmVjdFByb3ZpZGVyUmVxdWVzdCkgPT4gaWFtKCkuYWRkQ2xpZW50SURUb09wZW5JRENvbm5lY3RQcm92aWRlcihyZXEpLnByb21pc2UoKSxcbiAgcmVtb3ZlQ2xpZW50SURGcm9tT3BlbklEQ29ubmVjdFByb3ZpZGVyOiAocmVxOiBhd3MuSUFNLlJlbW92ZUNsaWVudElERnJvbU9wZW5JRENvbm5lY3RQcm92aWRlclJlcXVlc3QpID0+IGlhbSgpLnJlbW92ZUNsaWVudElERnJvbU9wZW5JRENvbm5lY3RQcm92aWRlcihyZXEpLnByb21pc2UoKSxcbn07XG4iXX0= \ No newline at end of file diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.ts deleted file mode 100644 index 4ad18aed4f17d..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/external.ts +++ /dev/null @@ -1,53 +0,0 @@ -/* istanbul ignore file */ - -import * as tls from 'tls'; -import * as url from 'url'; -// eslint-disable-next-line import/no-extraneous-dependencies -import * as aws from 'aws-sdk'; - -let client: aws.IAM; - -function iam() { - if (!client) { client = new aws.IAM(); } - return client; -} - -function defaultLogger(fmt: string, ...args: any[]) { - // eslint-disable-next-line no-console - console.log(fmt, ...args); -} - -/** - * Downloads the CA thumbprint from the issuer URL - */ -async function downloadThumbprint(issuerUrl: string) { - external.log(`downloading certificate authority thumbprint for ${issuerUrl}`); - return new Promise((ok, ko) => { - const purl = url.parse(issuerUrl); - const port = purl.port ? parseInt(purl.port, 10) : 443; - if (!purl.host) { - return ko(new Error(`unable to determine host from issuer url ${issuerUrl}`)); - } - const socket = tls.connect(port, purl.host, { rejectUnauthorized: false, servername: purl.host }); - socket.once('error', ko); - socket.once('secureConnect', () => { - const cert = socket.getPeerCertificate(); - socket.end(); - const thumbprint = cert.fingerprint.split(':').join(''); - external.log(`certificate authority thumbprint for ${issuerUrl} is ${thumbprint}`); - ok(thumbprint); - }); - }); -} - -// allows unit test to replace with mocks -/* eslint-disable max-len */ -export const external = { - downloadThumbprint, - log: defaultLogger, - createOpenIDConnectProvider: (req: aws.IAM.CreateOpenIDConnectProviderRequest) => iam().createOpenIDConnectProvider(req).promise(), - deleteOpenIDConnectProvider: (req: aws.IAM.DeleteOpenIDConnectProviderRequest) => iam().deleteOpenIDConnectProvider(req).promise(), - updateOpenIDConnectProviderThumbprint: (req: aws.IAM.UpdateOpenIDConnectProviderThumbprintRequest) => iam().updateOpenIDConnectProviderThumbprint(req).promise(), - addClientIDToOpenIDConnectProvider: (req: aws.IAM.AddClientIDToOpenIDConnectProviderRequest) => iam().addClientIDToOpenIDConnectProvider(req).promise(), - removeClientIDFromOpenIDConnectProvider: (req: aws.IAM.RemoveClientIDFromOpenIDConnectProviderRequest) => iam().removeClientIDFromOpenIDConnectProvider(req).promise(), -}; diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.d.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.d.ts deleted file mode 100644 index 038b626561d4a..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export declare function handler(event: AWSLambda.CloudFormationCustomResourceEvent): Promise; diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.ts deleted file mode 100644 index ee276edd3fa9b..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.ts +++ /dev/null @@ -1,89 +0,0 @@ -import { arrayDiff } from './diff'; -import { external } from './external'; - -export async function handler(event: AWSLambda.CloudFormationCustomResourceEvent) { - if (event.RequestType === 'Create') { return onCreate(event); } - if (event.RequestType === 'Update') { return onUpdate(event); } - if (event.RequestType === 'Delete') { return onDelete(event); } - throw new Error('invalid request type'); -} - -async function onCreate(event: AWSLambda.CloudFormationCustomResourceCreateEvent) { - const issuerUrl = event.ResourceProperties.Url; - const thumbprints: string[] = (event.ResourceProperties.ThumbprintList ?? []).sort(); // keep sorted for UPDATE - const clients: string[] = (event.ResourceProperties.ClientIDList ?? []).sort(); - - if (thumbprints.length === 0) { - thumbprints.push(await external.downloadThumbprint(issuerUrl)); - } - - const resp = await external.createOpenIDConnectProvider({ - Url: issuerUrl, - ClientIDList: clients, - ThumbprintList: thumbprints, - }); - - return { - PhysicalResourceId: resp.OpenIDConnectProviderArn, - }; -} - -async function onUpdate(event: AWSLambda.CloudFormationCustomResourceUpdateEvent) { - const issuerUrl = event.ResourceProperties.Url; - const thumbprints: string[] = (event.ResourceProperties.ThumbprintList ?? []).sort(); // keep sorted for UPDATE - const clients: string[] = (event.ResourceProperties.ClientIDList ?? []).sort(); - - // determine which update we are talking about. - const oldIssuerUrl = event.OldResourceProperties.Url; - - // if this is a URL update, then we basically create a new resource and cfn will delete the old one - // since the physical resource ID will change. - if (oldIssuerUrl !== issuerUrl) { - return onCreate({ ...event, RequestType: 'Create' }); - } - - const providerArn = event.PhysicalResourceId; - - // if thumbprints changed, we can update in-place, but bear in mind that if the new thumbprint list - // is empty, we will grab it from the server like we do in CREATE - const oldThumbprints = (event.OldResourceProperties.ThumbprintList || []).sort(); - if (JSON.stringify(oldThumbprints) !== JSON.stringify(thumbprints)) { - const thumbprintList = thumbprints.length > 0 ? thumbprints : [await external.downloadThumbprint(issuerUrl)]; - external.log('updating thumbprint list from', oldThumbprints, 'to', thumbprints); - await external.updateOpenIDConnectProviderThumbprint({ - OpenIDConnectProviderArn: providerArn, - ThumbprintList: thumbprintList, - }); - - // don't return, we might have more updates... - } - - // if client ID list has changed, determine "diff" because the API is add/remove - const oldClients: string[] = (event.OldResourceProperties.ClientIDList || []).sort(); - const diff = arrayDiff(oldClients, clients); - external.log(`client ID diff: ${JSON.stringify(diff)}`); - - for (const addClient of diff.adds) { - external.log(`adding client id "${addClient}" to provider ${providerArn}`); - await external.addClientIDToOpenIDConnectProvider({ - OpenIDConnectProviderArn: providerArn, - ClientID: addClient, - }); - } - - for (const deleteClient of diff.deletes) { - external.log(`removing client id "${deleteClient}" from provider ${providerArn}`); - await external.removeClientIDFromOpenIDConnectProvider({ - OpenIDConnectProviderArn: providerArn, - ClientID: deleteClient, - }); - } - - return; -} - -async function onDelete(deleteEvent: AWSLambda.CloudFormationCustomResourceDeleteEvent) { - await external.deleteOpenIDConnectProvider({ - OpenIDConnectProviderArn: deleteEvent.PhysicalResourceId, - }); -} diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/__entrypoint__.js b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/__entrypoint__.js similarity index 100% rename from packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/__entrypoint__.js rename to packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/__entrypoint__.js diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.js b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/diff.js similarity index 100% rename from packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/diff.js rename to packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/diff.js diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/external.js b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/external.js new file mode 100644 index 0000000000000..7d8c6e611c70b --- /dev/null +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/external.js @@ -0,0 +1,88 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.external = exports.downloadThumbprint = void 0; +const util = require("node:util"); +const tls = require("tls"); +const url = require("url"); +// eslint-disable-next-line import/no-extraneous-dependencies +const aws = require("aws-sdk"); +let client; +function iam() { + if (!client) { + client = new aws.IAM(); + } + return client; +} +function defaultLogger(fmt, ...args) { + // eslint-disable-next-line no-console + console.log(fmt, ...args); +} +/** + * Downloads the CA thumbprint from the issuer URL + */ +async function downloadThumbprint(issuerUrl) { + exports.external.log(`Downloading certificate authority thumbprint for ${issuerUrl}`); + return new Promise((ok, ko) => { + const purl = url.parse(issuerUrl); + const port = purl.port ? parseInt(purl.port, 10) : 443; + if (!purl.host) { + return ko(new Error(`unable to determine host from issuer url ${issuerUrl}`)); + } + const socket = tls.connect(port, purl.host, { rejectUnauthorized: false, servername: purl.host }); + socket.once('error', ko); + socket.once('secureConnect', () => { + // This set to `true` would return the entire chain of certificates as a circular reference object + let cert = socket.getPeerCertificate(true); + const unqiueCerts = new Set(); + do { + unqiueCerts.add(cert); + cert = cert.issuerCertificate; + } while (cert && typeof cert === 'object' && !unqiueCerts.has(cert)); + // The last `cert` obtained must be the root certificate in the certificate chain + const rootCert = [...unqiueCerts].pop(); + // Add `ca: true` when node merges the feature. Awaiting resolution: https://github.com/nodejs/node/issues/44905 + if (!(util.isDeepStrictEqual(rootCert.issuer, rootCert.subject))) { + return ko(new Error(`Subject and Issuer of certificate received are different. + Received: \'Subject\' is ${JSON.stringify(rootCert.subject, null, 4)} and \'Issuer\':${JSON.stringify(rootCert.issuer, null, 4)}`)); + } + const validTo = new Date(rootCert.valid_to); + const certificateValidity = getCertificateValidity(validTo); + if (certificateValidity < 0) { + return ko(new Error(`The certificate has already expired on: ${validTo.toUTCString()}`)); + } + // Warning user if certificate validity is expiring within 6 months + if (certificateValidity < 180) { + /* eslint-disable-next-line no-console */ + console.warn(`The root certificate obtained would expire in ${certificateValidity} days!`); + } + socket.end(); + const thumbprint = rootCert.fingerprint.split(':').join(''); + exports.external.log(`Certificate Authority thumbprint for ${issuerUrl} is ${thumbprint}`); + ok(thumbprint); + }); + }); +} +exports.downloadThumbprint = downloadThumbprint; +/** + * To get the validity timeline for the certificate + * @param certDate The valid to date for the certificate + * @returns The number of days the certificate is valid wrt current date + */ +function getCertificateValidity(certDate) { + const millisecondsInDay = 24 * 60 * 60 * 1000; + const currentDate = new Date(); + const validity = Math.round((certDate.getTime() - currentDate.getTime()) / millisecondsInDay); + return validity; +} +// allows unit test to replace with mocks +/* eslint-disable max-len */ +exports.external = { + downloadThumbprint, + log: defaultLogger, + createOpenIDConnectProvider: (req) => iam().createOpenIDConnectProvider(req).promise(), + deleteOpenIDConnectProvider: (req) => iam().deleteOpenIDConnectProvider(req).promise(), + updateOpenIDConnectProviderThumbprint: (req) => iam().updateOpenIDConnectProviderThumbprint(req).promise(), + addClientIDToOpenIDConnectProvider: (req) => iam().addClientIDToOpenIDConnectProvider(req).promise(), + removeClientIDFromOpenIDConnectProvider: (req) => iam().removeClientIDFromOpenIDConnectProvider(req).promise(), +}; +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"external.js","sourceRoot":"","sources":["external.ts"],"names":[],"mappings":";;;AAEA,kCAAkC;AAClC,2BAA2B;AAC3B,2BAA2B;AAC3B,6DAA6D;AAC7D,+BAA+B;AAE/B,IAAI,MAAe,CAAC;AAEpB,SAAS,GAAG;IACV,IAAI,CAAC,MAAM,EAAE;QAAE,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC;KAAE;IACxC,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,aAAa,CAAC,GAAW,EAAE,GAAG,IAAW;IAChD,sCAAsC;IACtC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;AAC5B,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,kBAAkB,CAAC,SAAiB;IAExD,gBAAQ,CAAC,GAAG,CAAC,oDAAoD,SAAS,EAAE,CAAC,CAAC;IAE9E,OAAO,IAAI,OAAO,CAAS,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACpC,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QAEvD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACd,OAAO,EAAE,CAAC,IAAI,KAAK,CAAC,4CAA4C,SAAS,EAAE,CAAC,CAAC,CAAC;SAC/E;QAED,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAClG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAEzB,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE;YAChC,kGAAkG;YAClG,IAAI,IAAI,GAAG,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;YAE3C,MAAM,WAAW,GAAG,IAAI,GAAG,EAA2B,CAAC;YACvD,GAAG;gBACD,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACtB,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC;aAC/B,QAAS,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAEtE,iFAAiF;YACjF,MAAM,QAAQ,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC,GAAG,EAAG,CAAC;YAEzC,gHAAgH;YAChH,IAAI,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE;gBAChE,OAAO,EAAE,CAAC,IAAI,KAAK,CAAC;mCACO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,mBAAmB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACrI;YAED,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC5C,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;YAE5D,IAAI,mBAAmB,GAAG,CAAC,EAAE;gBAC3B,OAAO,EAAE,CAAC,IAAI,KAAK,CAAC,2CAA2C,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;aAC1F;YAED,mEAAmE;YACnE,IAAI,mBAAmB,GAAG,GAAG,EAAE;gBAC7B,yCAAyC;gBACzC,OAAO,CAAC,IAAI,CAAC,iDAAiD,mBAAmB,QAAQ,CAAC,CAAC;aAC5F;YAED,MAAM,CAAC,GAAG,EAAE,CAAC;YAEb,MAAM,UAAU,GAAG,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC5D,gBAAQ,CAAC,GAAG,CAAC,wCAAwC,SAAS,OAAO,UAAU,EAAE,CAAC,CAAC;YAEnF,EAAE,CAAC,UAAU,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAvDD,gDAuDC;AAED;;;;GAIG;AACH,SAAS,sBAAsB,CAAC,QAAc;IAC5C,MAAM,iBAAiB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC9C,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC;IAE/B,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,WAAW,CAAC,OAAO,EAAE,CAAC,GAAG,iBAAiB,CAAC,CAAC;IAE9F,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,yCAAyC;AACzC,4BAA4B;AACf,QAAA,QAAQ,GAAG;IACtB,kBAAkB;IAClB,GAAG,EAAE,aAAa;IAClB,2BAA2B,EAAE,CAAC,GAA+C,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,2BAA2B,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE;IAClI,2BAA2B,EAAE,CAAC,GAA+C,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,2BAA2B,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE;IAClI,qCAAqC,EAAE,CAAC,GAAyD,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,qCAAqC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE;IAChK,kCAAkC,EAAE,CAAC,GAAsD,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,kCAAkC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE;IACvJ,uCAAuC,EAAE,CAAC,GAA2D,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,uCAAuC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE;CACvK,CAAC","sourcesContent":["/* istanbul ignore file */\nimport { DetailedPeerCertificate } from 'node:tls';\nimport * as util from 'node:util';\nimport * as tls from 'tls';\nimport * as url from 'url';\n// eslint-disable-next-line import/no-extraneous-dependencies\nimport * as aws from 'aws-sdk';\n\nlet client: aws.IAM;\n\nfunction iam() {\n  if (!client) { client = new aws.IAM(); }\n  return client;\n}\n\nfunction defaultLogger(fmt: string, ...args: any[]) {\n  // eslint-disable-next-line no-console\n  console.log(fmt, ...args);\n}\n\n/**\n * Downloads the CA thumbprint from the issuer URL\n */\nexport async function downloadThumbprint(issuerUrl: string) {\n\n  external.log(`Downloading certificate authority thumbprint for ${issuerUrl}`);\n\n  return new Promise<string>((ok, ko) => {\n    const purl = url.parse(issuerUrl);\n    const port = purl.port ? parseInt(purl.port, 10) : 443;\n\n    if (!purl.host) {\n      return ko(new Error(`unable to determine host from issuer url ${issuerUrl}`));\n    }\n\n    const socket = tls.connect(port, purl.host, { rejectUnauthorized: false, servername: purl.host });\n    socket.once('error', ko);\n\n    socket.once('secureConnect', () => {\n      // This set to `true` would return the entire chain of certificates as a circular reference object\n      let cert = socket.getPeerCertificate(true);\n\n      const unqiueCerts = new Set<DetailedPeerCertificate>();\n      do {\n        unqiueCerts.add(cert);\n        cert = cert.issuerCertificate;\n      } while ( cert && typeof cert === 'object' && !unqiueCerts.has(cert));\n\n      // The last `cert` obtained must be the root certificate in the certificate chain\n      const rootCert = [...unqiueCerts].pop()!;\n\n      // Add `ca: true` when node merges the feature. Awaiting resolution: https://github.com/nodejs/node/issues/44905\n      if (!(util.isDeepStrictEqual(rootCert.issuer, rootCert.subject))) {\n        return ko(new Error(`Subject and Issuer of certificate received are different. \n        Received: \\'Subject\\' is ${JSON.stringify(rootCert.subject, null, 4)} and \\'Issuer\\':${JSON.stringify(rootCert.issuer, null, 4)}`));\n      }\n\n      const validTo = new Date(rootCert.valid_to);\n      const certificateValidity = getCertificateValidity(validTo);\n\n      if (certificateValidity < 0) {\n        return ko(new Error(`The certificate has already expired on: ${validTo.toUTCString()}`));\n      }\n\n      // Warning user if certificate validity is expiring within 6 months\n      if (certificateValidity < 180) {\n        /* eslint-disable-next-line no-console */\n        console.warn(`The root certificate obtained would expire in ${certificateValidity} days!`);\n      }\n\n      socket.end();\n\n      const thumbprint = rootCert.fingerprint.split(':').join('');\n      external.log(`Certificate Authority thumbprint for ${issuerUrl} is ${thumbprint}`);\n\n      ok(thumbprint);\n    });\n  });\n}\n\n/**\n * To get the validity timeline for the certificate\n * @param certDate The valid to date for the certificate\n * @returns The number of days the certificate is valid wrt current date\n */\nfunction getCertificateValidity(certDate: Date): Number {\n  const millisecondsInDay = 24 * 60 * 60 * 1000;\n  const currentDate = new Date();\n\n  const validity = Math.round((certDate.getTime() - currentDate.getTime()) / millisecondsInDay);\n\n  return validity;\n}\n\n// allows unit test to replace with mocks\n/* eslint-disable max-len */\nexport const external = {\n  downloadThumbprint,\n  log: defaultLogger,\n  createOpenIDConnectProvider: (req: aws.IAM.CreateOpenIDConnectProviderRequest) => iam().createOpenIDConnectProvider(req).promise(),\n  deleteOpenIDConnectProvider: (req: aws.IAM.DeleteOpenIDConnectProviderRequest) => iam().deleteOpenIDConnectProvider(req).promise(),\n  updateOpenIDConnectProviderThumbprint: (req: aws.IAM.UpdateOpenIDConnectProviderThumbprintRequest) => iam().updateOpenIDConnectProviderThumbprint(req).promise(),\n  addClientIDToOpenIDConnectProvider: (req: aws.IAM.AddClientIDToOpenIDConnectProviderRequest) => iam().addClientIDToOpenIDConnectProvider(req).promise(),\n  removeClientIDFromOpenIDConnectProvider: (req: aws.IAM.RemoveClientIDFromOpenIDConnectProviderRequest) => iam().removeClientIDFromOpenIDConnectProvider(req).promise(),\n};\n"]} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.js b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/index.js similarity index 100% rename from packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174/index.js rename to packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/index.js diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.d.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.d.ts deleted file mode 100644 index 35c3d8f5c637f..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.d.ts +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Supported resource type. - */ -export declare const enum CfnUtilsResourceType { - /** - * CfnJson - */ - CFN_JSON = "Custom::AWSCDKCfnJson", - /** - * CfnJsonStringify - */ - CFN_JSON_STRINGIFY = "Custom::AWSCDKCfnJsonStringify" -} diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.ts deleted file mode 100644 index 9718dcef40645..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.ts +++ /dev/null @@ -1,14 +0,0 @@ -/** - * Supported resource type. - */ -export const enum CfnUtilsResourceType { - /** - * CfnJson - */ - CFN_JSON = 'Custom::AWSCDKCfnJson', - - /** - * CfnJsonStringify - */ - CFN_JSON_STRINGIFY = 'Custom::AWSCDKCfnJsonStringify', -} diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.d.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.d.ts deleted file mode 100644 index b228aec7fd8cc..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/** - * Parses the value of "Value" and reflects it back as attribute. - */ -export declare function handler(event: AWSLambda.CloudFormationCustomResourceEvent): Promise<{ - Data: { - Value: any; - }; -}>; diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.ts deleted file mode 100644 index f082001f80159..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { CfnUtilsResourceType } from './consts'; - -/** - * Parses the value of "Value" and reflects it back as attribute. - */ -export async function handler(event: AWSLambda.CloudFormationCustomResourceEvent) { - - // dispatch based on resource type - if (event.ResourceType === CfnUtilsResourceType.CFN_JSON) { - return cfnJsonHandler(event); - } - if (event.ResourceType === CfnUtilsResourceType.CFN_JSON_STRINGIFY) { - return cfnJsonStringifyHandler(event); - } - - throw new Error(`unexpected resource type "${event.ResourceType}`); -} - -function cfnJsonHandler(event: AWSLambda.CloudFormationCustomResourceEvent) { - return { - Data: { - Value: JSON.parse(event.ResourceProperties.Value), - }, - }; -} - -function cfnJsonStringifyHandler(event: AWSLambda.CloudFormationCustomResourceEvent) { - return { - Data: { - Value: JSON.stringify(event.ResourceProperties.Value), - }, - }; -} diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip index 4b3aea09155c1..8097ad2422b72 100644 Binary files a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip and b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip differ diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/__entrypoint__.js b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a/__entrypoint__.js similarity index 100% rename from packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/__entrypoint__.js rename to packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a/__entrypoint__.js diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.js b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a/consts.js similarity index 100% rename from packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/consts.js rename to packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a/consts.js diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.js b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a/index.js similarity index 100% rename from packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3/index.js rename to packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/asset.f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a/index.js diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/aws-cdk-eks-cluster-inference-test.assets.json b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/aws-cdk-eks-cluster-inference-test.assets.json index 2d6ff5ceea69a..f6738537ab0b1 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/aws-cdk-eks-cluster-inference-test.assets.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/aws-cdk-eks-cluster-inference-test.assets.json @@ -79,28 +79,28 @@ } } }, - "42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174": { + "b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3": { "source": { - "path": "asset.42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174", + "path": "asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3", "packaging": "zip" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174.zip", + "objectKey": "b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3": { + "f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a": { "source": { - "path": "asset.b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3", + "path": "asset.f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a", "packaging": "zip" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3.zip", + "objectKey": "f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } @@ -131,7 +131,7 @@ } } }, - "05fb7987c76195968e624b0f55bd43dae83b193488be58d7ae6c64ce4ffa48ca": { + "9b7425e32a92d8dc2e71c6b8da0932cf61805cf2de553385b81250f4e32df5d9": { "source": { "path": "aws-cdk-eks-cluster-inference-test.template.json", "packaging": "file" @@ -139,7 +139,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "05fb7987c76195968e624b0f55bd43dae83b193488be58d7ae6c64ce4ffa48ca.json", + "objectKey": "9b7425e32a92d8dc2e71c6b8da0932cf61805cf2de553385b81250f4e32df5d9.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/aws-cdk-eks-cluster-inference-test.template.json b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/aws-cdk-eks-cluster-inference-test.template.json index 950e654ba9014..75c15c4cd069b 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/aws-cdk-eks-cluster-inference-test.template.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/aws-cdk-eks-cluster-inference-test.template.json @@ -839,9 +839,6 @@ "ClientIDList": [ "sts.amazonaws.com" ], - "ThumbprintList": [ - "9e99a48a9960b14926bb7f3b02e22da2b0ab7280" - ], "Url": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1855,7 +1852,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "42973d1d89f4a393a64981f78d088964ba13e63a3aab4478cd74109c77cf9174.zip" + "S3Key": "b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3.zip" }, "Timeout": 900, "MemorySize": 128, @@ -1901,7 +1898,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "b9db8e64e56b84987288e77a56bf3c0fb982931aa35cb2dcff4bc8a115ae87b3.zip" + "S3Key": "f4599f463f56c5c9d584a8aca5b607b7bb0cead0b089b8ccd66b69f00b5ee98a.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/manifest.json b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/manifest.json index 902cc52520359..212cc67af1803 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/manifest.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-inference.js.snapshot/manifest.json @@ -23,7 +23,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/05fb7987c76195968e624b0f55bd43dae83b193488be58d7ae6c64ce4ffa48ca.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/9b7425e32a92d8dc2e71c6b8da0932cf61805cf2de553385b81250f4e32df5d9.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/__entrypoint__.js b/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/__entrypoint__.js deleted file mode 100644 index 9df94382cc74e..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/__entrypoint__.js +++ /dev/null @@ -1,118 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.handler = exports.external = void 0; -const https = require("https"); -const url = require("url"); -// for unit tests -exports.external = { - sendHttpRequest: defaultSendHttpRequest, - log: defaultLog, - includeStackTraces: true, - userHandlerIndex: './index', -}; -const CREATE_FAILED_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::CREATE_FAILED'; -const MISSING_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::MISSING_PHYSICAL_ID'; -async function handler(event, context) { - const sanitizedEvent = { ...event, ResponseURL: '...' }; - exports.external.log(JSON.stringify(sanitizedEvent, undefined, 2)); - // ignore DELETE event when the physical resource ID is the marker that - // indicates that this DELETE is a subsequent DELETE to a failed CREATE - // operation. - if (event.RequestType === 'Delete' && event.PhysicalResourceId === CREATE_FAILED_PHYSICAL_ID_MARKER) { - exports.external.log('ignoring DELETE event caused by a failed CREATE event'); - await submitResponse('SUCCESS', event); - return; - } - try { - // invoke the user handler. this is intentionally inside the try-catch to - // ensure that if there is an error it's reported as a failure to - // cloudformation (otherwise cfn waits). - // eslint-disable-next-line @typescript-eslint/no-require-imports - const userHandler = require(exports.external.userHandlerIndex).handler; - const result = await userHandler(sanitizedEvent, context); - // validate user response and create the combined event - const responseEvent = renderResponse(event, result); - // submit to cfn as success - await submitResponse('SUCCESS', responseEvent); - } - catch (e) { - const resp = { - ...event, - Reason: exports.external.includeStackTraces ? e.stack : e.message, - }; - if (!resp.PhysicalResourceId) { - // special case: if CREATE fails, which usually implies, we usually don't - // have a physical resource id. in this case, the subsequent DELETE - // operation does not have any meaning, and will likely fail as well. to - // address this, we use a marker so the provider framework can simply - // ignore the subsequent DELETE. - if (event.RequestType === 'Create') { - exports.external.log('CREATE failed, responding with a marker physical resource id so that the subsequent DELETE will be ignored'); - resp.PhysicalResourceId = CREATE_FAILED_PHYSICAL_ID_MARKER; - } - else { - // otherwise, if PhysicalResourceId is not specified, something is - // terribly wrong because all other events should have an ID. - exports.external.log(`ERROR: Malformed event. "PhysicalResourceId" is required: ${JSON.stringify(event)}`); - } - } - // this is an actual error, fail the activity altogether and exist. - await submitResponse('FAILED', resp); - } -} -exports.handler = handler; -function renderResponse(cfnRequest, handlerResponse = {}) { - // if physical ID is not returned, we have some defaults for you based - // on the request type. - const physicalResourceId = handlerResponse.PhysicalResourceId ?? cfnRequest.PhysicalResourceId ?? cfnRequest.RequestId; - // if we are in DELETE and physical ID was changed, it's an error. - if (cfnRequest.RequestType === 'Delete' && physicalResourceId !== cfnRequest.PhysicalResourceId) { - throw new Error(`DELETE: cannot change the physical resource ID from "${cfnRequest.PhysicalResourceId}" to "${handlerResponse.PhysicalResourceId}" during deletion`); - } - // merge request event and result event (result prevails). - return { - ...cfnRequest, - ...handlerResponse, - PhysicalResourceId: physicalResourceId, - }; -} -async function submitResponse(status, event) { - const json = { - Status: status, - Reason: event.Reason ?? status, - StackId: event.StackId, - RequestId: event.RequestId, - PhysicalResourceId: event.PhysicalResourceId || MISSING_PHYSICAL_ID_MARKER, - LogicalResourceId: event.LogicalResourceId, - NoEcho: event.NoEcho, - Data: event.Data, - }; - exports.external.log('submit response to cloudformation', json); - const responseBody = JSON.stringify(json); - const parsedUrl = url.parse(event.ResponseURL); - const req = { - hostname: parsedUrl.hostname, - path: parsedUrl.path, - method: 'PUT', - headers: { 'content-type': '', 'content-length': responseBody.length }, - }; - await exports.external.sendHttpRequest(req, responseBody); -} -async function defaultSendHttpRequest(options, responseBody) { - return new Promise((resolve, reject) => { - try { - const request = https.request(options, _ => resolve()); - request.on('error', reject); - request.write(responseBody); - request.end(); - } - catch (e) { - reject(e); - } - }); -} -function defaultLog(fmt, ...params) { - // eslint-disable-next-line no-console - console.log(fmt, ...params); -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"nodejs-entrypoint.js","sourceRoot":"","sources":["nodejs-entrypoint.ts"],"names":[],"mappings":"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","sourcesContent":["import * as https from 'https';\nimport * as url from 'url';\n\n// for unit tests\nexport const external = {\n  sendHttpRequest: defaultSendHttpRequest,\n  log: defaultLog,\n  includeStackTraces: true,\n  userHandlerIndex: './index',\n};\n\nconst CREATE_FAILED_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::CREATE_FAILED';\nconst MISSING_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::MISSING_PHYSICAL_ID';\n\nexport type Response = AWSLambda.CloudFormationCustomResourceEvent & HandlerResponse;\nexport type Handler = (event: AWSLambda.CloudFormationCustomResourceEvent, context: AWSLambda.Context) => Promise<HandlerResponse | void>;\nexport type HandlerResponse = undefined | {\n  Data?: any;\n  PhysicalResourceId?: string;\n  Reason?: string;\n  NoEcho?: boolean;\n};\n\nexport async function handler(event: AWSLambda.CloudFormationCustomResourceEvent, context: AWSLambda.Context) {\n  const sanitizedEvent = { ...event, ResponseURL: '...' };\n  external.log(JSON.stringify(sanitizedEvent, undefined, 2));\n\n  // ignore DELETE event when the physical resource ID is the marker that\n  // indicates that this DELETE is a subsequent DELETE to a failed CREATE\n  // operation.\n  if (event.RequestType === 'Delete' && event.PhysicalResourceId === CREATE_FAILED_PHYSICAL_ID_MARKER) {\n    external.log('ignoring DELETE event caused by a failed CREATE event');\n    await submitResponse('SUCCESS', event);\n    return;\n  }\n\n  try {\n    // invoke the user handler. this is intentionally inside the try-catch to\n    // ensure that if there is an error it's reported as a failure to\n    // cloudformation (otherwise cfn waits).\n    // eslint-disable-next-line @typescript-eslint/no-require-imports\n    const userHandler: Handler = require(external.userHandlerIndex).handler;\n    const result = await userHandler(sanitizedEvent, context);\n\n    // validate user response and create the combined event\n    const responseEvent = renderResponse(event, result);\n\n    // submit to cfn as success\n    await submitResponse('SUCCESS', responseEvent);\n  } catch (e) {\n    const resp: Response = {\n      ...event,\n      Reason: external.includeStackTraces ? e.stack : e.message,\n    };\n\n    if (!resp.PhysicalResourceId) {\n      // special case: if CREATE fails, which usually implies, we usually don't\n      // have a physical resource id. in this case, the subsequent DELETE\n      // operation does not have any meaning, and will likely fail as well. to\n      // address this, we use a marker so the provider framework can simply\n      // ignore the subsequent DELETE.\n      if (event.RequestType === 'Create') {\n        external.log('CREATE failed, responding with a marker physical resource id so that the subsequent DELETE will be ignored');\n        resp.PhysicalResourceId = CREATE_FAILED_PHYSICAL_ID_MARKER;\n      } else {\n        // otherwise, if PhysicalResourceId is not specified, something is\n        // terribly wrong because all other events should have an ID.\n        external.log(`ERROR: Malformed event. \"PhysicalResourceId\" is required: ${JSON.stringify(event)}`);\n      }\n    }\n\n    // this is an actual error, fail the activity altogether and exist.\n    await submitResponse('FAILED', resp);\n  }\n}\n\nfunction renderResponse(\n  cfnRequest: AWSLambda.CloudFormationCustomResourceEvent & { PhysicalResourceId?: string },\n  handlerResponse: void | HandlerResponse = { }): Response {\n\n  // if physical ID is not returned, we have some defaults for you based\n  // on the request type.\n  const physicalResourceId = handlerResponse.PhysicalResourceId ?? cfnRequest.PhysicalResourceId ?? cfnRequest.RequestId;\n\n  // if we are in DELETE and physical ID was changed, it's an error.\n  if (cfnRequest.RequestType === 'Delete' && physicalResourceId !== cfnRequest.PhysicalResourceId) {\n    throw new Error(`DELETE: cannot change the physical resource ID from \"${cfnRequest.PhysicalResourceId}\" to \"${handlerResponse.PhysicalResourceId}\" during deletion`);\n  }\n\n  // merge request event and result event (result prevails).\n  return {\n    ...cfnRequest,\n    ...handlerResponse,\n    PhysicalResourceId: physicalResourceId,\n  };\n}\n\nasync function submitResponse(status: 'SUCCESS' | 'FAILED', event: Response) {\n  const json: AWSLambda.CloudFormationCustomResourceResponse = {\n    Status: status,\n    Reason: event.Reason ?? status,\n    StackId: event.StackId,\n    RequestId: event.RequestId,\n    PhysicalResourceId: event.PhysicalResourceId || MISSING_PHYSICAL_ID_MARKER,\n    LogicalResourceId: event.LogicalResourceId,\n    NoEcho: event.NoEcho,\n    Data: event.Data,\n  };\n\n  external.log('submit response to cloudformation', json);\n\n  const responseBody = JSON.stringify(json);\n  const parsedUrl = url.parse(event.ResponseURL);\n  const req = {\n    hostname: parsedUrl.hostname,\n    path: parsedUrl.path,\n    method: 'PUT',\n    headers: { 'content-type': '', 'content-length': responseBody.length },\n  };\n\n  await external.sendHttpRequest(req, responseBody);\n}\n\nasync function defaultSendHttpRequest(options: https.RequestOptions, responseBody: string): Promise<void> {\n  return new Promise((resolve, reject) => {\n    try {\n      const request = https.request(options, _ => resolve());\n      request.on('error', reject);\n      request.write(responseBody);\n      request.end();\n    } catch (e) {\n      reject(e);\n    }\n  });\n}\n\nfunction defaultLog(fmt: string, ...params: any[]) {\n  // eslint-disable-next-line no-console\n  console.log(fmt, ...params);\n}\n"]} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/diff.d.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/diff.d.ts deleted file mode 100644 index 53962e1f09938..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/diff.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export declare function arrayDiff(oldValues: string[], newValues: string[]): { - adds: string[]; - deletes: string[]; -}; diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/diff.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/diff.ts deleted file mode 100644 index 8a91e6ebddc53..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/diff.ts +++ /dev/null @@ -1,17 +0,0 @@ -export function arrayDiff(oldValues: string[], newValues: string[]) { - const deletes = new Set(oldValues); - const adds = new Set(); - - for (const v of new Set(newValues)) { - if (deletes.has(v)) { - deletes.delete(v); - } else { - adds.add(v); - } - } - - return { - adds: Array.from(adds), - deletes: Array.from(deletes), - }; -} diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/external.d.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/external.d.ts deleted file mode 100644 index 8fe88b8f82209..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/external.d.ts +++ /dev/null @@ -1,24 +0,0 @@ -import * as aws from 'aws-sdk'; -declare function defaultLogger(fmt: string, ...args: any[]): void; -/** - * Downloads the CA thumbprint from the issuer URL - */ -declare function downloadThumbprint(issuerUrl: string): Promise; -export declare const external: { - downloadThumbprint: typeof downloadThumbprint; - log: typeof defaultLogger; - createOpenIDConnectProvider: (req: aws.IAM.CreateOpenIDConnectProviderRequest) => Promise>; - deleteOpenIDConnectProvider: (req: aws.IAM.DeleteOpenIDConnectProviderRequest) => Promise<{ - $response: aws.Response<{}, aws.AWSError>; - }>; - updateOpenIDConnectProviderThumbprint: (req: aws.IAM.UpdateOpenIDConnectProviderThumbprintRequest) => Promise<{ - $response: aws.Response<{}, aws.AWSError>; - }>; - addClientIDToOpenIDConnectProvider: (req: aws.IAM.AddClientIDToOpenIDConnectProviderRequest) => Promise<{ - $response: aws.Response<{}, aws.AWSError>; - }>; - removeClientIDFromOpenIDConnectProvider: (req: aws.IAM.RemoveClientIDFromOpenIDConnectProviderRequest) => Promise<{ - $response: aws.Response<{}, aws.AWSError>; - }>; -}; -export {}; diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/external.js b/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/external.js deleted file mode 100644 index 2f6632aed7b13..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/external.js +++ /dev/null @@ -1,53 +0,0 @@ -"use strict"; -/* istanbul ignore file */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.external = void 0; -const tls = require("tls"); -const url = require("url"); -// eslint-disable-next-line import/no-extraneous-dependencies -const aws = require("aws-sdk"); -let client; -function iam() { - if (!client) { - client = new aws.IAM(); - } - return client; -} -function defaultLogger(fmt, ...args) { - // eslint-disable-next-line no-console - console.log(fmt, ...args); -} -/** - * Downloads the CA thumbprint from the issuer URL - */ -async function downloadThumbprint(issuerUrl) { - exports.external.log(`downloading certificate authority thumbprint for ${issuerUrl}`); - return new Promise((ok, ko) => { - const purl = url.parse(issuerUrl); - const port = purl.port ? parseInt(purl.port, 10) : 443; - if (!purl.host) { - return ko(new Error(`unable to determine host from issuer url ${issuerUrl}`)); - } - const socket = tls.connect(port, purl.host, { rejectUnauthorized: false, servername: purl.host }); - socket.once('error', ko); - socket.once('secureConnect', () => { - const cert = socket.getPeerCertificate(); - socket.end(); - const thumbprint = cert.fingerprint.split(':').join(''); - exports.external.log(`certificate authority thumbprint for ${issuerUrl} is ${thumbprint}`); - ok(thumbprint); - }); - }); -} -// allows unit test to replace with mocks -/* eslint-disable max-len */ -exports.external = { - downloadThumbprint, - log: defaultLogger, - createOpenIDConnectProvider: (req) => iam().createOpenIDConnectProvider(req).promise(), - deleteOpenIDConnectProvider: (req) => iam().deleteOpenIDConnectProvider(req).promise(), - updateOpenIDConnectProviderThumbprint: (req) => iam().updateOpenIDConnectProviderThumbprint(req).promise(), - addClientIDToOpenIDConnectProvider: (req) => iam().addClientIDToOpenIDConnectProvider(req).promise(), - removeClientIDFromOpenIDConnectProvider: (req) => iam().removeClientIDFromOpenIDConnectProvider(req).promise(), -}; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXh0ZXJuYWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJleHRlcm5hbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQTBCOzs7QUFFMUIsMkJBQTJCO0FBQzNCLDJCQUEyQjtBQUMzQiw2REFBNkQ7QUFDN0QsK0JBQStCO0FBRS9CLElBQUksTUFBZSxDQUFDO0FBRXBCLFNBQVMsR0FBRztJQUNWLElBQUksQ0FBQyxNQUFNLEVBQUU7UUFBRSxNQUFNLEdBQUcsSUFBSSxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUM7S0FBRTtJQUN4QyxPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDO0FBRUQsU0FBUyxhQUFhLENBQUMsR0FBVyxFQUFFLEdBQUcsSUFBVztJQUNoRCxzQ0FBc0M7SUFDdEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQztBQUM1QixDQUFDO0FBRUQ7O0dBRUc7QUFDSCxLQUFLLFVBQVUsa0JBQWtCLENBQUMsU0FBaUI7SUFDakQsZ0JBQVEsQ0FBQyxHQUFHLENBQUMsb0RBQW9ELFNBQVMsRUFBRSxDQUFDLENBQUM7SUFDOUUsT0FBTyxJQUFJLE9BQU8sQ0FBUyxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRTtRQUNwQyxNQUFNLElBQUksR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ2xDLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUM7UUFDdkQsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUU7WUFDZCxPQUFPLEVBQUUsQ0FBQyxJQUFJLEtBQUssQ0FBQyw0Q0FBNEMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDO1NBQy9FO1FBQ0QsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxFQUFFLGtCQUFrQixFQUFFLEtBQUssRUFBRSxVQUFVLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7UUFDbEcsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDekIsTUFBTSxDQUFDLElBQUksQ0FBQyxlQUFlLEVBQUUsR0FBRyxFQUFFO1lBQ2hDLE1BQU0sSUFBSSxHQUFHLE1BQU0sQ0FBQyxrQkFBa0IsRUFBRSxDQUFDO1lBQ3pDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUNiLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUN4RCxnQkFBUSxDQUFDLEdBQUcsQ0FBQyx3Q0FBd0MsU0FBUyxPQUFPLFVBQVUsRUFBRSxDQUFDLENBQUM7WUFDbkYsRUFBRSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ2pCLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBRUQseUNBQXlDO0FBQ3pDLDRCQUE0QjtBQUNmLFFBQUEsUUFBUSxHQUFHO0lBQ3RCLGtCQUFrQjtJQUNsQixHQUFHLEVBQUUsYUFBYTtJQUNsQiwyQkFBMkIsRUFBRSxDQUFDLEdBQStDLEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLDJCQUEyQixDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtJQUNsSSwyQkFBMkIsRUFBRSxDQUFDLEdBQStDLEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLDJCQUEyQixDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtJQUNsSSxxQ0FBcUMsRUFBRSxDQUFDLEdBQXlELEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLHFDQUFxQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtJQUNoSyxrQ0FBa0MsRUFBRSxDQUFDLEdBQXNELEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLGtDQUFrQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtJQUN2Six1Q0FBdUMsRUFBRSxDQUFDLEdBQTJELEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLHVDQUF1QyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtDQUN2SyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyogaXN0YW5idWwgaWdub3JlIGZpbGUgKi9cblxuaW1wb3J0ICogYXMgdGxzIGZyb20gJ3Rscyc7XG5pbXBvcnQgKiBhcyB1cmwgZnJvbSAndXJsJztcbi8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBpbXBvcnQvbm8tZXh0cmFuZW91cy1kZXBlbmRlbmNpZXNcbmltcG9ydCAqIGFzIGF3cyBmcm9tICdhd3Mtc2RrJztcblxubGV0IGNsaWVudDogYXdzLklBTTtcblxuZnVuY3Rpb24gaWFtKCkge1xuICBpZiAoIWNsaWVudCkgeyBjbGllbnQgPSBuZXcgYXdzLklBTSgpOyB9XG4gIHJldHVybiBjbGllbnQ7XG59XG5cbmZ1bmN0aW9uIGRlZmF1bHRMb2dnZXIoZm10OiBzdHJpbmcsIC4uLmFyZ3M6IGFueVtdKSB7XG4gIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBuby1jb25zb2xlXG4gIGNvbnNvbGUubG9nKGZtdCwgLi4uYXJncyk7XG59XG5cbi8qKlxuICogRG93bmxvYWRzIHRoZSBDQSB0aHVtYnByaW50IGZyb20gdGhlIGlzc3VlciBVUkxcbiAqL1xuYXN5bmMgZnVuY3Rpb24gZG93bmxvYWRUaHVtYnByaW50KGlzc3VlclVybDogc3RyaW5nKSB7XG4gIGV4dGVybmFsLmxvZyhgZG93bmxvYWRpbmcgY2VydGlmaWNhdGUgYXV0aG9yaXR5IHRodW1icHJpbnQgZm9yICR7aXNzdWVyVXJsfWApO1xuICByZXR1cm4gbmV3IFByb21pc2U8c3RyaW5nPigob2ssIGtvKSA9PiB7XG4gICAgY29uc3QgcHVybCA9IHVybC5wYXJzZShpc3N1ZXJVcmwpO1xuICAgIGNvbnN0IHBvcnQgPSBwdXJsLnBvcnQgPyBwYXJzZUludChwdXJsLnBvcnQsIDEwKSA6IDQ0MztcbiAgICBpZiAoIXB1cmwuaG9zdCkge1xuICAgICAgcmV0dXJuIGtvKG5ldyBFcnJvcihgdW5hYmxlIHRvIGRldGVybWluZSBob3N0IGZyb20gaXNzdWVyIHVybCAke2lzc3VlclVybH1gKSk7XG4gICAgfVxuICAgIGNvbnN0IHNvY2tldCA9IHRscy5jb25uZWN0KHBvcnQsIHB1cmwuaG9zdCwgeyByZWplY3RVbmF1dGhvcml6ZWQ6IGZhbHNlLCBzZXJ2ZXJuYW1lOiBwdXJsLmhvc3QgfSk7XG4gICAgc29ja2V0Lm9uY2UoJ2Vycm9yJywga28pO1xuICAgIHNvY2tldC5vbmNlKCdzZWN1cmVDb25uZWN0JywgKCkgPT4ge1xuICAgICAgY29uc3QgY2VydCA9IHNvY2tldC5nZXRQZWVyQ2VydGlmaWNhdGUoKTtcbiAgICAgIHNvY2tldC5lbmQoKTtcbiAgICAgIGNvbnN0IHRodW1icHJpbnQgPSBjZXJ0LmZpbmdlcnByaW50LnNwbGl0KCc6Jykuam9pbignJyk7XG4gICAgICBleHRlcm5hbC5sb2coYGNlcnRpZmljYXRlIGF1dGhvcml0eSB0aHVtYnByaW50IGZvciAke2lzc3VlclVybH0gaXMgJHt0aHVtYnByaW50fWApO1xuICAgICAgb2sodGh1bWJwcmludCk7XG4gICAgfSk7XG4gIH0pO1xufVxuXG4vLyBhbGxvd3MgdW5pdCB0ZXN0IHRvIHJlcGxhY2Ugd2l0aCBtb2Nrc1xuLyogZXNsaW50LWRpc2FibGUgbWF4LWxlbiAqL1xuZXhwb3J0IGNvbnN0IGV4dGVybmFsID0ge1xuICBkb3dubG9hZFRodW1icHJpbnQsXG4gIGxvZzogZGVmYXVsdExvZ2dlcixcbiAgY3JlYXRlT3BlbklEQ29ubmVjdFByb3ZpZGVyOiAocmVxOiBhd3MuSUFNLkNyZWF0ZU9wZW5JRENvbm5lY3RQcm92aWRlclJlcXVlc3QpID0+IGlhbSgpLmNyZWF0ZU9wZW5JRENvbm5lY3RQcm92aWRlcihyZXEpLnByb21pc2UoKSxcbiAgZGVsZXRlT3BlbklEQ29ubmVjdFByb3ZpZGVyOiAocmVxOiBhd3MuSUFNLkRlbGV0ZU9wZW5JRENvbm5lY3RQcm92aWRlclJlcXVlc3QpID0+IGlhbSgpLmRlbGV0ZU9wZW5JRENvbm5lY3RQcm92aWRlcihyZXEpLnByb21pc2UoKSxcbiAgdXBkYXRlT3BlbklEQ29ubmVjdFByb3ZpZGVyVGh1bWJwcmludDogKHJlcTogYXdzLklBTS5VcGRhdGVPcGVuSURDb25uZWN0UHJvdmlkZXJUaHVtYnByaW50UmVxdWVzdCkgPT4gaWFtKCkudXBkYXRlT3BlbklEQ29ubmVjdFByb3ZpZGVyVGh1bWJwcmludChyZXEpLnByb21pc2UoKSxcbiAgYWRkQ2xpZW50SURUb09wZW5JRENvbm5lY3RQcm92aWRlcjogKHJlcTogYXdzLklBTS5BZGRDbGllbnRJRFRvT3BlbklEQ29ubmVjdFByb3ZpZGVyUmVxdWVzdCkgPT4gaWFtKCkuYWRkQ2xpZW50SURUb09wZW5JRENvbm5lY3RQcm92aWRlcihyZXEpLnByb21pc2UoKSxcbiAgcmVtb3ZlQ2xpZW50SURGcm9tT3BlbklEQ29ubmVjdFByb3ZpZGVyOiAocmVxOiBhd3MuSUFNLlJlbW92ZUNsaWVudElERnJvbU9wZW5JRENvbm5lY3RQcm92aWRlclJlcXVlc3QpID0+IGlhbSgpLnJlbW92ZUNsaWVudElERnJvbU9wZW5JRENvbm5lY3RQcm92aWRlcihyZXEpLnByb21pc2UoKSxcbn07XG4iXX0= \ No newline at end of file diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/external.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/external.ts deleted file mode 100644 index 4ad18aed4f17d..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/external.ts +++ /dev/null @@ -1,53 +0,0 @@ -/* istanbul ignore file */ - -import * as tls from 'tls'; -import * as url from 'url'; -// eslint-disable-next-line import/no-extraneous-dependencies -import * as aws from 'aws-sdk'; - -let client: aws.IAM; - -function iam() { - if (!client) { client = new aws.IAM(); } - return client; -} - -function defaultLogger(fmt: string, ...args: any[]) { - // eslint-disable-next-line no-console - console.log(fmt, ...args); -} - -/** - * Downloads the CA thumbprint from the issuer URL - */ -async function downloadThumbprint(issuerUrl: string) { - external.log(`downloading certificate authority thumbprint for ${issuerUrl}`); - return new Promise((ok, ko) => { - const purl = url.parse(issuerUrl); - const port = purl.port ? parseInt(purl.port, 10) : 443; - if (!purl.host) { - return ko(new Error(`unable to determine host from issuer url ${issuerUrl}`)); - } - const socket = tls.connect(port, purl.host, { rejectUnauthorized: false, servername: purl.host }); - socket.once('error', ko); - socket.once('secureConnect', () => { - const cert = socket.getPeerCertificate(); - socket.end(); - const thumbprint = cert.fingerprint.split(':').join(''); - external.log(`certificate authority thumbprint for ${issuerUrl} is ${thumbprint}`); - ok(thumbprint); - }); - }); -} - -// allows unit test to replace with mocks -/* eslint-disable max-len */ -export const external = { - downloadThumbprint, - log: defaultLogger, - createOpenIDConnectProvider: (req: aws.IAM.CreateOpenIDConnectProviderRequest) => iam().createOpenIDConnectProvider(req).promise(), - deleteOpenIDConnectProvider: (req: aws.IAM.DeleteOpenIDConnectProviderRequest) => iam().deleteOpenIDConnectProvider(req).promise(), - updateOpenIDConnectProviderThumbprint: (req: aws.IAM.UpdateOpenIDConnectProviderThumbprintRequest) => iam().updateOpenIDConnectProviderThumbprint(req).promise(), - addClientIDToOpenIDConnectProvider: (req: aws.IAM.AddClientIDToOpenIDConnectProviderRequest) => iam().addClientIDToOpenIDConnectProvider(req).promise(), - removeClientIDFromOpenIDConnectProvider: (req: aws.IAM.RemoveClientIDFromOpenIDConnectProviderRequest) => iam().removeClientIDFromOpenIDConnectProvider(req).promise(), -}; diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/index.d.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/index.d.ts deleted file mode 100644 index 038b626561d4a..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/index.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export declare function handler(event: AWSLambda.CloudFormationCustomResourceEvent): Promise; diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/index.ts b/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/index.ts deleted file mode 100644 index ee276edd3fa9b..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/index.ts +++ /dev/null @@ -1,89 +0,0 @@ -import { arrayDiff } from './diff'; -import { external } from './external'; - -export async function handler(event: AWSLambda.CloudFormationCustomResourceEvent) { - if (event.RequestType === 'Create') { return onCreate(event); } - if (event.RequestType === 'Update') { return onUpdate(event); } - if (event.RequestType === 'Delete') { return onDelete(event); } - throw new Error('invalid request type'); -} - -async function onCreate(event: AWSLambda.CloudFormationCustomResourceCreateEvent) { - const issuerUrl = event.ResourceProperties.Url; - const thumbprints: string[] = (event.ResourceProperties.ThumbprintList ?? []).sort(); // keep sorted for UPDATE - const clients: string[] = (event.ResourceProperties.ClientIDList ?? []).sort(); - - if (thumbprints.length === 0) { - thumbprints.push(await external.downloadThumbprint(issuerUrl)); - } - - const resp = await external.createOpenIDConnectProvider({ - Url: issuerUrl, - ClientIDList: clients, - ThumbprintList: thumbprints, - }); - - return { - PhysicalResourceId: resp.OpenIDConnectProviderArn, - }; -} - -async function onUpdate(event: AWSLambda.CloudFormationCustomResourceUpdateEvent) { - const issuerUrl = event.ResourceProperties.Url; - const thumbprints: string[] = (event.ResourceProperties.ThumbprintList ?? []).sort(); // keep sorted for UPDATE - const clients: string[] = (event.ResourceProperties.ClientIDList ?? []).sort(); - - // determine which update we are talking about. - const oldIssuerUrl = event.OldResourceProperties.Url; - - // if this is a URL update, then we basically create a new resource and cfn will delete the old one - // since the physical resource ID will change. - if (oldIssuerUrl !== issuerUrl) { - return onCreate({ ...event, RequestType: 'Create' }); - } - - const providerArn = event.PhysicalResourceId; - - // if thumbprints changed, we can update in-place, but bear in mind that if the new thumbprint list - // is empty, we will grab it from the server like we do in CREATE - const oldThumbprints = (event.OldResourceProperties.ThumbprintList || []).sort(); - if (JSON.stringify(oldThumbprints) !== JSON.stringify(thumbprints)) { - const thumbprintList = thumbprints.length > 0 ? thumbprints : [await external.downloadThumbprint(issuerUrl)]; - external.log('updating thumbprint list from', oldThumbprints, 'to', thumbprints); - await external.updateOpenIDConnectProviderThumbprint({ - OpenIDConnectProviderArn: providerArn, - ThumbprintList: thumbprintList, - }); - - // don't return, we might have more updates... - } - - // if client ID list has changed, determine "diff" because the API is add/remove - const oldClients: string[] = (event.OldResourceProperties.ClientIDList || []).sort(); - const diff = arrayDiff(oldClients, clients); - external.log(`client ID diff: ${JSON.stringify(diff)}`); - - for (const addClient of diff.adds) { - external.log(`adding client id "${addClient}" to provider ${providerArn}`); - await external.addClientIDToOpenIDConnectProvider({ - OpenIDConnectProviderArn: providerArn, - ClientID: addClient, - }); - } - - for (const deleteClient of diff.deletes) { - external.log(`removing client id "${deleteClient}" from provider ${providerArn}`); - await external.removeClientIDFromOpenIDConnectProvider({ - OpenIDConnectProviderArn: providerArn, - ClientID: deleteClient, - }); - } - - return; -} - -async function onDelete(deleteEvent: AWSLambda.CloudFormationCustomResourceDeleteEvent) { - await external.deleteOpenIDConnectProvider({ - OpenIDConnectProviderArn: deleteEvent.PhysicalResourceId, - }); -} diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.8a0a8c03b198919a101198f32c18622186aec532054cb63937cc769635f8e7ef/__entrypoint__.js b/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/__entrypoint__.js similarity index 100% rename from packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.8a0a8c03b198919a101198f32c18622186aec532054cb63937cc769635f8e7ef/__entrypoint__.js rename to packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/__entrypoint__.js diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/diff.js b/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/diff.js similarity index 100% rename from packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/diff.js rename to packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/diff.js diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/external.js b/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/external.js new file mode 100644 index 0000000000000..7d8c6e611c70b --- /dev/null +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/external.js @@ -0,0 +1,88 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.external = exports.downloadThumbprint = void 0; +const util = require("node:util"); +const tls = require("tls"); +const url = require("url"); +// eslint-disable-next-line import/no-extraneous-dependencies +const aws = require("aws-sdk"); +let client; +function iam() { + if (!client) { + client = new aws.IAM(); + } + return client; +} +function defaultLogger(fmt, ...args) { + // eslint-disable-next-line no-console + console.log(fmt, ...args); +} +/** + * Downloads the CA thumbprint from the issuer URL + */ +async function downloadThumbprint(issuerUrl) { + exports.external.log(`Downloading certificate authority thumbprint for ${issuerUrl}`); + return new Promise((ok, ko) => { + const purl = url.parse(issuerUrl); + const port = purl.port ? parseInt(purl.port, 10) : 443; + if (!purl.host) { + return ko(new Error(`unable to determine host from issuer url ${issuerUrl}`)); + } + const socket = tls.connect(port, purl.host, { rejectUnauthorized: false, servername: purl.host }); + socket.once('error', ko); + socket.once('secureConnect', () => { + // This set to `true` would return the entire chain of certificates as a circular reference object + let cert = socket.getPeerCertificate(true); + const unqiueCerts = new Set(); + do { + unqiueCerts.add(cert); + cert = cert.issuerCertificate; + } while (cert && typeof cert === 'object' && !unqiueCerts.has(cert)); + // The last `cert` obtained must be the root certificate in the certificate chain + const rootCert = [...unqiueCerts].pop(); + // Add `ca: true` when node merges the feature. Awaiting resolution: https://github.com/nodejs/node/issues/44905 + if (!(util.isDeepStrictEqual(rootCert.issuer, rootCert.subject))) { + return ko(new Error(`Subject and Issuer of certificate received are different. + Received: \'Subject\' is ${JSON.stringify(rootCert.subject, null, 4)} and \'Issuer\':${JSON.stringify(rootCert.issuer, null, 4)}`)); + } + const validTo = new Date(rootCert.valid_to); + const certificateValidity = getCertificateValidity(validTo); + if (certificateValidity < 0) { + return ko(new Error(`The certificate has already expired on: ${validTo.toUTCString()}`)); + } + // Warning user if certificate validity is expiring within 6 months + if (certificateValidity < 180) { + /* eslint-disable-next-line no-console */ + console.warn(`The root certificate obtained would expire in ${certificateValidity} days!`); + } + socket.end(); + const thumbprint = rootCert.fingerprint.split(':').join(''); + exports.external.log(`Certificate Authority thumbprint for ${issuerUrl} is ${thumbprint}`); + ok(thumbprint); + }); + }); +} +exports.downloadThumbprint = downloadThumbprint; +/** + * To get the validity timeline for the certificate + * @param certDate The valid to date for the certificate + * @returns The number of days the certificate is valid wrt current date + */ +function getCertificateValidity(certDate) { + const millisecondsInDay = 24 * 60 * 60 * 1000; + const currentDate = new Date(); + const validity = Math.round((certDate.getTime() - currentDate.getTime()) / millisecondsInDay); + return validity; +} +// allows unit test to replace with mocks +/* eslint-disable max-len */ +exports.external = { + downloadThumbprint, + log: defaultLogger, + createOpenIDConnectProvider: (req) => iam().createOpenIDConnectProvider(req).promise(), + deleteOpenIDConnectProvider: (req) => iam().deleteOpenIDConnectProvider(req).promise(), + updateOpenIDConnectProviderThumbprint: (req) => iam().updateOpenIDConnectProviderThumbprint(req).promise(), + addClientIDToOpenIDConnectProvider: (req) => iam().addClientIDToOpenIDConnectProvider(req).promise(), + removeClientIDFromOpenIDConnectProvider: (req) => iam().removeClientIDFromOpenIDConnectProvider(req).promise(), +}; +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"external.js","sourceRoot":"","sources":["external.ts"],"names":[],"mappings":"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","sourcesContent":["/* istanbul ignore file */\nimport { DetailedPeerCertificate } from 'node:tls';\nimport * as util from 'node:util';\nimport * as tls from 'tls';\nimport * as url from 'url';\n// eslint-disable-next-line import/no-extraneous-dependencies\nimport * as aws from 'aws-sdk';\n\nlet client: aws.IAM;\n\nfunction iam() {\n  if (!client) { client = new aws.IAM(); }\n  return client;\n}\n\nfunction defaultLogger(fmt: string, ...args: any[]) {\n  // eslint-disable-next-line no-console\n  console.log(fmt, ...args);\n}\n\n/**\n * Downloads the CA thumbprint from the issuer URL\n */\nexport async function downloadThumbprint(issuerUrl: string) {\n\n  external.log(`Downloading certificate authority thumbprint for ${issuerUrl}`);\n\n  return new Promise<string>((ok, ko) => {\n    const purl = url.parse(issuerUrl);\n    const port = purl.port ? parseInt(purl.port, 10) : 443;\n\n    if (!purl.host) {\n      return ko(new Error(`unable to determine host from issuer url ${issuerUrl}`));\n    }\n\n    const socket = tls.connect(port, purl.host, { rejectUnauthorized: false, servername: purl.host });\n    socket.once('error', ko);\n\n    socket.once('secureConnect', () => {\n      // This set to `true` would return the entire chain of certificates as a circular reference object\n      let cert = socket.getPeerCertificate(true);\n\n      const unqiueCerts = new Set<DetailedPeerCertificate>();\n      do {\n        unqiueCerts.add(cert);\n        cert = cert.issuerCertificate;\n      } while ( cert && typeof cert === 'object' && !unqiueCerts.has(cert));\n\n      // The last `cert` obtained must be the root certificate in the certificate chain\n      const rootCert = [...unqiueCerts].pop()!;\n\n      // Add `ca: true` when node merges the feature. Awaiting resolution: https://github.com/nodejs/node/issues/44905\n      if (!(util.isDeepStrictEqual(rootCert.issuer, rootCert.subject))) {\n        return ko(new Error(`Subject and Issuer of certificate received are different. \n        Received: \\'Subject\\' is ${JSON.stringify(rootCert.subject, null, 4)} and \\'Issuer\\':${JSON.stringify(rootCert.issuer, null, 4)}`));\n      }\n\n      const validTo = new Date(rootCert.valid_to);\n      const certificateValidity = getCertificateValidity(validTo);\n\n      if (certificateValidity < 0) {\n        return ko(new Error(`The certificate has already expired on: ${validTo.toUTCString()}`));\n      }\n\n      // Warning user if certificate validity is expiring within 6 months\n      if (certificateValidity < 180) {\n        /* eslint-disable-next-line no-console */\n        console.warn(`The root certificate obtained would expire in ${certificateValidity} days!`);\n      }\n\n      socket.end();\n\n      const thumbprint = rootCert.fingerprint.split(':').join('');\n      external.log(`Certificate Authority thumbprint for ${issuerUrl} is ${thumbprint}`);\n\n      ok(thumbprint);\n    });\n  });\n}\n\n/**\n * To get the validity timeline for the certificate\n * @param certDate The valid to date for the certificate\n * @returns The number of days the certificate is valid wrt current date\n */\nfunction getCertificateValidity(certDate: Date): Number {\n  const millisecondsInDay = 24 * 60 * 60 * 1000;\n  const currentDate = new Date();\n\n  const validity = Math.round((certDate.getTime() - currentDate.getTime()) / millisecondsInDay);\n\n  return validity;\n}\n\n// allows unit test to replace with mocks\n/* eslint-disable max-len */\nexport const external = {\n  downloadThumbprint,\n  log: defaultLogger,\n  createOpenIDConnectProvider: (req: aws.IAM.CreateOpenIDConnectProviderRequest) => iam().createOpenIDConnectProvider(req).promise(),\n  deleteOpenIDConnectProvider: (req: aws.IAM.DeleteOpenIDConnectProviderRequest) => iam().deleteOpenIDConnectProvider(req).promise(),\n  updateOpenIDConnectProviderThumbprint: (req: aws.IAM.UpdateOpenIDConnectProviderThumbprintRequest) => iam().updateOpenIDConnectProviderThumbprint(req).promise(),\n  addClientIDToOpenIDConnectProvider: (req: aws.IAM.AddClientIDToOpenIDConnectProviderRequest) => iam().addClientIDToOpenIDConnectProvider(req).promise(),\n  removeClientIDFromOpenIDConnectProvider: (req: aws.IAM.RemoveClientIDFromOpenIDConnectProviderRequest) => iam().removeClientIDFromOpenIDConnectProvider(req).promise(),\n};\n"]} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/index.js b/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/index.js similarity index 100% rename from packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7/index.js rename to packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/index.js diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/aws-eks-oidc-provider-test.assets.json b/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/aws-eks-oidc-provider-test.assets.json index 6faf1bf429d20..d9652ed0f4ae0 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/aws-eks-oidc-provider-test.assets.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/aws-eks-oidc-provider-test.assets.json @@ -1,20 +1,20 @@ { "version": "21.0.0", "files": { - "78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7": { + "b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3": { "source": { - "path": "asset.78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7", + "path": "asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3", "packaging": "zip" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7.zip", + "objectKey": "b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "76b51880fe57f935e35645541ea15057c464712e1df4dd9e985255c2705248cf": { + "7743d71b59f17dc51c3a8650683e193e23090b274e74ec0d8fc118b91534d2ce": { "source": { "path": "aws-eks-oidc-provider-test.template.json", "packaging": "file" @@ -22,7 +22,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "76b51880fe57f935e35645541ea15057c464712e1df4dd9e985255c2705248cf.json", + "objectKey": "7743d71b59f17dc51c3a8650683e193e23090b274e74ec0d8fc118b91534d2ce.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/aws-eks-oidc-provider-test.template.json b/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/aws-eks-oidc-provider-test.template.json index d1c76e68082a2..13fd66e941d1e 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/aws-eks-oidc-provider-test.template.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/aws-eks-oidc-provider-test.template.json @@ -12,9 +12,6 @@ "ClientIDList": [ "sts.amazonaws.com" ], - "ThumbprintList": [ - "9e99a48a9960b14926bb7f3b02e22da2b0ab7280" - ], "Url": { "Fn::Join": [ "", @@ -81,7 +78,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "78989d876411e582ce92577de10ee129b12c1f09d8b77f9f45ce2b97cb53bad7.zip" + "S3Key": "b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/manifest.json b/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/manifest.json index 915f5824fa7b6..0a95e21ce710e 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/manifest.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/manifest.json @@ -23,7 +23,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/76b51880fe57f935e35645541ea15057c464712e1df4dd9e985255c2705248cf.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/7743d71b59f17dc51c3a8650683e193e23090b274e74ec0d8fc118b91534d2ce.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/tree.json b/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/tree.json index e445b4a5ce25d..2f6c11fc89269 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/tree.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-oidc-provider.js.snapshot/tree.json @@ -9,7 +9,7 @@ "path": "Tree", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.95" + "version": "10.1.140" } }, "aws-eks-oidc-provider-test": { @@ -97,7 +97,7 @@ "path": "aws-cdk-eks-oidc-provider/DefaultTest/Default", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.95" + "version": "10.1.140" } }, "DeployAssert": { diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.4288ebb3652acdf2d828b7db7ca44a7162a401ace50ebb4026e84b18a02a06ee.zip b/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.4288ebb3652acdf2d828b7db7ca44a7162a401ace50ebb4026e84b18a02a06ee.zip index 069c7e28f7cbe..4b95260872643 100644 Binary files a/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.4288ebb3652acdf2d828b7db7ca44a7162a401ace50ebb4026e84b18a02a06ee.zip and b/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.4288ebb3652acdf2d828b7db7ca44a7162a401ace50ebb4026e84b18a02a06ee.zip differ diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.8a0a8c03b198919a101198f32c18622186aec532054cb63937cc769635f8e7ef/external.js b/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.8a0a8c03b198919a101198f32c18622186aec532054cb63937cc769635f8e7ef/external.js deleted file mode 100644 index 2f6632aed7b13..0000000000000 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.8a0a8c03b198919a101198f32c18622186aec532054cb63937cc769635f8e7ef/external.js +++ /dev/null @@ -1,53 +0,0 @@ -"use strict"; -/* istanbul ignore file */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.external = void 0; -const tls = require("tls"); -const url = require("url"); -// eslint-disable-next-line import/no-extraneous-dependencies -const aws = require("aws-sdk"); -let client; -function iam() { - if (!client) { - client = new aws.IAM(); - } - return client; -} -function defaultLogger(fmt, ...args) { - // eslint-disable-next-line no-console - console.log(fmt, ...args); -} -/** - * Downloads the CA thumbprint from the issuer URL - */ -async function downloadThumbprint(issuerUrl) { - exports.external.log(`downloading certificate authority thumbprint for ${issuerUrl}`); - return new Promise((ok, ko) => { - const purl = url.parse(issuerUrl); - const port = purl.port ? parseInt(purl.port, 10) : 443; - if (!purl.host) { - return ko(new Error(`unable to determine host from issuer url ${issuerUrl}`)); - } - const socket = tls.connect(port, purl.host, { rejectUnauthorized: false, servername: purl.host }); - socket.once('error', ko); - socket.once('secureConnect', () => { - const cert = socket.getPeerCertificate(); - socket.end(); - const thumbprint = cert.fingerprint.split(':').join(''); - exports.external.log(`certificate authority thumbprint for ${issuerUrl} is ${thumbprint}`); - ok(thumbprint); - }); - }); -} -// allows unit test to replace with mocks -/* eslint-disable max-len */ -exports.external = { - downloadThumbprint, - log: defaultLogger, - createOpenIDConnectProvider: (req) => iam().createOpenIDConnectProvider(req).promise(), - deleteOpenIDConnectProvider: (req) => iam().deleteOpenIDConnectProvider(req).promise(), - updateOpenIDConnectProviderThumbprint: (req) => iam().updateOpenIDConnectProviderThumbprint(req).promise(), - addClientIDToOpenIDConnectProvider: (req) => iam().addClientIDToOpenIDConnectProvider(req).promise(), - removeClientIDFromOpenIDConnectProvider: (req) => iam().removeClientIDFromOpenIDConnectProvider(req).promise(), -}; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXh0ZXJuYWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJleHRlcm5hbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQTBCOzs7QUFFMUIsMkJBQTJCO0FBQzNCLDJCQUEyQjtBQUMzQiw2REFBNkQ7QUFDN0QsK0JBQStCO0FBRS9CLElBQUksTUFBZSxDQUFDO0FBRXBCLFNBQVMsR0FBRztJQUNWLElBQUksQ0FBQyxNQUFNLEVBQUU7UUFBRSxNQUFNLEdBQUcsSUFBSSxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUM7S0FBRTtJQUN4QyxPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDO0FBRUQsU0FBUyxhQUFhLENBQUMsR0FBVyxFQUFFLEdBQUcsSUFBVztJQUNoRCxzQ0FBc0M7SUFDdEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQztBQUM1QixDQUFDO0FBRUQ7O0dBRUc7QUFDSCxLQUFLLFVBQVUsa0JBQWtCLENBQUMsU0FBaUI7SUFDakQsZ0JBQVEsQ0FBQyxHQUFHLENBQUMsb0RBQW9ELFNBQVMsRUFBRSxDQUFDLENBQUM7SUFDOUUsT0FBTyxJQUFJLE9BQU8sQ0FBUyxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRTtRQUNwQyxNQUFNLElBQUksR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ2xDLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUM7UUFDdkQsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUU7WUFDZCxPQUFPLEVBQUUsQ0FBQyxJQUFJLEtBQUssQ0FBQyw0Q0FBNEMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDO1NBQy9FO1FBQ0QsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxFQUFFLGtCQUFrQixFQUFFLEtBQUssRUFBRSxVQUFVLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7UUFDbEcsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDekIsTUFBTSxDQUFDLElBQUksQ0FBQyxlQUFlLEVBQUUsR0FBRyxFQUFFO1lBQ2hDLE1BQU0sSUFBSSxHQUFHLE1BQU0sQ0FBQyxrQkFBa0IsRUFBRSxDQUFDO1lBQ3pDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUNiLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUN4RCxnQkFBUSxDQUFDLEdBQUcsQ0FBQyx3Q0FBd0MsU0FBUyxPQUFPLFVBQVUsRUFBRSxDQUFDLENBQUM7WUFDbkYsRUFBRSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ2pCLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBRUQseUNBQXlDO0FBQ3pDLDRCQUE0QjtBQUNmLFFBQUEsUUFBUSxHQUFHO0lBQ3RCLGtCQUFrQjtJQUNsQixHQUFHLEVBQUUsYUFBYTtJQUNsQiwyQkFBMkIsRUFBRSxDQUFDLEdBQStDLEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLDJCQUEyQixDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtJQUNsSSwyQkFBMkIsRUFBRSxDQUFDLEdBQStDLEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLDJCQUEyQixDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtJQUNsSSxxQ0FBcUMsRUFBRSxDQUFDLEdBQXlELEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLHFDQUFxQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtJQUNoSyxrQ0FBa0MsRUFBRSxDQUFDLEdBQXNELEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLGtDQUFrQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtJQUN2Six1Q0FBdUMsRUFBRSxDQUFDLEdBQTJELEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLHVDQUF1QyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRTtDQUN2SyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyogaXN0YW5idWwgaWdub3JlIGZpbGUgKi9cblxuaW1wb3J0ICogYXMgdGxzIGZyb20gJ3Rscyc7XG5pbXBvcnQgKiBhcyB1cmwgZnJvbSAndXJsJztcbi8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBpbXBvcnQvbm8tZXh0cmFuZW91cy1kZXBlbmRlbmNpZXNcbmltcG9ydCAqIGFzIGF3cyBmcm9tICdhd3Mtc2RrJztcblxubGV0IGNsaWVudDogYXdzLklBTTtcblxuZnVuY3Rpb24gaWFtKCkge1xuICBpZiAoIWNsaWVudCkgeyBjbGllbnQgPSBuZXcgYXdzLklBTSgpOyB9XG4gIHJldHVybiBjbGllbnQ7XG59XG5cbmZ1bmN0aW9uIGRlZmF1bHRMb2dnZXIoZm10OiBzdHJpbmcsIC4uLmFyZ3M6IGFueVtdKSB7XG4gIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBuby1jb25zb2xlXG4gIGNvbnNvbGUubG9nKGZtdCwgLi4uYXJncyk7XG59XG5cbi8qKlxuICogRG93bmxvYWRzIHRoZSBDQSB0aHVtYnByaW50IGZyb20gdGhlIGlzc3VlciBVUkxcbiAqL1xuYXN5bmMgZnVuY3Rpb24gZG93bmxvYWRUaHVtYnByaW50KGlzc3VlclVybDogc3RyaW5nKSB7XG4gIGV4dGVybmFsLmxvZyhgZG93bmxvYWRpbmcgY2VydGlmaWNhdGUgYXV0aG9yaXR5IHRodW1icHJpbnQgZm9yICR7aXNzdWVyVXJsfWApO1xuICByZXR1cm4gbmV3IFByb21pc2U8c3RyaW5nPigob2ssIGtvKSA9PiB7XG4gICAgY29uc3QgcHVybCA9IHVybC5wYXJzZShpc3N1ZXJVcmwpO1xuICAgIGNvbnN0IHBvcnQgPSBwdXJsLnBvcnQgPyBwYXJzZUludChwdXJsLnBvcnQsIDEwKSA6IDQ0MztcbiAgICBpZiAoIXB1cmwuaG9zdCkge1xuICAgICAgcmV0dXJuIGtvKG5ldyBFcnJvcihgdW5hYmxlIHRvIGRldGVybWluZSBob3N0IGZyb20gaXNzdWVyIHVybCAke2lzc3VlclVybH1gKSk7XG4gICAgfVxuICAgIGNvbnN0IHNvY2tldCA9IHRscy5jb25uZWN0KHBvcnQsIHB1cmwuaG9zdCwgeyByZWplY3RVbmF1dGhvcml6ZWQ6IGZhbHNlLCBzZXJ2ZXJuYW1lOiBwdXJsLmhvc3QgfSk7XG4gICAgc29ja2V0Lm9uY2UoJ2Vycm9yJywga28pO1xuICAgIHNvY2tldC5vbmNlKCdzZWN1cmVDb25uZWN0JywgKCkgPT4ge1xuICAgICAgY29uc3QgY2VydCA9IHNvY2tldC5nZXRQZWVyQ2VydGlmaWNhdGUoKTtcbiAgICAgIHNvY2tldC5lbmQoKTtcbiAgICAgIGNvbnN0IHRodW1icHJpbnQgPSBjZXJ0LmZpbmdlcnByaW50LnNwbGl0KCc6Jykuam9pbignJyk7XG4gICAgICBleHRlcm5hbC5sb2coYGNlcnRpZmljYXRlIGF1dGhvcml0eSB0aHVtYnByaW50IGZvciAke2lzc3VlclVybH0gaXMgJHt0aHVtYnByaW50fWApO1xuICAgICAgb2sodGh1bWJwcmludCk7XG4gICAgfSk7XG4gIH0pO1xufVxuXG4vLyBhbGxvd3MgdW5pdCB0ZXN0IHRvIHJlcGxhY2Ugd2l0aCBtb2Nrc1xuLyogZXNsaW50LWRpc2FibGUgbWF4LWxlbiAqL1xuZXhwb3J0IGNvbnN0IGV4dGVybmFsID0ge1xuICBkb3dubG9hZFRodW1icHJpbnQsXG4gIGxvZzogZGVmYXVsdExvZ2dlcixcbiAgY3JlYXRlT3BlbklEQ29ubmVjdFByb3ZpZGVyOiAocmVxOiBhd3MuSUFNLkNyZWF0ZU9wZW5JRENvbm5lY3RQcm92aWRlclJlcXVlc3QpID0+IGlhbSgpLmNyZWF0ZU9wZW5JRENvbm5lY3RQcm92aWRlcihyZXEpLnByb21pc2UoKSxcbiAgZGVsZXRlT3BlbklEQ29ubmVjdFByb3ZpZGVyOiAocmVxOiBhd3MuSUFNLkRlbGV0ZU9wZW5JRENvbm5lY3RQcm92aWRlclJlcXVlc3QpID0+IGlhbSgpLmRlbGV0ZU9wZW5JRENvbm5lY3RQcm92aWRlcihyZXEpLnByb21pc2UoKSxcbiAgdXBkYXRlT3BlbklEQ29ubmVjdFByb3ZpZGVyVGh1bWJwcmludDogKHJlcTogYXdzLklBTS5VcGRhdGVPcGVuSURDb25uZWN0UHJvdmlkZXJUaHVtYnByaW50UmVxdWVzdCkgPT4gaWFtKCkudXBkYXRlT3BlbklEQ29ubmVjdFByb3ZpZGVyVGh1bWJwcmludChyZXEpLnByb21pc2UoKSxcbiAgYWRkQ2xpZW50SURUb09wZW5JRENvbm5lY3RQcm92aWRlcjogKHJlcTogYXdzLklBTS5BZGRDbGllbnRJRFRvT3BlbklEQ29ubmVjdFByb3ZpZGVyUmVxdWVzdCkgPT4gaWFtKCkuYWRkQ2xpZW50SURUb09wZW5JRENvbm5lY3RQcm92aWRlcihyZXEpLnByb21pc2UoKSxcbiAgcmVtb3ZlQ2xpZW50SURGcm9tT3BlbklEQ29ubmVjdFByb3ZpZGVyOiAocmVxOiBhd3MuSUFNLlJlbW92ZUNsaWVudElERnJvbU9wZW5JRENvbm5lY3RQcm92aWRlclJlcXVlc3QpID0+IGlhbSgpLnJlbW92ZUNsaWVudElERnJvbU9wZW5JRENvbm5lY3RQcm92aWRlcihyZXEpLnByb21pc2UoKSxcbn07XG4iXX0= \ No newline at end of file diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/__entrypoint__.js b/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/__entrypoint__.js new file mode 100644 index 0000000000000..1e3a3093c1706 --- /dev/null +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/__entrypoint__.js @@ -0,0 +1,144 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.withRetries = exports.handler = exports.external = void 0; +const https = require("https"); +const url = require("url"); +// for unit tests +exports.external = { + sendHttpRequest: defaultSendHttpRequest, + log: defaultLog, + includeStackTraces: true, + userHandlerIndex: './index', +}; +const CREATE_FAILED_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::CREATE_FAILED'; +const MISSING_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::MISSING_PHYSICAL_ID'; +async function handler(event, context) { + const sanitizedEvent = { ...event, ResponseURL: '...' }; + exports.external.log(JSON.stringify(sanitizedEvent, undefined, 2)); + // ignore DELETE event when the physical resource ID is the marker that + // indicates that this DELETE is a subsequent DELETE to a failed CREATE + // operation. + if (event.RequestType === 'Delete' && event.PhysicalResourceId === CREATE_FAILED_PHYSICAL_ID_MARKER) { + exports.external.log('ignoring DELETE event caused by a failed CREATE event'); + await submitResponse('SUCCESS', event); + return; + } + try { + // invoke the user handler. this is intentionally inside the try-catch to + // ensure that if there is an error it's reported as a failure to + // cloudformation (otherwise cfn waits). + // eslint-disable-next-line @typescript-eslint/no-require-imports + const userHandler = require(exports.external.userHandlerIndex).handler; + const result = await userHandler(sanitizedEvent, context); + // validate user response and create the combined event + const responseEvent = renderResponse(event, result); + // submit to cfn as success + await submitResponse('SUCCESS', responseEvent); + } + catch (e) { + const resp = { + ...event, + Reason: exports.external.includeStackTraces ? e.stack : e.message, + }; + if (!resp.PhysicalResourceId) { + // special case: if CREATE fails, which usually implies, we usually don't + // have a physical resource id. in this case, the subsequent DELETE + // operation does not have any meaning, and will likely fail as well. to + // address this, we use a marker so the provider framework can simply + // ignore the subsequent DELETE. + if (event.RequestType === 'Create') { + exports.external.log('CREATE failed, responding with a marker physical resource id so that the subsequent DELETE will be ignored'); + resp.PhysicalResourceId = CREATE_FAILED_PHYSICAL_ID_MARKER; + } + else { + // otherwise, if PhysicalResourceId is not specified, something is + // terribly wrong because all other events should have an ID. + exports.external.log(`ERROR: Malformed event. "PhysicalResourceId" is required: ${JSON.stringify(event)}`); + } + } + // this is an actual error, fail the activity altogether and exist. + await submitResponse('FAILED', resp); + } +} +exports.handler = handler; +function renderResponse(cfnRequest, handlerResponse = {}) { + // if physical ID is not returned, we have some defaults for you based + // on the request type. + const physicalResourceId = handlerResponse.PhysicalResourceId ?? cfnRequest.PhysicalResourceId ?? cfnRequest.RequestId; + // if we are in DELETE and physical ID was changed, it's an error. + if (cfnRequest.RequestType === 'Delete' && physicalResourceId !== cfnRequest.PhysicalResourceId) { + throw new Error(`DELETE: cannot change the physical resource ID from "${cfnRequest.PhysicalResourceId}" to "${handlerResponse.PhysicalResourceId}" during deletion`); + } + // merge request event and result event (result prevails). + return { + ...cfnRequest, + ...handlerResponse, + PhysicalResourceId: physicalResourceId, + }; +} +async function submitResponse(status, event) { + const json = { + Status: status, + Reason: event.Reason ?? status, + StackId: event.StackId, + RequestId: event.RequestId, + PhysicalResourceId: event.PhysicalResourceId || MISSING_PHYSICAL_ID_MARKER, + LogicalResourceId: event.LogicalResourceId, + NoEcho: event.NoEcho, + Data: event.Data, + }; + exports.external.log('submit response to cloudformation', json); + const responseBody = JSON.stringify(json); + const parsedUrl = url.parse(event.ResponseURL); + const req = { + hostname: parsedUrl.hostname, + path: parsedUrl.path, + method: 'PUT', + headers: { 'content-type': '', 'content-length': responseBody.length }, + }; + const retryOptions = { + attempts: 5, + sleep: 1000, + }; + await withRetries(retryOptions, exports.external.sendHttpRequest)(req, responseBody); +} +async function defaultSendHttpRequest(options, responseBody) { + return new Promise((resolve, reject) => { + try { + const request = https.request(options, _ => resolve()); + request.on('error', reject); + request.write(responseBody); + request.end(); + } + catch (e) { + reject(e); + } + }); +} +function defaultLog(fmt, ...params) { + // eslint-disable-next-line no-console + console.log(fmt, ...params); +} +function withRetries(options, fn) { + return async (...xs) => { + let attempts = options.attempts; + let ms = options.sleep; + while (true) { + try { + return await fn(...xs); + } + catch (e) { + if (attempts-- <= 0) { + throw e; + } + await sleep(Math.floor(Math.random() * ms)); + ms *= 2; + } + } + }; +} +exports.withRetries = withRetries; +async function sleep(ms) { + return new Promise((ok) => setTimeout(ok, ms)); +} +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"nodejs-entrypoint.js","sourceRoot":"","sources":["nodejs-entrypoint.ts"],"names":[],"mappings":"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","sourcesContent":["import * as https from 'https';\nimport * as url from 'url';\n\n// for unit tests\nexport const external = {\n  sendHttpRequest: defaultSendHttpRequest,\n  log: defaultLog,\n  includeStackTraces: true,\n  userHandlerIndex: './index',\n};\n\nconst CREATE_FAILED_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::CREATE_FAILED';\nconst MISSING_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::MISSING_PHYSICAL_ID';\n\nexport type Response = AWSLambda.CloudFormationCustomResourceEvent & HandlerResponse;\nexport type Handler = (event: AWSLambda.CloudFormationCustomResourceEvent, context: AWSLambda.Context) => Promise<HandlerResponse | void>;\nexport type HandlerResponse = undefined | {\n  Data?: any;\n  PhysicalResourceId?: string;\n  Reason?: string;\n  NoEcho?: boolean;\n};\n\nexport async function handler(event: AWSLambda.CloudFormationCustomResourceEvent, context: AWSLambda.Context) {\n  const sanitizedEvent = { ...event, ResponseURL: '...' };\n  external.log(JSON.stringify(sanitizedEvent, undefined, 2));\n\n  // ignore DELETE event when the physical resource ID is the marker that\n  // indicates that this DELETE is a subsequent DELETE to a failed CREATE\n  // operation.\n  if (event.RequestType === 'Delete' && event.PhysicalResourceId === CREATE_FAILED_PHYSICAL_ID_MARKER) {\n    external.log('ignoring DELETE event caused by a failed CREATE event');\n    await submitResponse('SUCCESS', event);\n    return;\n  }\n\n  try {\n    // invoke the user handler. this is intentionally inside the try-catch to\n    // ensure that if there is an error it's reported as a failure to\n    // cloudformation (otherwise cfn waits).\n    // eslint-disable-next-line @typescript-eslint/no-require-imports\n    const userHandler: Handler = require(external.userHandlerIndex).handler;\n    const result = await userHandler(sanitizedEvent, context);\n\n    // validate user response and create the combined event\n    const responseEvent = renderResponse(event, result);\n\n    // submit to cfn as success\n    await submitResponse('SUCCESS', responseEvent);\n  } catch (e) {\n    const resp: Response = {\n      ...event,\n      Reason: external.includeStackTraces ? e.stack : e.message,\n    };\n\n    if (!resp.PhysicalResourceId) {\n      // special case: if CREATE fails, which usually implies, we usually don't\n      // have a physical resource id. in this case, the subsequent DELETE\n      // operation does not have any meaning, and will likely fail as well. to\n      // address this, we use a marker so the provider framework can simply\n      // ignore the subsequent DELETE.\n      if (event.RequestType === 'Create') {\n        external.log('CREATE failed, responding with a marker physical resource id so that the subsequent DELETE will be ignored');\n        resp.PhysicalResourceId = CREATE_FAILED_PHYSICAL_ID_MARKER;\n      } else {\n        // otherwise, if PhysicalResourceId is not specified, something is\n        // terribly wrong because all other events should have an ID.\n        external.log(`ERROR: Malformed event. \"PhysicalResourceId\" is required: ${JSON.stringify(event)}`);\n      }\n    }\n\n    // this is an actual error, fail the activity altogether and exist.\n    await submitResponse('FAILED', resp);\n  }\n}\n\nfunction renderResponse(\n  cfnRequest: AWSLambda.CloudFormationCustomResourceEvent & { PhysicalResourceId?: string },\n  handlerResponse: void | HandlerResponse = { }): Response {\n\n  // if physical ID is not returned, we have some defaults for you based\n  // on the request type.\n  const physicalResourceId = handlerResponse.PhysicalResourceId ?? cfnRequest.PhysicalResourceId ?? cfnRequest.RequestId;\n\n  // if we are in DELETE and physical ID was changed, it's an error.\n  if (cfnRequest.RequestType === 'Delete' && physicalResourceId !== cfnRequest.PhysicalResourceId) {\n    throw new Error(`DELETE: cannot change the physical resource ID from \"${cfnRequest.PhysicalResourceId}\" to \"${handlerResponse.PhysicalResourceId}\" during deletion`);\n  }\n\n  // merge request event and result event (result prevails).\n  return {\n    ...cfnRequest,\n    ...handlerResponse,\n    PhysicalResourceId: physicalResourceId,\n  };\n}\n\nasync function submitResponse(status: 'SUCCESS' | 'FAILED', event: Response) {\n  const json: AWSLambda.CloudFormationCustomResourceResponse = {\n    Status: status,\n    Reason: event.Reason ?? status,\n    StackId: event.StackId,\n    RequestId: event.RequestId,\n    PhysicalResourceId: event.PhysicalResourceId || MISSING_PHYSICAL_ID_MARKER,\n    LogicalResourceId: event.LogicalResourceId,\n    NoEcho: event.NoEcho,\n    Data: event.Data,\n  };\n\n  external.log('submit response to cloudformation', json);\n\n  const responseBody = JSON.stringify(json);\n  const parsedUrl = url.parse(event.ResponseURL);\n  const req = {\n    hostname: parsedUrl.hostname,\n    path: parsedUrl.path,\n    method: 'PUT',\n    headers: { 'content-type': '', 'content-length': responseBody.length },\n  };\n\n  const retryOptions = {\n    attempts: 5,\n    sleep: 1000,\n  };\n  await withRetries(retryOptions, external.sendHttpRequest)(req, responseBody);\n}\n\nasync function defaultSendHttpRequest(options: https.RequestOptions, responseBody: string): Promise<void> {\n  return new Promise((resolve, reject) => {\n    try {\n      const request = https.request(options, _ => resolve());\n      request.on('error', reject);\n      request.write(responseBody);\n      request.end();\n    } catch (e) {\n      reject(e);\n    }\n  });\n}\n\nfunction defaultLog(fmt: string, ...params: any[]) {\n  // eslint-disable-next-line no-console\n  console.log(fmt, ...params);\n}\n\nexport interface RetryOptions {\n  /** How many retries (will at least try once) */\n  readonly attempts: number;\n  /** Sleep base, in ms */\n  readonly sleep: number;\n}\n\nexport function withRetries<A extends Array<any>, B>(options: RetryOptions, fn: (...xs: A) => Promise<B>): (...xs: A) => Promise<B> {\n  return async (...xs: A) => {\n    let attempts = options.attempts;\n    let ms = options.sleep;\n    while (true) {\n      try {\n        return await fn(...xs);\n      } catch (e) {\n        if (attempts-- <= 0) {\n          throw e;\n        }\n        await sleep(Math.floor(Math.random() * ms));\n        ms *= 2;\n      }\n    }\n  };\n}\n\nasync function sleep(ms: number): Promise<void> {\n  return new Promise((ok) => setTimeout(ok, ms));\n}"]} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.8a0a8c03b198919a101198f32c18622186aec532054cb63937cc769635f8e7ef/diff.js b/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/diff.js similarity index 100% rename from packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.8a0a8c03b198919a101198f32c18622186aec532054cb63937cc769635f8e7ef/diff.js rename to packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/diff.js diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/external.js b/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/external.js new file mode 100644 index 0000000000000..7d8c6e611c70b --- /dev/null +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/external.js @@ -0,0 +1,88 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.external = exports.downloadThumbprint = void 0; +const util = require("node:util"); +const tls = require("tls"); +const url = require("url"); +// eslint-disable-next-line import/no-extraneous-dependencies +const aws = require("aws-sdk"); +let client; +function iam() { + if (!client) { + client = new aws.IAM(); + } + return client; +} +function defaultLogger(fmt, ...args) { + // eslint-disable-next-line no-console + console.log(fmt, ...args); +} +/** + * Downloads the CA thumbprint from the issuer URL + */ +async function downloadThumbprint(issuerUrl) { + exports.external.log(`Downloading certificate authority thumbprint for ${issuerUrl}`); + return new Promise((ok, ko) => { + const purl = url.parse(issuerUrl); + const port = purl.port ? parseInt(purl.port, 10) : 443; + if (!purl.host) { + return ko(new Error(`unable to determine host from issuer url ${issuerUrl}`)); + } + const socket = tls.connect(port, purl.host, { rejectUnauthorized: false, servername: purl.host }); + socket.once('error', ko); + socket.once('secureConnect', () => { + // This set to `true` would return the entire chain of certificates as a circular reference object + let cert = socket.getPeerCertificate(true); + const unqiueCerts = new Set(); + do { + unqiueCerts.add(cert); + cert = cert.issuerCertificate; + } while (cert && typeof cert === 'object' && !unqiueCerts.has(cert)); + // The last `cert` obtained must be the root certificate in the certificate chain + const rootCert = [...unqiueCerts].pop(); + // Add `ca: true` when node merges the feature. Awaiting resolution: https://github.com/nodejs/node/issues/44905 + if (!(util.isDeepStrictEqual(rootCert.issuer, rootCert.subject))) { + return ko(new Error(`Subject and Issuer of certificate received are different. + Received: \'Subject\' is ${JSON.stringify(rootCert.subject, null, 4)} and \'Issuer\':${JSON.stringify(rootCert.issuer, null, 4)}`)); + } + const validTo = new Date(rootCert.valid_to); + const certificateValidity = getCertificateValidity(validTo); + if (certificateValidity < 0) { + return ko(new Error(`The certificate has already expired on: ${validTo.toUTCString()}`)); + } + // Warning user if certificate validity is expiring within 6 months + if (certificateValidity < 180) { + /* eslint-disable-next-line no-console */ + console.warn(`The root certificate obtained would expire in ${certificateValidity} days!`); + } + socket.end(); + const thumbprint = rootCert.fingerprint.split(':').join(''); + exports.external.log(`Certificate Authority thumbprint for ${issuerUrl} is ${thumbprint}`); + ok(thumbprint); + }); + }); +} +exports.downloadThumbprint = downloadThumbprint; +/** + * To get the validity timeline for the certificate + * @param certDate The valid to date for the certificate + * @returns The number of days the certificate is valid wrt current date + */ +function getCertificateValidity(certDate) { + const millisecondsInDay = 24 * 60 * 60 * 1000; + const currentDate = new Date(); + const validity = Math.round((certDate.getTime() - currentDate.getTime()) / millisecondsInDay); + return validity; +} +// allows unit test to replace with mocks +/* eslint-disable max-len */ +exports.external = { + downloadThumbprint, + log: defaultLogger, + createOpenIDConnectProvider: (req) => iam().createOpenIDConnectProvider(req).promise(), + deleteOpenIDConnectProvider: (req) => iam().deleteOpenIDConnectProvider(req).promise(), + updateOpenIDConnectProviderThumbprint: (req) => iam().updateOpenIDConnectProviderThumbprint(req).promise(), + addClientIDToOpenIDConnectProvider: (req) => iam().addClientIDToOpenIDConnectProvider(req).promise(), + removeClientIDFromOpenIDConnectProvider: (req) => iam().removeClientIDFromOpenIDConnectProvider(req).promise(), +}; +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"external.js","sourceRoot":"","sources":["external.ts"],"names":[],"mappings":"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","sourcesContent":["/* istanbul ignore file */\nimport { DetailedPeerCertificate } from 'node:tls';\nimport * as util from 'node:util';\nimport * as tls from 'tls';\nimport * as url from 'url';\n// eslint-disable-next-line import/no-extraneous-dependencies\nimport * as aws from 'aws-sdk';\n\nlet client: aws.IAM;\n\nfunction iam() {\n  if (!client) { client = new aws.IAM(); }\n  return client;\n}\n\nfunction defaultLogger(fmt: string, ...args: any[]) {\n  // eslint-disable-next-line no-console\n  console.log(fmt, ...args);\n}\n\n/**\n * Downloads the CA thumbprint from the issuer URL\n */\nexport async function downloadThumbprint(issuerUrl: string) {\n\n  external.log(`Downloading certificate authority thumbprint for ${issuerUrl}`);\n\n  return new Promise<string>((ok, ko) => {\n    const purl = url.parse(issuerUrl);\n    const port = purl.port ? parseInt(purl.port, 10) : 443;\n\n    if (!purl.host) {\n      return ko(new Error(`unable to determine host from issuer url ${issuerUrl}`));\n    }\n\n    const socket = tls.connect(port, purl.host, { rejectUnauthorized: false, servername: purl.host });\n    socket.once('error', ko);\n\n    socket.once('secureConnect', () => {\n      // This set to `true` would return the entire chain of certificates as a circular reference object\n      let cert = socket.getPeerCertificate(true);\n\n      const unqiueCerts = new Set<DetailedPeerCertificate>();\n      do {\n        unqiueCerts.add(cert);\n        cert = cert.issuerCertificate;\n      } while ( cert && typeof cert === 'object' && !unqiueCerts.has(cert));\n\n      // The last `cert` obtained must be the root certificate in the certificate chain\n      const rootCert = [...unqiueCerts].pop()!;\n\n      // Add `ca: true` when node merges the feature. Awaiting resolution: https://github.com/nodejs/node/issues/44905\n      if (!(util.isDeepStrictEqual(rootCert.issuer, rootCert.subject))) {\n        return ko(new Error(`Subject and Issuer of certificate received are different. \n        Received: \\'Subject\\' is ${JSON.stringify(rootCert.subject, null, 4)} and \\'Issuer\\':${JSON.stringify(rootCert.issuer, null, 4)}`));\n      }\n\n      const validTo = new Date(rootCert.valid_to);\n      const certificateValidity = getCertificateValidity(validTo);\n\n      if (certificateValidity < 0) {\n        return ko(new Error(`The certificate has already expired on: ${validTo.toUTCString()}`));\n      }\n\n      // Warning user if certificate validity is expiring within 6 months\n      if (certificateValidity < 180) {\n        /* eslint-disable-next-line no-console */\n        console.warn(`The root certificate obtained would expire in ${certificateValidity} days!`);\n      }\n\n      socket.end();\n\n      const thumbprint = rootCert.fingerprint.split(':').join('');\n      external.log(`Certificate Authority thumbprint for ${issuerUrl} is ${thumbprint}`);\n\n      ok(thumbprint);\n    });\n  });\n}\n\n/**\n * To get the validity timeline for the certificate\n * @param certDate The valid to date for the certificate\n * @returns The number of days the certificate is valid wrt current date\n */\nfunction getCertificateValidity(certDate: Date): Number {\n  const millisecondsInDay = 24 * 60 * 60 * 1000;\n  const currentDate = new Date();\n\n  const validity = Math.round((certDate.getTime() - currentDate.getTime()) / millisecondsInDay);\n\n  return validity;\n}\n\n// allows unit test to replace with mocks\n/* eslint-disable max-len */\nexport const external = {\n  downloadThumbprint,\n  log: defaultLogger,\n  createOpenIDConnectProvider: (req: aws.IAM.CreateOpenIDConnectProviderRequest) => iam().createOpenIDConnectProvider(req).promise(),\n  deleteOpenIDConnectProvider: (req: aws.IAM.DeleteOpenIDConnectProviderRequest) => iam().deleteOpenIDConnectProvider(req).promise(),\n  updateOpenIDConnectProviderThumbprint: (req: aws.IAM.UpdateOpenIDConnectProviderThumbprintRequest) => iam().updateOpenIDConnectProviderThumbprint(req).promise(),\n  addClientIDToOpenIDConnectProvider: (req: aws.IAM.AddClientIDToOpenIDConnectProviderRequest) => iam().addClientIDToOpenIDConnectProvider(req).promise(),\n  removeClientIDFromOpenIDConnectProvider: (req: aws.IAM.RemoveClientIDFromOpenIDConnectProviderRequest) => iam().removeClientIDFromOpenIDConnectProvider(req).promise(),\n};\n"]} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.8a0a8c03b198919a101198f32c18622186aec532054cb63937cc769635f8e7ef/index.js b/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/index.js similarity index 100% rename from packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.8a0a8c03b198919a101198f32c18622186aec532054cb63937cc769635f8e7ef/index.js rename to packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3/index.js diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip b/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip index dbb0dfc9e9fb2..8097ad2422b72 100644 Binary files a/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip and b/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip differ diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.c6964dbf0c556ec82ce09622e99ad6f6d4e488cdaac0ef9e8492e078ec61ffed.zip b/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.c6964dbf0c556ec82ce09622e99ad6f6d4e488cdaac0ef9e8492e078ec61ffed.zip index cd73574e4a548..c8445903b628b 100644 Binary files a/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.c6964dbf0c556ec82ce09622e99ad6f6d4e488cdaac0ef9e8492e078ec61ffed.zip and b/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/asset.c6964dbf0c556ec82ce09622e99ad6f6d4e488cdaac0ef9e8492e078ec61ffed.zip differ diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/aws-eks-service-account-sdk-calls-test.assets.json b/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/aws-eks-service-account-sdk-calls-test.assets.json index b904b7131fcd2..7eca60f4192d7 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/aws-eks-service-account-sdk-calls-test.assets.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/aws-eks-service-account-sdk-calls-test.assets.json @@ -79,15 +79,15 @@ } } }, - "8a0a8c03b198919a101198f32c18622186aec532054cb63937cc769635f8e7ef": { + "b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3": { "source": { - "path": "asset.8a0a8c03b198919a101198f32c18622186aec532054cb63937cc769635f8e7ef", + "path": "asset.b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3", "packaging": "zip" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "8a0a8c03b198919a101198f32c18622186aec532054cb63937cc769635f8e7ef.zip", + "objectKey": "b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } @@ -144,7 +144,7 @@ } } }, - "d263340aa5fe5d22093e50ee4d716318129c29970cdfd19fd44a053c4fd9893f": { + "34a99f3d829847b33fc4e08ecc5885bcd56839e42d0da51284c3b7387d699134": { "source": { "path": "aws-eks-service-account-sdk-calls-test.template.json", "packaging": "file" @@ -152,7 +152,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "d263340aa5fe5d22093e50ee4d716318129c29970cdfd19fd44a053c4fd9893f.json", + "objectKey": "34a99f3d829847b33fc4e08ecc5885bcd56839e42d0da51284c3b7387d699134.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/aws-eks-service-account-sdk-calls-test.template.json b/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/aws-eks-service-account-sdk-calls-test.template.json index a9f5265d24210..3f447486af067 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/aws-eks-service-account-sdk-calls-test.template.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/aws-eks-service-account-sdk-calls-test.template.json @@ -1002,9 +1002,6 @@ "ClientIDList": [ "sts.amazonaws.com" ], - "ThumbprintList": [ - "9e99a48a9960b14926bb7f3b02e22da2b0ab7280" - ], "Url": { "Fn::GetAtt": [ "Cluster9EE0221C", @@ -1201,7 +1198,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "8a0a8c03b198919a101198f32c18622186aec532054cb63937cc769635f8e7ef.zip" + "S3Key": "b461123ee060208a85a3dbdaa41982700ad24caf5f4c4af2f625986b92ac60c3.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/manifest.json b/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/manifest.json index b524f451f5206..037bfcda60283 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/manifest.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-service-account-sdk-call.js.snapshot/manifest.json @@ -23,7 +23,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/d263340aa5fe5d22093e50ee4d716318129c29970cdfd19fd44a053c4fd9893f.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/34a99f3d829847b33fc4e08ecc5885bcd56839e42d0da51284c3b7387d699134.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/packages/@aws-cdk/aws-iam/lib/oidc-provider/external.ts b/packages/@aws-cdk/aws-iam/lib/oidc-provider/external.ts index 4ad18aed4f17d..78d22eb4037b7 100644 --- a/packages/@aws-cdk/aws-iam/lib/oidc-provider/external.ts +++ b/packages/@aws-cdk/aws-iam/lib/oidc-provider/external.ts @@ -1,5 +1,6 @@ /* istanbul ignore file */ - +import { DetailedPeerCertificate } from 'node:tls'; +import * as util from 'node:util'; import * as tls from 'tls'; import * as url from 'url'; // eslint-disable-next-line import/no-extraneous-dependencies @@ -20,26 +21,80 @@ function defaultLogger(fmt: string, ...args: any[]) { /** * Downloads the CA thumbprint from the issuer URL */ -async function downloadThumbprint(issuerUrl: string) { - external.log(`downloading certificate authority thumbprint for ${issuerUrl}`); +export async function downloadThumbprint(issuerUrl: string) { + external.log(`Downloading certificate authority thumbprint for ${issuerUrl}`); + return new Promise((ok, ko) => { const purl = url.parse(issuerUrl); const port = purl.port ? parseInt(purl.port, 10) : 443; + if (!purl.host) { return ko(new Error(`unable to determine host from issuer url ${issuerUrl}`)); } + const socket = tls.connect(port, purl.host, { rejectUnauthorized: false, servername: purl.host }); socket.once('error', ko); + socket.once('secureConnect', () => { - const cert = socket.getPeerCertificate(); + // This set to `true` will return the entire chain of certificates as a nested object + let cert = socket.getPeerCertificate(true); + + const unqiueCerts = new Set(); + do { + unqiueCerts.add(cert); + cert = cert.issuerCertificate; + } while ( cert && typeof cert === 'object' && !unqiueCerts.has(cert)); + + if (unqiueCerts.size == 0) { + return ko(new Error(`No certificates were returned for the mentioned url: ${issuerUrl}`)); + } + + // The last `cert` obtained must be the root certificate in the certificate chain + const rootCert = [...unqiueCerts].pop()!; + + // Add `ca: true` when node merges the feature. Awaiting resolution: https://github.com/nodejs/node/issues/44905 + if (!(util.isDeepStrictEqual(rootCert.issuer, rootCert.subject))) { + return ko(new Error(`Subject and Issuer of certificate received are different. + Received: \'Subject\' is ${JSON.stringify(rootCert.subject, null, 4)} and \'Issuer\':${JSON.stringify(rootCert.issuer, null, 4)}`)); + } + + const validTo = new Date(rootCert.valid_to); + const certificateValidity = getCertificateValidity(validTo); + + if (certificateValidity < 0) { + return ko(new Error(`The certificate has already expired on: ${validTo.toUTCString()}`)); + } + + // Warning user if certificate validity is expiring within 6 months + if (certificateValidity < 180) { + /* eslint-disable-next-line no-console */ + console.warn(`The root certificate obtained would expire in ${certificateValidity} days!`); + } + socket.end(); - const thumbprint = cert.fingerprint.split(':').join(''); - external.log(`certificate authority thumbprint for ${issuerUrl} is ${thumbprint}`); + + const thumbprint = rootCert.fingerprint.split(':').join(''); + external.log(`Certificate Authority thumbprint for ${issuerUrl} is ${thumbprint}`); + ok(thumbprint); }); }); } +/** + * To get the validity timeline for the certificate + * @param certDate The valid to date for the certificate + * @returns The number of days the certificate is valid wrt current date + */ +function getCertificateValidity(certDate: Date): Number { + const millisecondsInDay = 24 * 60 * 60 * 1000; + const currentDate = new Date(); + + const validity = Math.round((certDate.getTime() - currentDate.getTime()) / millisecondsInDay); + + return validity; +} + // allows unit test to replace with mocks /* eslint-disable max-len */ export const external = { diff --git a/packages/@aws-cdk/aws-iam/test/oidc-provider/external.test.ts b/packages/@aws-cdk/aws-iam/test/oidc-provider/external.test.ts new file mode 100644 index 0000000000000..b849eb5140de0 --- /dev/null +++ b/packages/@aws-cdk/aws-iam/test/oidc-provider/external.test.ts @@ -0,0 +1,172 @@ +import { TLSSocket, DetailedPeerCertificate, Certificate } from 'tls'; +import { downloadThumbprint } from '../../lib/oidc-provider/external'; + +const chainLength = 3; +let certificateCount = 0; +let placeholderCertificate: DetailedPeerCertificate; +let peerCertificate: DetailedPeerCertificate; + +describe('downloadThumbprint', () => { + + const peerCertificateMock = jest.spyOn(TLSSocket.prototype, 'getPeerCertificate').mockImplementation(()=> { + return peerCertificate; + }); + + beforeEach(() => { + certificateCount = 0; + peerCertificate = createChainedCertificateObject(); + + // This is to create a circular reference in the root certificate + getRootCertificateFromChain().issuerCertificate = peerCertificate; + + // To have silent test runs for this test + jest.spyOn(console, 'warn').mockImplementation(() => {}); + jest.spyOn(console, 'log').mockImplementation(() => {}); + }); + + test('is able to get root certificate from certificate chain', async () => { + // WHEN + await downloadThumbprint('https://example.com'); + + // THEN + expect(peerCertificateMock).toHaveBeenCalledTimes(2); + }); + + test('throws when subject and issuer are different of expected root certificate', async () => { + // GIVEN + const subject: Certificate = { + C: 'another-country-code-root', + ST: 'another-street-root', + L: 'another-locality-root', + O: 'another-organization-root', + OU: 'another-organizational-unit-root', + CN: 'another-common-name-root', + }; + + getRootCertificateFromChain().subject = subject; + + // THEN + await expect(() => downloadThumbprint('https://example.com')).rejects.toThrowError(/Subject and Issuer of certificate received are different/); + + expect(peerCertificateMock).toHaveBeenCalledTimes(2); + }); + + test('throws error when certificate receieved is expired', async () => { + // GIVEN + const currentDate = new Date(); + const expiredValidityDate = subtractDaysFromDate(currentDate, 5); + + getRootCertificateFromChain().valid_to = expiredValidityDate.toUTCString(); + + // THEN + await expect(() => downloadThumbprint('https://example.com')).rejects.toThrowError(/The certificate has already expired on/); + + expect(peerCertificateMock).toHaveBeenCalledTimes(2); + }); + + afterEach(() => { + peerCertificateMock.mockClear(); + }); +}); + +function createChainedCertificateObject(): DetailedPeerCertificate { + return createCertificateObject(); +} + +function createCertificateObject(): DetailedPeerCertificate { + const currentDate = new Date(); + + if (certificateCount == chainLength ) { + // Root Certificate with circular reference to first certificate + return { + subject: { + C: 'country-code-root', + ST: 'street-root', + L: 'locality-root', + O: 'organization-root', + OU: 'organizational-unit-root', + CN: 'common-name-root', + }, + issuer: { + C: 'country-code-root', + ST: 'street-root', + L: 'locality-root', + O: 'organization-root', + OU: 'organizational-unit-root', + CN: 'common-name-root', + }, + subjectaltname: 'subjectal-name-root', + infoAccess: { + key: ['value-root'], + }, + modulus: 'modulus-root', + exponent: 'exponent-root', + valid_from: currentDate.toUTCString(), + valid_to: addDaysToDate(currentDate, 200).toUTCString(), + fingerprint: '01:02:59:D9:C3:D2:0D:08:F7:82:4E:44:A4:B4:53:C5:E2:3A:87:00', + fingerprint256: '69:AE:1A:6A:D4:3D:C6:C1:1B:EA:C6:23:DE:BA:2A:14:62:62:93:5C:7A:EA:06:41:9B:0B:BC:87:CE:48:4E:00', + ext_key_usage: ['key-usage-root'], + serialNumber: 'serial-number-root', + raw: Buffer.alloc(10), + issuerCertificate: placeholderCertificate, + }; + } + + certificateCount++; + + const certificate = { + subject: { + C: `subject-country-code-${certificateCount}`, + ST: `subject-street-${certificateCount}`, + L: `subject-locality-${certificateCount}`, + O: `subject-organization-${certificateCount}`, + OU: `subject-organizational-unit-${certificateCount}`, + CN: `subject-common-name-${certificateCount}`, + }, + issuer: { + C: `issuer-country-code-${certificateCount}`, + ST: `issuer-street-${certificateCount}`, + L: `issuer-locality-${certificateCount}`, + O: `issuer-organization-${certificateCount}`, + OU: `issuer-organizational-unit-${certificateCount}`, + CN: `issuer-common-name-${certificateCount}`, + }, + subjectaltname: `subjectal-name-${certificateCount}`, + infoAccess: { + key: [`value-${certificateCount}`], + }, + modulus: `modulus-${certificateCount}`, + exponent: `exponent-${certificateCount}`, + valid_from: currentDate.toUTCString(), + valid_to: addDaysToDate(currentDate, 200).toUTCString(), + fingerprint: `01:02:59:D9:C3:D2:0D:08:F7:82:4E:44:A4:B4:53:C5:E2:3A:87:${certificateCount}D`, + fingerprint256: `69:AE:1A:6A:D4:3D:C6:C1:1B:EA:C6:23:DE:BA:2A:14:62:62:93:5C:7A:EA:06:41:9B:0B:BC:87:CE:48:4E:0${certificateCount}`, + ext_key_usage: [`key-usage-${certificateCount}`], + serialNumber: `serial-number-${certificateCount}`, + raw: Buffer.alloc(10), + issuerCertificate: createCertificateObject(), + }; + + return certificate; +} + +function addDaysToDate(date: Date, numberOfDays: number): Date { + const newDate = new Date(); + return new Date(newDate.setDate(date.getDate() + numberOfDays)); +} + +function subtractDaysFromDate(date: Date, numberOfDays: number): Date { + const newDate = new Date(); + return new Date(newDate.setDate(date.getDate() - numberOfDays)); +} + +function getRootCertificateFromChain(): DetailedPeerCertificate { + let rootCert: DetailedPeerCertificate = peerCertificate; + let certificateNumber = 0; + + while (chainLength > certificateNumber++) { + rootCert = rootCert.issuerCertificate; + } + + return rootCert; +}