Skip to content

Commit

Permalink
chore: npm-check-updates && yarn upgrade (#30991)
Browse files Browse the repository at this point in the history
Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
  • Loading branch information
aws-cdk-automation authored Sep 11, 2024
1 parent 1794dc4 commit e91eec2
Show file tree
Hide file tree
Showing 50 changed files with 980 additions and 1,552 deletions.
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@
"build-all": "tsc -b"
},
"devDependencies": {
"@nx/workspace": "^19.4.0",
"@nx/workspace": "^19.6.5",
"@types/node": "18.11.19",
"@types/prettier": "2.6.0",
"@yarnpkg/lockfile": "^1.1.0",
"aws-sdk-js-codemod": "^0.28.2",
"cdk-generate-synthetic-examples": "^0.2.9",
"cdk-generate-synthetic-examples": "^0.2.14",
"conventional-changelog-cli": "^2.2.2",
"fs-extra": "^9.1.0",
"graceful-fs": "^4.2.11",
"jest-junit": "^13.2.0",
"jsii-diff": "1.102.0",
"jsii-pacmak": "1.102.0",
"jsii-reflect": "1.102.0",
"lerna": "^8.1.5",
"nx": "^19.4.0",
"jsii-diff": "1.103.1",
"jsii-pacmak": "1.103.1",
"jsii-reflect": "1.103.1",
"lerna": "^8.1.8",
"nx": "^19.6.5",
"patch-package": "^6.5.1",
"semver": "^7.6.2",
"semver": "^7.6.3",
"standard-version": "^9.5.0",
"ts-jest": "^29.1.5",
"ts-jest": "^29.2.5",
"ts-node": "^10.9.2",
"typescript": "~5.4.5"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk-testing/cli-integ/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"@aws-sdk/credential-providers": "3.637.0",
"@smithy/util-retry": "3.0.3",
"@smithy/types": "3.3.0",
"axios": "^1.7.2",
"axios": "^1.7.7",
"chalk": "^4",
"fs-extra": "^9.1.0",
"glob": "^7.2.3",
Expand All @@ -61,7 +61,7 @@
"make-runnable": "^1.4.1",
"npm": "^8.19.4",
"p-queue": "^6.6.2",
"semver": "^7.6.2",
"semver": "^7.6.3",
"sinon": "^9.2.4",
"ts-mock-imports": "^1.3.16",
"yaml": "1.10.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk-testing/framework-integ/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
"@aws-cdk/integ-tests-alpha": "0.0.0",
"@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242",
"@aws-cdk/lambda-layer-kubectl-v29": "^2.1.0",
"@aws-cdk/lambda-layer-kubectl-v30": "^2.0.0",
"@aws-cdk/lambda-layer-kubectl-v30": "^2.0.1",
"aws-cdk-lib": "0.0.0",
"aws-sdk-mock": "5.6.0",
"cdk8s": "2.68.85",
"cdk8s": "2.68.104",
"cdk8s-plus-27": "2.9.5",
"constructs": "^10.0.0"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export async function handler(props: UserTablePrivilegesHandlerProps & ClusterPr
username,
tablePrivileges,
clusterProps,
event.OldResourceProperties as UserTablePrivilegesHandlerProps & ClusterProps,
event.OldResourceProperties as unknown as UserTablePrivilegesHandlerProps & ClusterProps,
);
const physicalId = replace ? makePhysicalId(username, clusterProps, event.RequestId) : event.PhysicalResourceId;
return { PhysicalResourceId: physicalId };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export async function handler(props: TableAndClusterProps, event: AWSLambda.Clou
tableColumns,
useColumnIds,
tableAndClusterProps,
event.OldResourceProperties as TableAndClusterProps,
event.OldResourceProperties as unknown as TableAndClusterProps,
isTableV2,
);
return { PhysicalResourceId: event.PhysicalResourceId };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ export async function handler(props: UserHandlerProps & ClusterProps, event: AWS
await dropUser(username, clusterProps);
return;
} else if (event.RequestType === 'Update') {
const { replace } = await updateUser(username, passwordSecretArn, clusterProps, event.OldResourceProperties as UserHandlerProps & ClusterProps);
const { replace } = await updateUser(
username,
passwordSecretArn,
clusterProps,
event.OldResourceProperties as unknown as UserHandlerProps & ClusterProps);
const physicalId = replace ? makePhysicalId(username, clusterProps, event.RequestId) : event.PhysicalResourceId;
return { PhysicalResourceId: physicalId, Data: { username: username } };
} else {
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/cloudformation-diff/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
"@aws-sdk/client-cloudformation": "^3.529.1",
"@types/jest": "^29.5.12",
"@types/string-width": "^4.0.1",
"fast-check": "^3.19.0",
"fast-check": "^3.22.0",
"jest": "^29.7.0",
"ts-jest": "^29.1.5"
"ts-jest": "^29.2.5"
},
"repository": {
"url": "https://github.com/aws/aws-cdk.git",
Expand Down
6 changes: 3 additions & 3 deletions packages/@aws-cdk/custom-resource-handlers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@
"@cdklabs/typewriter": "^0.0.3",
"jest": "^29.7.0",
"sinon": "^9.2.4",
"nock": "^13.5.4",
"nock": "^13.5.5",
"fs-extra": "^11.2.0",
"esbuild": "^0.23.0"
"esbuild": "^0.23.1"
},
"dependencies": {
"@aws-cdk/asset-node-proxy-agent-v6": "^2.0.3",
"@aws-cdk/asset-node-proxy-agent-v6": "^2.1.0",
"@aws-sdk/client-lambda": "3.421.0",
"@aws-sdk/client-synthetics": "3.421.0",
"@aws-sdk/client-ecr": "3.421.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/cx-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,15 @@
"organization": true
},
"dependencies": {
"semver": "^7.6.2"
"semver": "^7.6.3"
},
"peerDependencies": {
"@aws-cdk/cloud-assembly-schema": "^36.0.5"
},
"license": "Apache-2.0",
"devDependencies": {
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cloud-assembly-schema": "^36.0.5",
"@aws-cdk/cloud-assembly-schema": "^36.0.24",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^29.5.12",
"@types/mock-fs": "^4.13.4",
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/integ-runner/THIRD_PARTY_LICENSES
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The @aws-cdk/integ-runner package includes the following third-party software/licensing:

** ajv@8.16.0 - https://www.npmjs.com/package/ajv/v/8.16.0 | MIT
** ajv@8.17.1 - https://www.npmjs.com/package/ajv/v/8.17.1 | MIT
The MIT License (MIT)

Copyright (c) 2015-2021 Evgeny Poberezkin
Expand Down Expand Up @@ -297,7 +297,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

----------------

** escalade@3.1.2 - https://www.npmjs.com/package/escalade/v/3.1.2 | MIT
** escalade@3.2.0 - https://www.npmjs.com/package/escalade/v/3.2.0 | MIT
MIT License

Copyright (c) Luke Edwards <luke.edwards05@gmail.com> (lukeed.com)
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/integ-runner/lib/runner/runner-base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { AVAILABILITY_ZONE_FALLBACK_CONTEXT_KEY, TARGET_PARTITIONS, NEW_PROJECT_
import * as fs from 'fs-extra';
import { IntegTestSuite, LegacyIntegTestSuite } from './integ-test-suite';
import { IntegTest } from './integration-tests';
import { AssemblyManifestReader, ManifestTrace } from './private/cloud-assembly';
import { flatten } from '../utils';
import { AssemblyManifestReader, ManifestTrace } from './private/cloud-assembly';
import { DestructiveChange } from '../workers/common';

const DESTRUCTIVE_CHANGES = '!!DESTRUCTIVE_CHANGES:';
Expand Down
6 changes: 3 additions & 3 deletions packages/@aws-cdk/integ-runner/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@
},
"dependencies": {
"chokidar": "^3.6.0",
"@aws-cdk/cloud-assembly-schema": "^36.0.5",
"@aws-cdk/cloud-assembly-schema": "^36.0.24",
"@aws-cdk/cloudformation-diff": "0.0.0",
"@aws-cdk/cx-api": "0.0.0",
"@aws-cdk/aws-service-spec": "^0.1.23",
"cdk-assets": "^2.151.2",
"cdk-assets": "^2.151.29",
"@aws-cdk/cdk-cli-wrapper": "0.0.0",
"aws-cdk": "0.0.0",
"chalk": "^4",
Expand Down Expand Up @@ -108,4 +108,4 @@
"publishConfig": {
"tag": "latest"
}
}
}
2 changes: 1 addition & 1 deletion packages/@aws-cdk/integ-tests-alpha/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"aws-sdk-client-mock": "^3.1.0",
"aws-sdk-client-mock-jest": "^3.1.0",
"jest": "^29.7.0",
"nock": "^13.5.4",
"nock": "^13.5.5",
"sinon": "^9.2.4",
"aws-cdk-lib": "0.0.0",
"node-fetch": "^2.7.0",
Expand Down
35 changes: 27 additions & 8 deletions packages/aws-cdk-lib/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -731,18 +731,37 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

----------------

** uri-js - https://www.npmjs.com/package/uri-js/v/4.4.1 | BSD-2-Clause
Copyright 2011 Gary Court. All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
** fast-uri - https://www.npmjs.com/package/fast-uri/v/3.0.1 | BSD-3-Clause
Copyright (c) 2021 The Fastify Team
Copyright (c) 2011-2021, Gary Court until https://github.com/garycourt/uri-js/commit/a1acf730b4bba3f1097c9f52e7d9d3aba8cdcaae
All rights reserved.

1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* The names of any contributors may not be used to endorse or promote
products derived from this software without specific prior written
permission.

2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

THIS SOFTWARE IS PROVIDED BY GARY COURT "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GARY COURT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* * *

The views and conclusions contained in the software and documentation are those of the authors and should not be interpreted as representing official policies, either expressed or implied, of Gary Court.
The complete list of contributors can be found at:
- https://github.com/garycourt/uri-js/graphs/contributors


----------------
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/assertions/lib/private/resources.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Match, Matcher } from '..';
import { AbsentMatch } from './matchers/absent';
import { formatAllMismatches, matchSection, formatSectionMatchFailure } from './section';
import { Resource, Template } from './template';
import { Match, Matcher } from '..';

