Skip to content

Commit

Permalink
Merge branch 'main' into 25522_kafka_version
Browse files Browse the repository at this point in the history
  • Loading branch information
daschaa authored May 16, 2023
2 parents 3880137 + a2e6324 commit 00643f7
Show file tree
Hide file tree
Showing 842 changed files with 23,811 additions and 20,782 deletions.
6 changes: 0 additions & 6 deletions pack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,3 @@ if find dist/ | grep -F "${marker}"; then
echo "This is expected for builds in a development environment but should not happen in CI builds!"
exit 1
fi

# for posterity, print all files in dist
echo "=============================================================================================="
echo " dist contents"
echo "=============================================================================================="
find dist/
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
"@types/node": "18.11.19",
"@types/prettier": "2.6.0",
"@yarnpkg/lockfile": "^1.1.0",
"cdk-generate-synthetic-examples": "^0.1.237",
"cdk-generate-synthetic-examples": "^0.1.243",
"conventional-changelog-cli": "^2.2.2",
"fs-extra": "^9.1.0",
"graceful-fs": "^4.2.11",
"jest-junit": "^13.2.0",
"jsii-diff": "1.80.0",
"jsii-pacmak": "1.80.0",
"jsii-reflect": "1.80.0",
"jsii-rosetta": "~5.0.7",
"jsii-diff": "1.81.0",
"jsii-pacmak": "1.81.0",
"jsii-reflect": "1.81.0",
"jsii-rosetta": "~5.0.8",
"lerna": "^6.6.1",
"nx": "^15.9.4",
"patch-package": "^6.5.1",
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 @@ -39,7 +39,7 @@
},
"dependencies": {
"@octokit/rest": "^18.12.0",
"aws-sdk": "^2.1375.0",
"aws-sdk": "^2.1378.0",
"axios": "^0.27.2",
"fs-extra": "^9.1.0",
"glob": "^7.2.3",
Expand All @@ -48,7 +48,7 @@
"make-runnable": "^1.4.1",
"npm": "^8.19.4",
"p-queue": "^6.6.2",
"semver": "^7.5.0",
"semver": "^7.5.1",
"ts-mock-imports": "^1.3.8",
"yaml": "1.10.2",
"yargs": "^17.7.2"
Expand Down
8 changes: 4 additions & 4 deletions packages/@aws-cdk-testing/framework-integ/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
},
"dependencies": {
"@aws-cdk/integ-tests-alpha": "0.0.0",
"@aws-cdk/lambda-layer-kubectl-v24": "^2.0.188",
"@aws-cdk/lambda-layer-kubectl-v24": "^2.0.194",
"aws-cdk-lib": "0.0.0",
"aws-sdk": "^2.1375.0",
"aws-sdk": "^2.1378.0",
"aws-sdk-mock": "5.6.0",
"cdk8s": "^2.7.56",
"cdk8s-plus-24": "2.7.24",
"cdk8s": "^2.7.65",
"cdk8s-plus-24": "2.7.30",
"constructs": "^10.0.0"
},
"repository": {
Expand Down

This file was deleted.

Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { IsCompleteResponse, OnEventResponse } from '../../../custom-resources/lib/provider-framework/types';
import { EksClient, ResourceEvent, ResourceHandler } from './common';
import { IsCompleteResponse, OnEventResponse } from '../../../custom-resources/lib/provider-framework/types';
export declare class ClusterResourceHandler extends ResourceHandler {
get clusterName(): string;
private readonly newProps;
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* eslint-disable no-console */

// eslint-disable-next-line import/no-extraneous-dependencies
import { IsCompleteResponse, OnEventResponse } from '../../../custom-resources/lib/provider-framework/types';
// eslint-disable-next-line import/no-extraneous-dependencies
import * as aws from 'aws-sdk';
import { EksClient, ResourceEvent, ResourceHandler } from './common';
import { compareLoggingProps } from './compareLogging';
import { IsCompleteResponse, OnEventResponse } from '../../../custom-resources/lib/provider-framework/types';


const MAX_CLUSTER_NAME_LEN = 100;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { IsCompleteResponse, OnEventResponse } from '../../../custom-resources/lib/provider-framework/types';
import * as aws from 'aws-sdk';
import { IsCompleteResponse, OnEventResponse } from '../../../custom-resources/lib/provider-framework/types';
export interface EksUpdateId {
/**
* If this field is included in an event passed to "IsComplete", it means we
Expand Down
Loading

0 comments on commit 00643f7

Please sign in to comment.