Skip to content

chore: make tests work with new SDKv3 version #33016

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jan 20, 2025
Merged

chore: make tests work with new SDKv3 version #33016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8757016
chore: make tests work with new SDKv3 version
rix0rrr Jan 20, 2025
c186032
Update docstring
rix0rrr Jan 20, 2025
792b25a
Merge remote-tracking branch 'origin/main' into huijbers/sdkv3-update…
rix0rrr Jan 20, 2025
8d64461
Avoid bumping lerna
rix0rrr Jan 20, 2025
4030933
Avoid bumping this
rix0rrr Jan 20, 2025
331e932
Merge remote-tracking branch 'origin/main' into huijbers/sdkv3-update…
rix0rrr Jan 20, 2025
4d6f0e2
Update more deps
rix0rrr Jan 20, 2025
8d130e5
License file
rix0rrr Jan 20, 2025
f6c4fa7
Merge branch 'main' into huijbers/sdkv3-update-tets
mergify[bot] Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14,224 changes: 224 additions & 14,000 deletions packages/aws-cdk/THIRD_PARTY_LICENSES
View file
Open in desktop

Large diffs are not rendered by default.

58 changes: 29 additions & 29 deletions packages/aws-cdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,38 +108,38 @@
"@aws-cdk/cloudformation-diff": "0.0.0",
"@aws-cdk/cx-api": "0.0.0",
"@aws-cdk/region-info": "0.0.0",
"@aws-sdk/client-appsync": "3.699.0",
"@aws-sdk/client-cloudformation": "3.699.0",
"@aws-sdk/client-cloudwatch-logs": "3.699.0",
"@aws-sdk/client-codebuild": "3.699.0",
"@aws-sdk/client-ec2": "3.699.0",
"@aws-sdk/client-ecr": "3.699.0",
"@aws-sdk/client-ecs": "3.699.0",
"@aws-sdk/client-elastic-load-balancing-v2": "3.699.0",
"@aws-sdk/client-iam": "3.699.0",
"@aws-sdk/client-kms": "3.699.0",
"@aws-sdk/client-lambda": "3.699.0",
"@aws-sdk/client-route-53": "3.699.0",
"@aws-sdk/client-s3": "3.699.0",
"@aws-sdk/client-secrets-manager": "3.699.0",
"@aws-sdk/client-sfn": "3.699.0",
"@aws-sdk/client-ssm": "3.699.0",
"@aws-sdk/client-sts": "3.699.0",
"@aws-sdk/credential-providers": "3.699.0",
"@aws-sdk/ec2-metadata-service": "3.699.0",
"@aws-sdk/lib-storage": "3.699.0",
"@aws-sdk/client-appsync": "^3.699.0",
Copy link
Contributor

@iliapolo iliapolo Jan 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not super important but I think our package.json normally corresponds with the lock file.

Suggested change
"@aws-sdk/client-appsync": "^3.699.0",
"@aws-sdk/client-appsync": "^3.730.0",

Copy link
Contributor Author

@rix0rrr rix0rrr Jan 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorta the point of having the distinction between a package.json and a lockfile?

I do not care about this 😉

"@aws-sdk/client-cloudformation": "^3.699.0",
"@aws-sdk/client-cloudwatch-logs": "^3.699.0",
"@aws-sdk/client-codebuild": "^3.699.0",
"@aws-sdk/client-ec2": "^3.699.0",
"@aws-sdk/client-ecr": "^3.699.0",
"@aws-sdk/client-ecs": "^3.699.0",
"@aws-sdk/client-elastic-load-balancing-v2": "^3.699.0",
"@aws-sdk/client-iam": "^3.699.0",
"@aws-sdk/client-kms": "^3.699.0",
"@aws-sdk/client-lambda": "^3.699.0",
"@aws-sdk/client-route-53": "^3.699.0",
"@aws-sdk/client-s3": "^3.699.0",
"@aws-sdk/client-secrets-manager": "^3.699.0",
"@aws-sdk/client-sfn": "^3.699.0",
"@aws-sdk/client-ssm": "^3.699.0",
"@aws-sdk/client-sts": "^3.699.0",
"@aws-sdk/credential-providers": "^3.699.0",
"@aws-sdk/ec2-metadata-service": "^3.699.0",
"@aws-sdk/lib-storage": "^3.699.0",
"@jsii/check-node": "1.104.0",
"@smithy/middleware-endpoint": "3.1.4",
"@smithy/node-http-handler": "3.2.4",
"@smithy/property-provider": "3.1.10",
"@smithy/shared-ini-file-loader": "3.1.8",
"@smithy/types": "3.5.0",
"@smithy/util-retry": "3.0.7",
"@smithy/util-stream": "3.1.9",
"@smithy/util-waiter": "3.1.6",
"@smithy/middleware-endpoint": "^4",
"@smithy/node-http-handler": "^3.2.4",
"@smithy/property-provider": "^3.1.10",
"@smithy/shared-ini-file-loader": "^3.1.8",
"@smithy/types": "^3.5.0",
"@smithy/util-retry": "^3.0.7",
"@smithy/util-stream": "^3.1.9",
"@smithy/util-waiter": "^3.1.6",
"archiver": "^5.3.2",
"camelcase": "^6.3.0",
"cdk-assets": "^3.0.0-rc.111",
"cdk-assets": "^3.0.0-rc.123",
"cdk-from-cfn": "^0.162.0",
"chalk": "^4",
"chokidar": "^3.6.0",
Expand Down
71 changes: 33 additions & 38 deletions packages/aws-cdk/test/api/fake-sts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { AssumeRoleCommand, GetCallerIdentityCommand, Tag } from '@aws-sdk/client-sts';
import { Tag } from '@aws-sdk/client-sts';
import * as nock from 'nock';
import * as uuid from 'uuid';
import * as xmlJs from 'xml-js';
import { formatErrorMessage } from '../../lib/util/error';
import { mockSTSClient } from '../util/mock-sdk';