export function findResources(template: Template, type: string, props: any = {}): { [key: string]: { [key: string]: any } } {
const section = template.Resources ?? {};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { WebSocketLambdaIntegration } from './../../../aws-apigatewayv2-integrations/lib/websocket/lambda';
import { WebSocketIamAuthorizer } from './../../lib/websocket/iam';
import { Template } from '../../../assertions';
import { WebSocketApi } from '../../../aws-apigatewayv2';
import { Code, Function } from '../../../aws-lambda';
import * as lambda from '../../../aws-lambda';
import { Stack } from '../../../core';
import { WebSocketLambdaIntegration } from './../../../aws-apigatewayv2-integrations/lib/websocket/lambda';
import { WebSocketIamAuthorizer } from './../../lib/websocket/iam';

describe('WebSocketLambdaAuthorizer', () => {
test('default', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { WebSocketLambdaIntegration } from './../../../aws-apigatewayv2-integrations/lib/websocket/lambda';
import { WebSocketLambdaAuthorizer } from './../../lib/websocket/lambda';
import { Template } from '../../../assertions';
import { WebSocketApi } from '../../../aws-apigatewayv2';
import { Code, Function } from '../../../aws-lambda';
import * as lambda from '../../../aws-lambda';
import { Stack } from '../../../core';
import { WebSocketLambdaIntegration } from './../../../aws-apigatewayv2-integrations/lib/websocket/lambda';
import { WebSocketLambdaAuthorizer } from './../../lib/websocket/lambda';

describe('WebSocketLambdaAuthorizer', () => {
test('default', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { HttpUrlIntegration } from './../../lib/http/http-proxy';
import { Template } from '../../../assertions';
import { HttpApi, HttpIntegration, HttpIntegrationType, HttpMethod, HttpRoute, HttpRouteKey, MappingValue, ParameterMapping, PayloadFormatVersion } from '../../../aws-apigatewayv2';
import { Duration, Stack } from '../../../core';
import { HttpUrlIntegration } from './../../lib/http/http-proxy';

describe('HttpProxyIntegration', () => {
test('default', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { HttpLambdaIntegration } from './../../lib/http/lambda';
import { Match, Template } from '../../../assertions';
import { HttpApi, HttpRoute, HttpRouteKey, MappingValue, ParameterMapping, PayloadFormatVersion } from '../../../aws-apigatewayv2';
import * as lambda from '../../../aws-lambda';
import { Code, Function } from '../../../aws-lambda';
import { App, Duration, Stack } from '../../../core';
import { HttpLambdaIntegration } from './../../lib/http/lambda';

describe('LambdaProxyIntegration', () => {
test('default', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { HttpNlbIntegration } from './../../lib/http/nlb';
import { Template } from '../../../assertions';
import { HttpApi, HttpMethod, HttpRoute, HttpRouteKey, MappingValue, ParameterMapping, VpcLink } from '../../../aws-apigatewayv2';
import * as ec2 from '../../../aws-ec2';
import * as elbv2 from '../../../aws-elasticloadbalancingv2';
import { Duration, Stack } from '../../../core';
import { HttpNlbIntegration } from './../../lib/http/nlb';

describe('HttpNlbIntegration', () => {
test('default', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { HttpPrivateIntegration } from './../../../lib/http/private/integration';
import { HttpApi, HttpRoute, HttpRouteIntegrationBindOptions, HttpRouteIntegrationConfig, HttpRouteKey } from '../../../../aws-apigatewayv2';
import { Stack } from '../../../../core';
import { HttpPrivateIntegration } from './../../../lib/http/private/integration';

describe('HttpPrivateIntegration', () => {
test('throws error if both vpcLink and vpc are not passed', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { HttpServiceDiscoveryIntegration } from './../../lib/http/service-discovery';
import { Template } from '../../../assertions';
import { HttpApi, HttpMethod, HttpRoute, HttpRouteKey, MappingValue, ParameterMapping, VpcLink } from '../../../aws-apigatewayv2';
import * as ec2 from '../../../aws-ec2';
import * as servicediscovery from '../../../aws-servicediscovery';
import { Stack } from '../../../core';
import { HttpServiceDiscoveryIntegration } from './../../lib/http/service-discovery';

describe('HttpServiceDiscoveryIntegration', () => {
test('default', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { WebSocketAwsIntegration } from './../../lib/websocket/aws';
import { Template } from '../../../assertions';
import { ContentHandling, PassthroughBehavior, WebSocketApi } from '../../../aws-apigatewayv2';
import * as iam from '../../../aws-iam';
import { Duration, Stack } from '../../../core';
import { WebSocketAwsIntegration } from './../../lib/websocket/aws';

describe('AwsWebSocketIntegration', () => {
test('default', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { WebSocketLambdaIntegration } from './../../lib/websocket/lambda';
import { Template } from '../../../assertions';
import { ContentHandling, WebSocketApi } from '../../../aws-apigatewayv2';
import { Code, Function } from '../../../aws-lambda';
import * as lambda from '../../../aws-lambda';
import { Duration, Stack } from '../../../core';
import { WebSocketLambdaIntegration } from './../../lib/websocket/lambda';

describe('LambdaWebSocketIntegration', () => {
const IntegrationUri = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { WebSocketMockIntegration } from './../../lib/websocket/mock';
import { Template } from '../../../assertions';
import { WebSocketApi } from '../../../aws-apigatewayv2';
import { Stack } from '../../../core';
import { WebSocketMockIntegration } from './../../lib/websocket/mock';

describe('MockWebSocketIntegration', () => {
test('default', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Construct } from 'constructs';
import { UserPoolIdentityProviderProps } from './base';
import { UserPoolIdentityProviderBase } from './private/user-pool-idp-base';
import { CfnUserPoolIdentityProvider } from '../cognito.generated';
import { UserPoolIdentityProviderBase } from './private/user-pool-idp-base';

/**
* Properties to initialize UserPoolAmazonIdentityProvider
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Construct } from 'constructs';
import { UserPoolIdentityProviderProps } from './base';
import { UserPoolIdentityProviderBase } from './private/user-pool-idp-base';
import { CfnUserPoolIdentityProvider } from '../cognito.generated';
import { UserPoolIdentityProviderBase } from './private/user-pool-idp-base';

/**
* Properties to initialize UserPoolAppleIdentityProvider
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Construct } from 'constructs';
import { UserPoolIdentityProviderProps } from './base';
import { UserPoolIdentityProviderBase } from './private/user-pool-idp-base';
import { CfnUserPoolIdentityProvider } from '../cognito.generated';
import { UserPoolIdentityProviderBase } from './private/user-pool-idp-base';

/**
* Properties to initialize UserPoolFacebookIdentityProvider
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Construct } from 'constructs';
import { State } from './state';
import { Chain } from '..';
import { State } from './state';
import { Annotations } from '../../../core/';
import { CatchProps, IChainable, INextable, RetryProps } from '../types';

Expand Down
Loading

0 comments on commit e91eec2

Please sign in to comment.