From 86c6f9dd66f5ce033af97904d3c15e3674fd8a4d Mon Sep 17 00:00:00 2001 From: Mingjie Shao Date: Sat, 26 Nov 2022 11:57:36 +0000 Subject: [PATCH] chore(logs): line break for CloudWatch Logs Insights Query Definition (#23094) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(logs): Adding line break for CloudWatch Logs Insights Query Definition (#22422) Verified in AWS Console with integration test, we can see query in multiple lines instead of a single line. image ---- ### All Submissions: * [✅] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [❌] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [✅] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/main/INTEGRATION_TESTS.md)? * [✅] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- .../@aws-cdk/aws-logs/lib/query-definition.ts | 2 +- ...efaultTestDeployAssert902BAAD5.assets.json | 19 +++ ...aultTestDeployAssert902BAAD5.template.json | 36 ++++++ ...nsights-querydefinition-integ.assets.json} | 8 +- ...ights-querydefinition-integ.template.json} | 2 +- .../cdk.out | 2 +- .../integ.json | 14 +-- .../manifest.json | 85 +++++++++++--- .../tree.json | 108 +++++++++++++++--- ...teg.save-logs-insights-query-definition.ts | 7 +- .../aws-logs/test/query-definition.test.ts | 6 +- 11 files changed, 232 insertions(+), 57 deletions(-) create mode 100644 packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/LogsInsightsQueryDefinitionIntegTestDefaultTestDeployAssert902BAAD5.assets.json create mode 100644 packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/LogsInsightsQueryDefinitionIntegTestDefaultTestDeployAssert902BAAD5.template.json rename packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/{aws-cdk-logs-querydefinition-integ.assets.json => aws-cdk-logs-insights-querydefinition-integ.assets.json} (60%) rename packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/{aws-cdk-logs-querydefinition-integ.template.json => aws-cdk-logs-insights-querydefinition-integ.template.json} (85%) diff --git a/packages/@aws-cdk/aws-logs/lib/query-definition.ts b/packages/@aws-cdk/aws-logs/lib/query-definition.ts index aea611e79c63d..2dff1ad3d93e1 100644 --- a/packages/@aws-cdk/aws-logs/lib/query-definition.ts +++ b/packages/@aws-cdk/aws-logs/lib/query-definition.ts @@ -102,7 +102,7 @@ export class QueryString { sort: this.sort, limit: this.limit, display: this.display, - }).join(' | '); + }).join('\n| '); } } diff --git a/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/LogsInsightsQueryDefinitionIntegTestDefaultTestDeployAssert902BAAD5.assets.json b/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/LogsInsightsQueryDefinitionIntegTestDefaultTestDeployAssert902BAAD5.assets.json new file mode 100644 index 0000000000000..faca19c9ec2b8 --- /dev/null +++ b/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/LogsInsightsQueryDefinitionIntegTestDefaultTestDeployAssert902BAAD5.assets.json @@ -0,0 +1,19 @@ +{ + "version": "21.0.0", + "files": { + "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { + "source": { + "path": "LogsInsightsQueryDefinitionIntegTestDefaultTestDeployAssert902BAAD5.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + } + }, + "dockerImages": {} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/LogsInsightsQueryDefinitionIntegTestDefaultTestDeployAssert902BAAD5.template.json b/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/LogsInsightsQueryDefinitionIntegTestDefaultTestDeployAssert902BAAD5.template.json new file mode 100644 index 0000000000000..ad9d0fb73d1dd --- /dev/null +++ b/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/LogsInsightsQueryDefinitionIntegTestDefaultTestDeployAssert902BAAD5.template.json @@ -0,0 +1,36 @@ +{ + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "Default": "/cdk-bootstrap/hnb659fds/version", + "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" + } + }, + "Rules": { + "CheckBootstrapVersion": { + "Assertions": [ + { + "Assert": { + "Fn::Not": [ + { + "Fn::Contains": [ + [ + "1", + "2", + "3", + "4", + "5" + ], + { + "Ref": "BootstrapVersion" + } + ] + } + ] + }, + "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." + } + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/aws-cdk-logs-querydefinition-integ.assets.json b/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/aws-cdk-logs-insights-querydefinition-integ.assets.json similarity index 60% rename from packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/aws-cdk-logs-querydefinition-integ.assets.json rename to packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/aws-cdk-logs-insights-querydefinition-integ.assets.json index dcd5495fd6ac5..7388475903110 100644 --- a/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/aws-cdk-logs-querydefinition-integ.assets.json +++ b/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/aws-cdk-logs-insights-querydefinition-integ.assets.json @@ -1,15 +1,15 @@ { - "version": "20.0.0", + "version": "21.0.0", "files": { - "d7519d4b81ac956c2d9f2743e08d54bd88921e1a0ad4223a8268703d3d4fbede": { + "e6a0a51961925fbc37d9b81431449c256ed453f98089eb70f83850f237b4d722": { "source": { - "path": "aws-cdk-logs-querydefinition-integ.template.json", + "path": "aws-cdk-logs-insights-querydefinition-integ.template.json", "packaging": "file" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "d7519d4b81ac956c2d9f2743e08d54bd88921e1a0ad4223a8268703d3d4fbede.json", + "objectKey": "e6a0a51961925fbc37d9b81431449c256ed453f98089eb70f83850f237b4d722.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/aws-cdk-logs-querydefinition-integ.template.json b/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/aws-cdk-logs-insights-querydefinition-integ.template.json similarity index 85% rename from packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/aws-cdk-logs-querydefinition-integ.template.json rename to packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/aws-cdk-logs-insights-querydefinition-integ.template.json index f9086532c44b2..d4df6bf7837ca 100644 --- a/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/aws-cdk-logs-querydefinition-integ.template.json +++ b/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/aws-cdk-logs-insights-querydefinition-integ.template.json @@ -12,7 +12,7 @@ "Type": "AWS::Logs::QueryDefinition", "Properties": { "Name": "QueryDefinition", - "QueryString": "fields @timestamp, @message | parse @message \"[*] *\" as loggingType, loggingMessage | filter loggingType = \"ERROR\" | sort @timestamp desc | limit 20 | display loggingMessage", + "QueryString": "fields @timestamp, @message\n| parse @message \"[*] *\" as loggingType, loggingMessage\n| filter loggingType = \"ERROR\"\n| sort @timestamp desc\n| limit 20\n| display loggingMessage", "LogGroupNames": [ { "Ref": "LogGroupF5B46931" diff --git a/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/cdk.out b/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/cdk.out index 588d7b269d34f..8ecc185e9dbee 100644 --- a/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/cdk.out +++ b/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"20.0.0"} \ No newline at end of file +{"version":"21.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/integ.json b/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/integ.json index aa4f200793189..5c5e893333693 100644 --- a/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/integ.json +++ b/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/integ.json @@ -1,14 +1,12 @@ { - "version": "20.0.0", + "version": "21.0.0", "testCases": { - "integ.save-logs-insights-query-definition": { + "LogsInsightsQueryDefinitionIntegTest/DefaultTest": { "stacks": [ - "aws-cdk-logs-querydefinition-integ" + "aws-cdk-logs-insights-querydefinition-integ" ], - "diffAssets": false, - "stackUpdateWorkflow": true + "assertionStack": "LogsInsightsQueryDefinitionIntegTest/DefaultTest/DeployAssert", + "assertionStackName": "LogsInsightsQueryDefinitionIntegTestDefaultTestDeployAssert902BAAD5" } - }, - "synthContext": {}, - "enableLookups": false + } } \ No newline at end of file diff --git a/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/manifest.json b/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/manifest.json index 1d6034c2a9a74..d6fb5b02dcca8 100644 --- a/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/manifest.json +++ b/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/manifest.json @@ -1,33 +1,27 @@ { - "version": "20.0.0", + "version": "21.0.0", "artifacts": { - "Tree": { - "type": "cdk:tree", - "properties": { - "file": "tree.json" - } - }, - "aws-cdk-logs-querydefinition-integ.assets": { + "aws-cdk-logs-insights-querydefinition-integ.assets": { "type": "cdk:asset-manifest", "properties": { - "file": "aws-cdk-logs-querydefinition-integ.assets.json", + "file": "aws-cdk-logs-insights-querydefinition-integ.assets.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" } }, - "aws-cdk-logs-querydefinition-integ": { + "aws-cdk-logs-insights-querydefinition-integ": { "type": "aws:cloudformation:stack", "environment": "aws://unknown-account/unknown-region", "properties": { - "templateFile": "aws-cdk-logs-querydefinition-integ.template.json", + "templateFile": "aws-cdk-logs-insights-querydefinition-integ.template.json", "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/d7519d4b81ac956c2d9f2743e08d54bd88921e1a0ad4223a8268703d3d4fbede.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e6a0a51961925fbc37d9b81431449c256ed453f98089eb70f83850f237b4d722.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ - "aws-cdk-logs-querydefinition-integ.assets" + "aws-cdk-logs-insights-querydefinition-integ.assets" ], "lookupRole": { "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", @@ -36,35 +30,88 @@ } }, "dependencies": [ - "aws-cdk-logs-querydefinition-integ.assets" + "aws-cdk-logs-insights-querydefinition-integ.assets" ], "metadata": { - "/aws-cdk-logs-querydefinition-integ/LogGroup/Resource": [ + "/aws-cdk-logs-insights-querydefinition-integ/LogGroup/Resource": [ { "type": "aws:cdk:logicalId", "data": "LogGroupF5B46931" } ], - "/aws-cdk-logs-querydefinition-integ/QueryDefinition/Resource": [ + "/aws-cdk-logs-insights-querydefinition-integ/QueryDefinition/Resource": [ { "type": "aws:cdk:logicalId", "data": "QueryDefinition4190BC36" } ], - "/aws-cdk-logs-querydefinition-integ/BootstrapVersion": [ + "/aws-cdk-logs-insights-querydefinition-integ/BootstrapVersion": [ { "type": "aws:cdk:logicalId", "data": "BootstrapVersion" } ], - "/aws-cdk-logs-querydefinition-integ/CheckBootstrapVersion": [ + "/aws-cdk-logs-insights-querydefinition-integ/CheckBootstrapVersion": [ { "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion" } ] }, - "displayName": "aws-cdk-logs-querydefinition-integ" + "displayName": "aws-cdk-logs-insights-querydefinition-integ" + }, + "LogsInsightsQueryDefinitionIntegTestDefaultTestDeployAssert902BAAD5.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "LogsInsightsQueryDefinitionIntegTestDefaultTestDeployAssert902BAAD5.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "LogsInsightsQueryDefinitionIntegTestDefaultTestDeployAssert902BAAD5": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "LogsInsightsQueryDefinitionIntegTestDefaultTestDeployAssert902BAAD5.template.json", + "validateOnSynth": false, + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", + "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "LogsInsightsQueryDefinitionIntegTestDefaultTestDeployAssert902BAAD5.assets" + ], + "lookupRole": { + "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", + "requiresBootstrapStackVersion": 8, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "dependencies": [ + "LogsInsightsQueryDefinitionIntegTestDefaultTestDeployAssert902BAAD5.assets" + ], + "metadata": { + "/LogsInsightsQueryDefinitionIntegTest/DefaultTest/DeployAssert/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/LogsInsightsQueryDefinitionIntegTest/DefaultTest/DeployAssert/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "LogsInsightsQueryDefinitionIntegTest/DefaultTest/DeployAssert" + }, + "Tree": { + "type": "cdk:tree", + "properties": { + "file": "tree.json" + } } } } \ No newline at end of file diff --git a/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/tree.json b/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/tree.json index 76e32b9c4a8a8..9e04ca4a9a7fa 100644 --- a/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/tree.json +++ b/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/tree.json @@ -4,25 +4,17 @@ "id": "App", "path": "", "children": { - "Tree": { - "id": "Tree", - "path": "Tree", - "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.1.85" - } - }, - "aws-cdk-logs-querydefinition-integ": { - "id": "aws-cdk-logs-querydefinition-integ", - "path": "aws-cdk-logs-querydefinition-integ", + "aws-cdk-logs-insights-querydefinition-integ": { + "id": "aws-cdk-logs-insights-querydefinition-integ", + "path": "aws-cdk-logs-insights-querydefinition-integ", "children": { "LogGroup": { "id": "LogGroup", - "path": "aws-cdk-logs-querydefinition-integ/LogGroup", + "path": "aws-cdk-logs-insights-querydefinition-integ/LogGroup", "children": { "Resource": { "id": "Resource", - "path": "aws-cdk-logs-querydefinition-integ/LogGroup/Resource", + "path": "aws-cdk-logs-insights-querydefinition-integ/LogGroup/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::Logs::LogGroup", "aws:cdk:cloudformation:props": { @@ -42,16 +34,16 @@ }, "QueryDefinition": { "id": "QueryDefinition", - "path": "aws-cdk-logs-querydefinition-integ/QueryDefinition", + "path": "aws-cdk-logs-insights-querydefinition-integ/QueryDefinition", "children": { "Resource": { "id": "Resource", - "path": "aws-cdk-logs-querydefinition-integ/QueryDefinition/Resource", + "path": "aws-cdk-logs-insights-querydefinition-integ/QueryDefinition/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::Logs::QueryDefinition", "aws:cdk:cloudformation:props": { "name": "QueryDefinition", - "queryString": "fields @timestamp, @message | parse @message \"[*] *\" as loggingType, loggingMessage | filter loggingType = \"ERROR\" | sort @timestamp desc | limit 20 | display loggingMessage", + "queryString": "fields @timestamp, @message\n| parse @message \"[*] *\" as loggingType, loggingMessage\n| filter loggingType = \"ERROR\"\n| sort @timestamp desc\n| limit 20\n| display loggingMessage", "logGroupNames": [ { "Ref": "LogGroupF5B46931" @@ -69,17 +61,95 @@ "fqn": "@aws-cdk/aws-logs.QueryDefinition", "version": "0.0.0" } + }, + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "aws-cdk-logs-insights-querydefinition-integ/BootstrapVersion", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "aws-cdk-logs-insights-querydefinition-integ/CheckBootstrapVersion", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.Stack", + "version": "0.0.0" + } + }, + "LogsInsightsQueryDefinitionIntegTest": { + "id": "LogsInsightsQueryDefinitionIntegTest", + "path": "LogsInsightsQueryDefinitionIntegTest", + "children": { + "DefaultTest": { + "id": "DefaultTest", + "path": "LogsInsightsQueryDefinitionIntegTest/DefaultTest", + "children": { + "Default": { + "id": "Default", + "path": "LogsInsightsQueryDefinitionIntegTest/DefaultTest/Default", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.1.161" + } + }, + "DeployAssert": { + "id": "DeployAssert", + "path": "LogsInsightsQueryDefinitionIntegTest/DefaultTest/DeployAssert", + "children": { + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "LogsInsightsQueryDefinitionIntegTest/DefaultTest/DeployAssert/BootstrapVersion", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "LogsInsightsQueryDefinitionIntegTest/DefaultTest/DeployAssert/CheckBootstrapVersion", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.Stack", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests.IntegTestCase", + "version": "0.0.0" + } } }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests.IntegTest", + "version": "0.0.0" + } + }, + "Tree": { + "id": "Tree", + "path": "Tree", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.85" + "version": "10.1.161" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.1.85" + "fqn": "@aws-cdk/core.App", + "version": "0.0.0" } } } \ No newline at end of file diff --git a/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.ts b/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.ts index df930f8ece79b..b3f19a5940d11 100644 --- a/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.ts +++ b/packages/@aws-cdk/aws-logs/test/integ.save-logs-insights-query-definition.ts @@ -1,4 +1,6 @@ import { App, RemovalPolicy, Stack, StackProps } from '@aws-cdk/core'; +import { IntegTest } from '@aws-cdk/integ-tests'; + import { LogGroup, QueryDefinition, QueryString } from '../lib'; class LogsInsightsQueryDefinitionIntegStack extends Stack { @@ -25,5 +27,8 @@ class LogsInsightsQueryDefinitionIntegStack extends Stack { } const app = new App(); -new LogsInsightsQueryDefinitionIntegStack(app, 'aws-cdk-logs-querydefinition-integ'); +const stack = new LogsInsightsQueryDefinitionIntegStack(app, 'aws-cdk-logs-insights-querydefinition-integ'); +new IntegTest(app, 'LogsInsightsQueryDefinitionIntegTest', { + testCases: [stack], +}); app.synth(); diff --git a/packages/@aws-cdk/aws-logs/test/query-definition.test.ts b/packages/@aws-cdk/aws-logs/test/query-definition.test.ts index 7a1fd123387f2..7b9fd5cb7d4ff 100644 --- a/packages/@aws-cdk/aws-logs/test/query-definition.test.ts +++ b/packages/@aws-cdk/aws-logs/test/query-definition.test.ts @@ -20,7 +20,7 @@ describe('query definition', () => { // THEN Template.fromStack(stack).hasResourceProperties('AWS::Logs::QueryDefinition', { Name: 'MyQuery', - QueryString: 'fields @timestamp, @message | sort @timestamp desc | limit 20', + QueryString: 'fields @timestamp, @message\n| sort @timestamp desc\n| limit 20', }); }); @@ -44,7 +44,7 @@ describe('query definition', () => { // THEN Template.fromStack(stack).hasResourceProperties('AWS::Logs::QueryDefinition', { Name: 'MyQuery', - QueryString: 'fields @timestamp, @message | sort @timestamp desc | limit 20', + QueryString: 'fields @timestamp, @message\n| sort @timestamp desc\n| limit 20', LogGroupNames: [{ Ref: 'MyLogGroup5C0DAD85' }], }); }); @@ -72,7 +72,7 @@ describe('query definition', () => { // THEN Template.fromStack(stack).hasResourceProperties('AWS::Logs::QueryDefinition', { Name: 'MyQuery', - QueryString: 'fields @timestamp, @message | parse @message "[*] *" as loggingType, loggingMessage | filter loggingType = "ERROR" | sort @timestamp desc | limit 20 | display loggingMessage', + QueryString: 'fields @timestamp, @message\n| parse @message "[*] *" as loggingType, loggingMessage\n| filter loggingType = "ERROR"\n| sort @timestamp desc\n| limit 20\n| display loggingMessage', }); }); });