interface RegisteredIdentity {
readonly account: string;
Expand All @@ -21,6 +20,7 @@ interface RegisteredRole {
interface AssumedRole {
readonly roleArn: string;
readonly serialNumber: string;
readonly externalId?: string;
readonly tokenCode: string;
readonly roleSessionName: string;
readonly tags?: Tag[];
Expand All @@ -43,10 +43,22 @@ interface AssumedRole {
export class FakeSts {
public readonly assumedRoles = new Array<AssumedRole>();

/**
* AccessKey -> User or Session
*/
private identities: Record<string, RegisteredIdentity> = {};

/**
* RoleARN -> Role
*
* When a Role is assumed it creates a Session.
*/
private roles: Record<string, RegisteredRole> = {};

constructor() {}
/**
* Throw this error when AssumeRole is called
*/
public failAssumeRole?: Error;

/**
* Begin mocking
Expand All @@ -71,7 +83,8 @@ export class FakeSts {
parsedBody,
headers: this.req.headers,
});
cb(null, [200, xmlJs.js2xml(response, { compact: true })]);
const xml = xmlJs.js2xml(response, { compact: true });
cb(null, [200, xml]);
} catch (e: any) {
cb(null, [
400,
Expand Down Expand Up @@ -111,6 +124,13 @@ export class FakeSts {
nock.enableNetConnect();
}

public printState() {
// eslint-disable-next-line no-console
console.log(this.roles);
// eslint-disable-next-line no-console
console.log(this.identities);
}

/**
* Register a user
*/
Expand All @@ -124,8 +144,6 @@ export class FakeSts {
arn,
userId,
};

this.setSTSMocks(account, arn, userName, accessKey);
}

/**
Expand All @@ -140,44 +158,17 @@ export class FakeSts {
roleName,
account,
};

this.setSTSMocks(account, roleArn, roleArn);
}

private setSTSMocks(account: string, roleArn: string, name: string, accessKey?: string) {
const accessKeyId = accessKey ?? uuid.v4();
mockSTSClient
.on(GetCallerIdentityCommand)
.resolves({
Account: account,
Arn: roleArn,
UserId: name,
})
.on(AssumeRoleCommand)
.resolves({
AssumedRoleUser: {
Arn: roleArn,
AssumedRoleId: `${accessKeyId}:${name}`,
},
Credentials: {
AccessKeyId: accessKeyId,
SecretAccessKey: 'Secret',
SessionToken: 'Token',
Expiration: new Date(Date.now() + 3600 * 1000),
},
PackedPolicySize: 6,
});
}

private handleRequest(mockRequest: MockRequest): Record<string, any> {
const response = (() => {
const identity = this.identity(mockRequest);

switch (mockRequest.parsedBody.Action) {
case 'GetCallerIdentityCommand':
case 'GetCallerIdentity':
return this.handleGetCallerIdentity(identity);

case 'AssumeRoleCommand':
case 'AssumeRole':
return this.handleAssumeRole(identity, mockRequest);
}

Expand Down Expand Up @@ -229,6 +220,9 @@ export class FakeSts {

private handleAssumeRole(identity: RegisteredIdentity, mockRequest: MockRequest): Record<string, any> {
this.checkForFailure(mockRequest.parsedBody.RoleArn);
if (this.failAssumeRole) {
throw this.failAssumeRole;
}

this.assumedRoles.push({
roleArn: mockRequest.parsedBody.RoleArn,
Expand All @@ -237,6 +231,7 @@ export class FakeSts {
tokenCode: mockRequest.parsedBody.TokenCode,
tags: this.decodeMapFromRequestBody('Tags', mockRequest.parsedBody),
transitiveTagKeys: this.decodeListKeysFromRequestBody('TransitiveTagKeys', mockRequest.parsedBody),
externalId: mockRequest.parsedBody.ExternalId,
});

const roleArn = mockRequest.parsedBody.RoleArn;
Expand Down Expand Up @@ -274,9 +269,9 @@ export class FakeSts {
},
PackedPolicySize: 6,
},
},
ResponseMetadata: {
RequestId: '1',
ResponseMetadata: {
RequestId: '1',
},
},
};
}
Expand Down
Loading
Loading