Skip to content

Commit 52c1117

Browse files
chore: remove uses of aws-sdk outside cli (#31275)
Every use of sdkv2, besides what is used inside the cli has been removed as of this change. ### Checklist - [ ] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 47605c2 commit 52c1117

File tree

8 files changed

+8
-89
lines changed

8 files changed

+8
-89
lines changed

packages/@aws-cdk-testing/framework-integ/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
"@aws-cdk/lambda-layer-kubectl-v29": "^2.1.0",
4444
"@aws-cdk/lambda-layer-kubectl-v30": "^2.0.0",
4545
"aws-cdk-lib": "0.0.0",
46-
"aws-sdk": "^2.1653.0",
4746
"aws-sdk-mock": "5.6.0",
4847
"cdk8s": "2.68.85",
4948
"cdk8s-plus-27": "2.9.5",

packages/@aws-cdk/custom-resource-handlers/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
"@types/jest": "^29.5.12",
5050
"aws-sdk-client-mock": "^3.1.0",
5151
"aws-sdk-client-mock-jest": "^3.1.0",
52-
"aws-sdk-mock": "5.8.0",
5352
"@cdklabs/typewriter": "^0.0.3",
5453
"jest": "^29.7.0",
5554
"sinon": "^9.2.4",

packages/aws-cdk-lib/aws-events-targets/lib/aws-api.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
import { metadata } from './sdk-api-metadata.generated';
21
import { addLambdaPermission } from './util';
32
import * as events from '../../aws-events';
43
import * as iam from '../../aws-iam';
54
import * as lambda from '../../aws-lambda';
65
import { Annotations, Duration } from '../../core';
76
import { AwsApiSingletonFunction } from '../../custom-resource-handlers/dist/aws-events-targets/aws-api-provider.generated';
7+
import * as metadata from '../../custom-resources/lib/helpers-internal/sdk-v3-metadata.json';
88

9+
type AwsSdkMetadataItem = { iamPrefix: string };
910
/**
1011
* AWS SDK service metadata.
1112
*/
12-
export type AwsSdkMetadata = {[key: string]: any};
13+
export type AwsSdkMetadata = {[key: string]: AwsSdkMetadataItem | {}};
1314

1415
const awsSdkMetadata: AwsSdkMetadata = metadata;
1516

@@ -135,7 +136,7 @@ services and actions from https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/in
135136
*/
136137
function awsSdkToIamAction(service: string, action: string): string {
137138
const srv = service.toLowerCase();
138-
const iamService = awsSdkMetadata[srv].prefix || srv;
139+
const iamService = (awsSdkMetadata[srv] as AwsSdkMetadataItem).iamPrefix || srv;
139140
const iamAction = action.charAt(0).toUpperCase() + action.slice(1);
140141
return `${iamService}:${iamAction}`;
141142
}

packages/aws-cdk-lib/aws-events-targets/test/aws-api/aws-api.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ test('use AwsApi as an event rule target', () => {
1818
parameters: {
1919
service: 'cool-service',
2020
forceNewDeployment: true,
21-
} as AWS.ECS.UpdateServiceRequest,
21+
},
2222
catchErrorPattern: 'error',
2323
apiVersion: '2019-01-01',
2424
}));
@@ -28,7 +28,7 @@ test('use AwsApi as an event rule target', () => {
2828
action: 'createDBSnapshot',
2929
parameters: {
3030
DBInstanceIdentifier: 'cool-instance',
31-
} as AWS.RDS.CreateDBSnapshotMessage,
31+
},
3232
}));
3333

3434
// THEN

packages/aws-cdk-lib/package.json

-2
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,8 @@
167167
"@types/punycode": "^2.1.4",
168168
"@types/mime-types": "^2.1.4",
169169
"@aws-cdk/lazify": "0.0.0",
170-
"aws-sdk": "^2.1653.0",
171170
"aws-sdk-client-mock": "^3.1.0",
172171
"aws-sdk-client-mock-jest": "^3.1.0",
173-
"aws-sdk-mock": "5.8.0",
174172
"cdk8s": "2.68.85",
175173
"constructs": "^10.0.0",
176174
"delay": "5.0.0",

packages/aws-cdk-lib/scripts/submodules/aws-events-targets.ts

-39
This file was deleted.

packages/aws-cdk-lib/scripts/submodules/index.ts

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import * as path from 'node:path';
22
import { createLibraryReadme } from '@aws-cdk/pkglint';
33
import * as fs from 'fs-extra';
4-
import awsEventsTargets from './aws-events-targets';
54
import cloudformationInclude from './cloudformation-include';
65
import { ModuleMap, ModuleMapEntry } from '../codegen';
76

@@ -16,7 +15,6 @@ export default async function submodulesGen(modules: ModuleMap, outPath: string)
1615
}
1716

1817
// Do specific code gen for certain submodules
19-
await awsEventsTargets(modules, outPath);
2018
await cloudformationInclude(modules, outPath);
2119
}
2220

yarn.lock

