diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8b69f375..900c2860 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - name: Install dependencies run: yarn install --check-files - name: build @@ -91,7 +91,7 @@ jobs: steps: - uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - name: Download build artifacts uses: actions/download-artifact@v3 with: @@ -120,7 +120,7 @@ jobs: java-version: 11.x - uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - name: Download build artifacts uses: actions/download-artifact@v3 with: @@ -145,7 +145,7 @@ jobs: steps: - uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - uses: actions/setup-python@v4 with: python-version: 3.x @@ -173,7 +173,7 @@ jobs: steps: - uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - uses: actions/setup-dotnet@v3 with: dotnet-version: 3.x @@ -201,7 +201,7 @@ jobs: steps: - uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - uses: actions/setup-go@v3 with: go-version: ^1.16.0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 138e2986..916aa39e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,7 +27,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - name: Install dependencies run: yarn install --check-files --frozen-lockfile - name: release @@ -55,7 +55,7 @@ jobs: steps: - uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - name: Download build artifacts uses: actions/download-artifact@v3 with: @@ -84,7 +84,7 @@ jobs: steps: - uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - name: Download build artifacts uses: actions/download-artifact@v3 with: @@ -121,7 +121,7 @@ jobs: java-version: 11.x - uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - name: Download build artifacts uses: actions/download-artifact@v3 with: @@ -157,7 +157,7 @@ jobs: steps: - uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - uses: actions/setup-python@v4 with: python-version: 3.x @@ -192,7 +192,7 @@ jobs: steps: - uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - uses: actions/setup-dotnet@v3 with: dotnet-version: 3.x @@ -226,7 +226,7 @@ jobs: steps: - uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - uses: actions/setup-go@v3 with: go-version: ^1.16.0 diff --git a/.github/workflows/upgrade-dev-deps-main.yml b/.github/workflows/upgrade-dev-deps-main.yml index f86173fe..2eec2005 100644 --- a/.github/workflows/upgrade-dev-deps-main.yml +++ b/.github/workflows/upgrade-dev-deps-main.yml @@ -21,7 +21,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - name: Install dependencies run: yarn install --check-files --frozen-lockfile - name: Upgrade dependencies diff --git a/.github/workflows/upgrade-main.yml b/.github/workflows/upgrade-main.yml index 0a177a1f..48f9d830 100644 --- a/.github/workflows/upgrade-main.yml +++ b/.github/workflows/upgrade-main.yml @@ -21,7 +21,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - name: Install dependencies run: yarn install --check-files --frozen-lockfile - name: Upgrade dependencies diff --git a/.projen/deps.json b/.projen/deps.json index b6e7ac3b..a9066327 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -2,12 +2,11 @@ "dependencies": [ { "name": "@types/jest", - "version": "^27", "type": "build" }, { "name": "@types/node", - "version": "^16", + "version": "^18", "type": "build" }, { @@ -47,13 +46,12 @@ "type": "build" }, { - "name": "jest-junit", - "version": "^15", + "name": "jest", "type": "build" }, { - "name": "jest", - "version": "^27", + "name": "jest-junit", + "version": "^15", "type": "build" }, { @@ -74,7 +72,7 @@ }, { "name": "jsii", - "version": "1.x", + "version": "~5.2", "type": "build" }, { @@ -88,7 +86,6 @@ }, { "name": "ts-jest", - "version": "^27", "type": "build" }, { @@ -113,16 +110,6 @@ "version": "latest", "type": "devenv" }, - { - "name": "@types/babel__traverse", - "version": "7.18.2", - "type": "override" - }, - { - "name": "@types/prettier", - "version": "2.6.0", - "type": "override" - }, { "name": "@aws-cdk/aws-glue-alpha", "version": "2.116.1-alpha.0", diff --git a/.projen/tasks.json b/.projen/tasks.json index 1306ca01..7ba967ab 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -1330,13 +1330,13 @@ }, "steps": [ { - "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --dep=dev --filter=@types/jest,@types/node,@typescript-eslint/eslint-plugin,@typescript-eslint/parser,aws-cdk,cdklabs-projen-project-types,esbuild,eslint-import-resolver-typescript,eslint-plugin-import,eslint,jest-junit,jest,jsii-diff,jsii-docgen,jsii-pacmak,jsii-rosetta,projen,standard-version,ts-jest,ts-node,typescript" + "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --dep=dev --filter=@types/jest,@types/node,@typescript-eslint/eslint-plugin,@typescript-eslint/parser,aws-cdk,cdklabs-projen-project-types,esbuild,eslint-import-resolver-typescript,eslint-plugin-import,eslint,jest,jest-junit,jsii-diff,jsii-docgen,jsii-pacmak,jsii-rosetta,projen,standard-version,ts-jest,ts-node,typescript" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade @types/jest @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser aws-cdk cdklabs-projen-project-types esbuild eslint-import-resolver-typescript eslint-plugin-import eslint jest-junit jest jsii-diff jsii-docgen jsii-pacmak jsii-rosetta projen standard-version ts-jest ts-node typescript" + "exec": "yarn upgrade @types/jest @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser aws-cdk cdklabs-projen-project-types esbuild eslint-import-resolver-typescript eslint-plugin-import eslint jest jest-junit jsii-diff jsii-docgen jsii-pacmak jsii-rosetta projen standard-version ts-jest ts-node typescript" }, { "exec": "npx projen" diff --git a/.projenrc.ts b/.projenrc.ts index ef3f7ab5..9a7302fd 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -12,7 +12,6 @@ const project = new CdklabsConstructLibrary({ authorAddress: 'cdk-appflow-maintainers@amazon.com', cdkVersion, defaultReleaseBranch: 'main', - minNodeVersion: '16.0.0', projenrcTs: true, private: false, repositoryUrl: 'https://github.com/cdklabs/cdk-appflow.git', diff --git a/API.md b/API.md index 57576076..1f3fd1c4 100644 --- a/API.md +++ b/API.md @@ -5638,7 +5638,7 @@ SnowflakeConnectorProfile.fromConnectionProfileName(scope: Construct, id: string | arn | string | *No description.* | | name | string | *No description.* | | credentials | aws-cdk-lib.aws_secretsmanager.ISecret | *No description.* | -| integrationRole | aws-cdk-lib.aws_iam.IRole | The AWS IAM Role for the storage integration with Snowflake. Available only if [SnowflakeConnectorProfileProps's integration property]{@link SnowflakeConnectorProfileProps#integration} is provided. | +| integrationRole | aws-cdk-lib.aws_iam.IRole | The AWS IAM Role for the storage integration with Snowflake. | --- @@ -5723,7 +5723,9 @@ public readonly integrationRole: IRole; - *Type:* aws-cdk-lib.aws_iam.IRole -The AWS IAM Role for the storage integration with Snowflake. Available only if [SnowflakeConnectorProfileProps's integration property]{@link SnowflakeConnectorProfileProps#integration} is provided. +The AWS IAM Role for the storage integration with Snowflake. + +Available only if [SnowflakeConnectorProfileProps's integration property]{@link SnowflakeConnectorProfileProps#integration } is provided. For more details see {@link https://docs.snowflake.com/en/user-guide/data-load-s3-config-storage-integration} @@ -6748,7 +6750,9 @@ public readonly timestampField: string; The name of the field to use as a timestamp for recurring incremental flows. -The default field is set per particular @see ISource. +The default field is set per particular + +> [ISource.](ISource.) --- @@ -7292,7 +7296,7 @@ public readonly accessToken: SecretValue; ``` - *Type:* aws-cdk-lib.SecretValue -- *Default:* Retrieves a fresh accessToken with the information in the [flow property]{@link GoogleAnalytics4OAuthSettings#flow} +- *Default:* Retrieves a fresh accessToken with the information in the [flow property]{@link GoogleAnalytics4OAuthSettings#flow } The access token to be used when interacting with Google Analytics 4. @@ -8403,7 +8407,7 @@ Note: requires full name starting with 'sites/' ##### ~~`drives`~~Optional -- *Deprecated:* . This property is deprecated and will be removed in a future release. Use {@link entities} instead +- *Deprecated:* . This property is deprecated and will be removed in a future release. Use {@link entities } instead ```typescript public readonly drives: string[]; @@ -8776,7 +8780,7 @@ public readonly validations: IValidation[]; ##### ~~`autoActivate`~~Optional -- *Deprecated:* . This property is deprecated and will be removed in a future release. Use {@link status} instead +- *Deprecated:* . This property is deprecated and will be removed in a future release. Use {@link status } instead ```typescript public readonly autoActivate: boolean; @@ -8923,7 +8927,7 @@ public readonly validations: IValidation[]; ##### ~~`autoActivate`~~Optional -- *Deprecated:* . This property is deprecated and will be removed in a future release. Use {@link status} instead +- *Deprecated:* . This property is deprecated and will be removed in a future release. Use {@link status } instead ```typescript public readonly autoActivate: boolean; @@ -9189,7 +9193,7 @@ const redshiftDestinationProps: RedshiftDestinationProps = { ... } | **Name** | **Type** | **Description** | | --- | --- | --- | | object | RedshiftDestinationObject | A Redshift table object (optionally with the schema). | -| profile | RedshiftConnectorProfile | An instance of the @type RedshiftConnectorProfile. | +| profile | RedshiftConnectorProfile | An instance of the. | | errorHandling | ErrorHandlingConfiguration | The settings that determine how Amazon AppFlow handles an error when placing data in the Salesforce destination. | --- @@ -9214,7 +9218,7 @@ public readonly profile: RedshiftConnectorProfile; - *Type:* RedshiftConnectorProfile -An instance of the @type RedshiftConnectorProfile. +An instance of the. --- @@ -11204,7 +11208,7 @@ public readonly integration: SnowflakeStorageIntegration; Details of the Snowflake Storage Integration. -When provided, this construct will automatically create an IAM Role allowing access to the S3 Bucket which will be available as a [integrationROle property]{@link SnowflakeConnectorProfile#integrationRole} +When provided, this construct will automatically create an IAM Role allowing access to the S3 Bucket which will be available as a [integrationROle property]{@link SnowflakeConnectorProfile#integrationRole } For details of the integration see {@link https://docs.snowflake.com/en/user-guide/data-load-s3-config-storage-integration} @@ -11594,7 +11598,7 @@ public readonly validations: IValidation[]; ##### ~~`autoActivate`~~Optional -- *Deprecated:* . This property is deprecated and will be removed in a future release. Use {@link status} instead +- *Deprecated:* . This property is deprecated and will be removed in a future release. Use {@link status } instead ```typescript public readonly autoActivate: boolean; diff --git a/package.json b/package.json index 733e0986..d8fb8b70 100644 --- a/package.json +++ b/package.json @@ -117,12 +117,12 @@ "@aws-cdk/integ-runner": "latest", "@aws-cdk/integ-tests-alpha": "latest", "@types/jest": "^27", - "@types/node": "^16", + "@types/node": "^18", "@typescript-eslint/eslint-plugin": "^6", "@typescript-eslint/parser": "^6", "aws-cdk": "^2", "aws-cdk-lib": "2.116.1", - "cdklabs-projen-project-types": "^0.1.182", + "cdklabs-projen-project-types": "^0.1.183", "constructs": "10.0.5", "esbuild": "^0.19.9", "eslint": "^8", @@ -130,7 +130,7 @@ "eslint-plugin-import": "^2.29.1", "jest": "^27", "jest-junit": "^15", - "jsii": "1.x", + "jsii": "~5.2", "jsii-diff": "^1.93.0", "jsii-docgen": "^8.0.56", "jsii-pacmak": "^1.93.0", @@ -153,17 +153,13 @@ "bundledDependencies": [ "@types/aws-lambda" ], - "resolutions": { - "@types/babel__traverse": "7.18.2", - "@types/prettier": "2.6.0" - }, "keywords": [ "appflow", "aws", "cdk" ], "engines": { - "node": ">= 16.0.0" + "node": ">= 18.12.0" }, "main": "lib/index.js", "license": "Apache-2.0", diff --git a/test/core/flows/on-demand-flow-metrics.test.ts b/test/core/flows/on-demand-flow-metrics.test.ts index cb2cc48a..2b74a43d 100644 --- a/test/core/flows/on-demand-flow-metrics.test.ts +++ b/test/core/flows/on-demand-flow-metrics.test.ts @@ -45,7 +45,6 @@ describe('OnDemandFlow metrics', () => { addAlarmForMetric(stack, flow.metricFlowExecutionRecordsProcessed(), 'FlowExecutionRecordsProcessedAlarm'); const template = Template.fromStack(stack); - console.log(JSON.stringify(template.toJSON())); template.resourceCountIs('AWS::CloudWatch::Alarm', 5); template.hasResourceProperties('AWS::CloudWatch::Alarm', { diff --git a/yarn.lock b/yarn.lock index a1c98470..4c9d626f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -763,14 +763,6 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@jsii/check-node@1.92.0": - version "1.92.0" - resolved "https://registry.yarnpkg.com/@jsii/check-node/-/check-node-1.92.0.tgz#e05908d2c0875a728db14d73bb30459a73bd008e" - integrity sha512-MQnFvDIn/VOz4FzchobZ4dfrl6qfuZIlYviNbGXhPMSeJ92BVB2F+NEyem9Sg/Csy2ehhtO1FGaUj4mO9/7Ntg== - dependencies: - chalk "^4.1.2" - semver "^7.5.4" - "@jsii/check-node@1.93.0": version "1.93.0" resolved "https://registry.yarnpkg.com/@jsii/check-node/-/check-node-1.93.0.tgz#3adcc6012654bb69fb8dc508e757b83ea9cd1708" @@ -779,7 +771,7 @@ chalk "^4.1.2" semver "^7.5.4" -"@jsii/spec@1.93.0", "@jsii/spec@^1.84.0", "@jsii/spec@^1.92.0", "@jsii/spec@^1.93.0": +"@jsii/spec@1.93.0", "@jsii/spec@^1.84.0", "@jsii/spec@^1.93.0": version "1.93.0" resolved "https://registry.yarnpkg.com/@jsii/spec/-/spec-1.93.0.tgz#e56c5971efbd349592de86081b3cbfd04fc0bb77" integrity sha512-PIXcTHUsFOoxSE7KMpJ3iJ3iYGSo2x46ZX4bHDDD6C7M3ij+7Z3Ujumg/OsIrESCHKWXGXlgl9EmkNJraeYkRQ== @@ -906,7 +898,7 @@ "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" -"@types/babel__traverse@*", "@types/babel__traverse@7.18.2", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": +"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": version "7.18.2" resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.2.tgz#235bf339d17185bdec25e024ca19cce257cc7309" integrity sha512-FcFaxOr2V5KZCviw1TnutEMVUVsGt4D2hP1TAfXZAMKuHYW3xQhe3jTxNPWutgCJ3/X1c5yX8ZoGVEItxKbwBg== @@ -982,17 +974,19 @@ dependencies: undici-types "~5.26.4" -"@types/node@^16": - version "16.18.68" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.68.tgz#3155f64a961b3d8d10246c80657f9a7292e3421a" - integrity sha512-sG3hPIQwJLoewrN7cr0dwEy+yF5nD4D/4FxtQpFciRD/xwUzgD+G05uxZHv5mhfXo4F9Jkp13jjn0CC2q325sg== +"@types/node@^18": + version "18.19.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.5.tgz#4b23a9ab8ab7dafebb57bcbaf5c3d8d04f9d8cac" + integrity sha512-22MG6T02Hos2JWfa1o5jsIByn+bc5iOt1IS4xyg6OG68Bu+wMonVZzdrgCw693++rpLE9RUT/Bx15BeDzO0j+g== + dependencies: + undici-types "~5.26.4" "@types/normalize-package-data@^2.4.0": version "2.4.4" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901" integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA== -"@types/prettier@2.6.0", "@types/prettier@^2.1.5": +"@types/prettier@^2.1.5": version "2.6.0" resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.6.0.tgz#efcbd41937f9ae7434c714ab698604822d890759" integrity sha512-G/AdOadiZhnJp0jXCaBQU449W2h716OW/EoXeYkCytxKL06X1WCXB4DZpp8TpZ8eyIJVS1cw4lrlkkSYU21cDw== @@ -1544,10 +1538,10 @@ case@1.6.3, case@^1.6.3: resolved "https://registry.yarnpkg.com/case/-/case-1.6.3.tgz#0a4386e3e9825351ca2e6216c60467ff5f1ea1c9" integrity sha512-mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ== -cdklabs-projen-project-types@^0.1.182: - version "0.1.182" - resolved "https://registry.yarnpkg.com/cdklabs-projen-project-types/-/cdklabs-projen-project-types-0.1.182.tgz#7a2e019a7ab7ee44d98bdf2659acaffacc75afe6" - integrity sha512-P6bGGg/noqlx2TxqN+GzqYpZAUNbw0KSyRZsdh/U/i2neIOuVfUIZby9/tJMsF+ALtkI9eksPE37z2SfaRZlpg== +cdklabs-projen-project-types@^0.1.183: + version "0.1.183" + resolved "https://registry.yarnpkg.com/cdklabs-projen-project-types/-/cdklabs-projen-project-types-0.1.183.tgz#54515fd4324a1284cdd49ce14733b251c4eb51cd" + integrity sha512-QHFxfrOcDXJJLi3LBDEsFIsQLZ7+2efHZyDMonvf0alq9FWylHSg5xFuTtg/CagSuo2kyOWKlwGXTV5sDeKtZw== dependencies: yaml "^2.3.4" @@ -3810,26 +3804,7 @@ jsii@1.93.0: typescript "~3.9.10" yargs "^16.2.0" -jsii@1.x: - version "1.92.0" - resolved "https://registry.yarnpkg.com/jsii/-/jsii-1.92.0.tgz#dc89cf48b2cf681fe9c6a77ee2d94911178348ae" - integrity sha512-UHuPVMkUXBcbnSAsylQSea7BFNkr6hkx6NhGGoZ5Xnb3fZV7wwr9DHnE14yQJUIsrCL8WcqhCU79QTbWmnKpag== - dependencies: - "@jsii/check-node" "1.92.0" - "@jsii/spec" "^1.92.0" - case "^1.6.3" - chalk "^4" - fast-deep-equal "^3.1.3" - fs-extra "^10.1.0" - log4js "^6.9.1" - semver "^7.5.4" - semver-intersect "^1.4.0" - sort-json "^2.0.1" - spdx-license-list "^6.8.0" - typescript "~3.9.10" - yargs "^16.2.0" - -jsii@~5.2.5: +jsii@~5.2, jsii@~5.2.5: version "5.2.44" resolved "https://registry.yarnpkg.com/jsii/-/jsii-5.2.44.tgz#7a768412f1a28f5f1ff3e92ab5f5b7e7430c3ae1" integrity sha512-Z7sTqYzQ5yoJU/ie+svjqSzrOF5rl4pW/bojvCb/7MfJ+SaGqhMUQMxQGTfqmSvauME8JoVYqwMH89x6qreJ8A==