+2-39
Original file line numberDiff line numberDiff line change
@@ -6205,13 +6205,6 @@
62056205
dependencies:
62066206
"@sinonjs/commons" "^1.7.0"
62076207

6208-
"@sinonjs/fake-timers@^9.1.2":
6209-
version "9.1.2"
6210-
resolved "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c"
6211-
integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==
6212-
dependencies:
6213-
"@sinonjs/commons" "^1.7.0"
6214-
62156208
"@sinonjs/samsam@^5.3.1":
62166209
version "5.3.1"
62176210
resolved "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.3.1.tgz#375a45fe6ed4e92fca2fb920e007c48232a6507f"
@@ -6230,15 +6223,6 @@
62306223
lodash.get "^4.4.2"
62316224
type-detect "^4.0.8"
62326225

6233-
"@sinonjs/samsam@^7.0.1":
6234-
version "7.0.1"
6235-
resolved "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-7.0.1.tgz#5b5fa31c554636f78308439d220986b9523fc51f"
6236-
integrity sha512-zsAk2Jkiq89mhZovB2LLOdTCxJF4hqqTToGP0ASWlhp4I1hqOjcfmZGafXntCN7MDC6yySH0mFHrYtHceOeLmw==
6237-
dependencies:
6238-
"@sinonjs/commons" "^2.0.0"
6239-
lodash.get "^4.4.2"
6240-
type-detect "^4.0.8"
6241-
62426226
"@sinonjs/samsam@^8.0.0":
62436227
version "8.0.0"
62446228
resolved "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.0.tgz#0d488c91efb3fa1442e26abea81759dfc8b5ac60"
@@ -8474,16 +8458,7 @@ [email protected]:
84748458
sinon "^11.1.1"
84758459
traverse "^0.6.6"
84768460

8477-
8478-
version "5.8.0"
8479-
resolved "https://registry.npmjs.org/aws-sdk-mock/-/aws-sdk-mock-5.8.0.tgz#2556a79010a883f4bd5a566ce63bc244cee67579"
8480-
integrity sha512-s0Vy4DObFmVJ6h1uTw1LGInOop77oF0JXH2N39Lv+1Wss274EowVk9odhM4Sji4mynXcM5oSu68uYqkJRviDRA==
8481-
dependencies:
8482-
aws-sdk "^2.1231.0"
8483-
sinon "^14.0.1"
8484-
traverse "^0.6.6"
8485-
8486-
aws-sdk@^2.1231.0, aws-sdk@^2.1653.0, aws-sdk@^2.928.0:
8461+
aws-sdk@^2.1653.0, aws-sdk@^2.928.0:
84878462
version "2.1653.0"
84888463
resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1653.0.tgz#2cd9b2ea77b0fc6d59a03f0d26801300dec6adf0"
84898464
integrity sha512-9f42kuLpMcL1EPZOsLM8u6wlnOMtFwED1b24SN0fBbi/N7N1xTLZ7vbEMt/haz06Lc3Vr3VMDyv0atfMmkboBw==
@@ -14242,7 +14217,7 @@ nise@^4.0.4:
1424214217
just-extend "^4.0.2"
1424314218
path-to-regexp "^1.7.0"
1424414219

14245-
nise@^5.1.0, nise@^5.1.2, nise@^5.1.4:
14220+
nise@^5.1.0, nise@^5.1.4:
1424614221
version "5.1.9"
1424714222
resolved "https://registry.npmjs.org/nise/-/nise-5.1.9.tgz#0cb73b5e4499d738231a473cd89bd8afbb618139"
1424814223
integrity sha512-qOnoujW4SV6e40dYxJOb3uvuoPHtmLzIk4TFo+j0jPJoC+5Z9xja5qH5JZobEPsa8+YYphMrOSwnrshEhG2qww==
@@ -16451,18 +16426,6 @@ sinon@^11.1.1:
1645116426
nise "^5.1.0"
1645216427
supports-color "^7.2.0"
1645316428

16454-
sinon@^14.0.1:
16455-
version "14.0.2"
16456-
resolved "https://registry.npmjs.org/sinon/-/sinon-14.0.2.tgz#585a81a3c7b22cf950762ac4e7c28eb8b151c46f"
16457-
integrity sha512-PDpV0ZI3ZCS3pEqx0vpNp6kzPhHrLx72wA0G+ZLaaJjLIYeE0n8INlgaohKuGy7hP0as5tbUd23QWu5U233t+w==
16458-
dependencies:
16459-
"@sinonjs/commons" "^2.0.0"
16460-
"@sinonjs/fake-timers" "^9.1.2"
16461-
"@sinonjs/samsam" "^7.0.1"
16462-
diff "^5.0.0"
16463-
nise "^5.1.2"
16464-
supports-color "^7.2.0"
16465-
1646616429
sinon@^16.1.3:
1646716430
version "16.1.3"
1646816431
resolved "https://registry.npmjs.org/sinon/-/sinon-16.1.3.tgz#b760ddafe785356e2847502657b4a0da5501fba8"

0 commit comments

Comments
 (0)