From 99fb2aa8e433e51136dfa110a7df9b3edce5232a Mon Sep 17 00:00:00 2001 From: Joe Wakefield Date: Wed, 21 Feb 2024 15:16:09 -0500 Subject: [PATCH 1/6] Disable OpenSearch logging if explicitly specified --- .../aws-opensearchservice/lib/domain.ts | 63 +++++++------- .../aws-opensearchservice/test/domain.test.ts | 84 +++++++++++++++++++ 2 files changed, 117 insertions(+), 30 deletions(-) diff --git a/packages/aws-cdk-lib/aws-opensearchservice/lib/domain.ts b/packages/aws-cdk-lib/aws-opensearchservice/lib/domain.ts index d9ae89e914459..cee81a3ae808e 100644 --- a/packages/aws-cdk-lib/aws-opensearchservice/lib/domain.ts +++ b/packages/aws-cdk-lib/aws-opensearchservice/lib/domain.ts @@ -1711,6 +1711,7 @@ export class Domain extends DomainBase implements IDomain, ec2.IConnectable { // Setup logging const logGroups: logs.ILogGroup[] = []; + const logPublishing: Record = {}; if (props.logging?.slowSearchLogEnabled) { this.slowSearchLogGroup = props.logging.slowSearchLogGroup ?? @@ -1719,6 +1720,14 @@ export class Domain extends DomainBase implements IDomain, ec2.IConnectable { }); logGroups.push(this.slowSearchLogGroup); + logPublishing.SEARCH_SLOW_LOGS = { + enabled: true, + cloudWatchLogsLogGroupArn: this.slowSearchLogGroup.logGroupArn, + }; + } else if (props.logging?.slowSearchLogEnabled === false) { + logPublishing.SEARCH_SLOW_LOGS = { + enabled: false, + }; }; if (props.logging?.slowIndexLogEnabled) { @@ -1728,6 +1737,14 @@ export class Domain extends DomainBase implements IDomain, ec2.IConnectable { }); logGroups.push(this.slowIndexLogGroup); + logPublishing.INDEX_SLOW_LOGS = { + enabled: true, + cloudWatchLogsLogGroupArn: this.slowIndexLogGroup.logGroupArn, + }; + } else if (props.logging?.slowIndexLogEnabled === false) { + logPublishing.INDEX_SLOW_LOGS = { + enabled: false, + }; }; if (props.logging?.appLogEnabled) { @@ -1737,6 +1754,14 @@ export class Domain extends DomainBase implements IDomain, ec2.IConnectable { }); logGroups.push(this.appLogGroup); + logPublishing.ES_APPLICATION_LOGS = { + enabled: true, + cloudWatchLogsLogGroupArn: this.appLogGroup.logGroupArn, + }; + } else if (props.logging?.appLogEnabled === false) { + logPublishing.ES_APPLICATION_LOGS = { + enabled: false, + }; }; if (props.logging?.auditLogEnabled) { @@ -1746,6 +1771,14 @@ export class Domain extends DomainBase implements IDomain, ec2.IConnectable { }); logGroups.push(this.auditLogGroup); + logPublishing.AUDIT_LOGS = { + enabled: this.auditLogGroup != null, + cloudWatchLogsLogGroupArn: this.auditLogGroup?.logGroupArn, + }; + } else if (props.logging?.auditLogEnabled === false) { + logPublishing.AUDIT_LOGS = { + enabled: false, + }; }; let logGroupResourcePolicy: LogGroupResourcePolicy | null = null; @@ -1766,36 +1799,6 @@ export class Domain extends DomainBase implements IDomain, ec2.IConnectable { }); } - const logPublishing: Record = {}; - - if (this.appLogGroup) { - logPublishing.ES_APPLICATION_LOGS = { - enabled: true, - cloudWatchLogsLogGroupArn: this.appLogGroup.logGroupArn, - }; - } - - if (this.slowSearchLogGroup) { - logPublishing.SEARCH_SLOW_LOGS = { - enabled: true, - cloudWatchLogsLogGroupArn: this.slowSearchLogGroup.logGroupArn, - }; - } - - if (this.slowIndexLogGroup) { - logPublishing.INDEX_SLOW_LOGS = { - enabled: true, - cloudWatchLogsLogGroupArn: this.slowIndexLogGroup.logGroupArn, - }; - } - - if (this.auditLogGroup) { - logPublishing.AUDIT_LOGS = { - enabled: this.auditLogGroup != null, - cloudWatchLogsLogGroupArn: this.auditLogGroup?.logGroupArn, - }; - } - let customEndpointCertificate: acm.ICertificate | undefined; if (props.customEndpoint) { if (props.customEndpoint.certificate) { diff --git a/packages/aws-cdk-lib/aws-opensearchservice/test/domain.test.ts b/packages/aws-cdk-lib/aws-opensearchservice/test/domain.test.ts index 7c941c784a572..45a26c5adedf8 100644 --- a/packages/aws-cdk-lib/aws-opensearchservice/test/domain.test.ts +++ b/packages/aws-cdk-lib/aws-opensearchservice/test/domain.test.ts @@ -846,6 +846,90 @@ each([testedOpenSearchVersions]).describe('log groups', (engineVersion) => { }, }); }); + + test('can disable application logs', () => { + new Domain(stack, 'Domain1', { + version: engineVersion, + logging: { + appLogEnabled: false, + }, + }); + + Template.fromStack(stack).resourceCountIs('Custom::CloudwatchLogResourcePolicy', 0); + Template.fromStack(stack).hasResourceProperties('AWS::OpenSearchService::Domain', { + LogPublishingOptions: { + ES_APPLICATION_LOGS: { + Enabled: false, + }, + AUDIT_LOGS: Match.absent(), + SEARCH_SLOW_LOGS: Match.absent(), + INDEX_SLOW_LOGS: Match.absent(), + }, + }); + }); + + test('can disable audit logs', () => { + new Domain(stack, 'Domain1', { + version: engineVersion, + logging: { + auditLogEnabled: false, + }, + }); + + Template.fromStack(stack).resourceCountIs('Custom::CloudwatchLogResourcePolicy', 0); + Template.fromStack(stack).hasResourceProperties('AWS::OpenSearchService::Domain', { + LogPublishingOptions: { + ES_APPLICATION_LOGS: Match.absent(), + AUDIT_LOGS: { + Enabled: false, + }, + SEARCH_SLOW_LOGS: Match.absent(), + INDEX_SLOW_LOGS: Match.absent(), + }, + }); + }); + + test('can disable slow search logs', () => { + new Domain(stack, 'Domain1', { + version: engineVersion, + logging: { + slowSearchLogEnabled: false, + }, + }); + + Template.fromStack(stack).resourceCountIs('Custom::CloudwatchLogResourcePolicy', 0); + Template.fromStack(stack).hasResourceProperties('AWS::OpenSearchService::Domain', { + LogPublishingOptions: { + ES_APPLICATION_LOGS: Match.absent(), + AUDIT_LOGS: Match.absent(), + SEARCH_SLOW_LOGS: { + Enabled: false, + }, + INDEX_SLOW_LOGS: Match.absent(), + }, + }); + }); + + test('can disable slow index logs', () => { + new Domain(stack, 'Domain1', { + version: engineVersion, + logging: { + slowIndexLogEnabled: false, + }, + }); + + Template.fromStack(stack).resourceCountIs('Custom::CloudwatchLogResourcePolicy', 0); + Template.fromStack(stack).hasResourceProperties('AWS::OpenSearchService::Domain', { + LogPublishingOptions: { + ES_APPLICATION_LOGS: Match.absent(), + AUDIT_LOGS: Match.absent(), + SEARCH_SLOW_LOGS: Match.absent(), + INDEX_SLOW_LOGS: { + Enabled: false, + }, + }, + }); + }); }); each(testedOpenSearchVersions).describe('grants', (engineVersion) => { From 6b8c53f536ac4b8a7b052a675216eed80f387da4 Mon Sep 17 00:00:00 2001 From: Joe Wakefield Date: Thu, 22 Feb 2024 10:19:08 -0500 Subject: [PATCH 2/6] Remove redundant logic --- packages/aws-cdk-lib/aws-opensearchservice/lib/domain.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aws-cdk-lib/aws-opensearchservice/lib/domain.ts b/packages/aws-cdk-lib/aws-opensearchservice/lib/domain.ts index cee81a3ae808e..8f3607fb28c2a 100644 --- a/packages/aws-cdk-lib/aws-opensearchservice/lib/domain.ts +++ b/packages/aws-cdk-lib/aws-opensearchservice/lib/domain.ts @@ -1772,7 +1772,7 @@ export class Domain extends DomainBase implements IDomain, ec2.IConnectable { logGroups.push(this.auditLogGroup); logPublishing.AUDIT_LOGS = { - enabled: this.auditLogGroup != null, + enabled: true, cloudWatchLogsLogGroupArn: this.auditLogGroup?.logGroupArn, }; } else if (props.logging?.auditLogEnabled === false) { From fdccd5befefbf282396d30ca8ecfda2baf263d48 Mon Sep 17 00:00:00 2001 From: Joe Wakefield Date: Thu, 22 Feb 2024 10:19:18 -0500 Subject: [PATCH 3/6] Add integration test to disable logging --- ...efaultTestDeployAssert4E6713E1.assets.json | 19 +++ ...aultTestDeployAssert4E6713E1.template.json | 36 ++++ ...ensearch-with-logging-disabled.assets.json | 19 +++ ...search-with-logging-disabled.template.json | 82 +++++++++ .../cdk.out | 1 + .../integ.json | 12 ++ .../manifest.json | 113 ++++++++++++ .../tree.json | 161 ++++++++++++++++++ .../test/integ.opensearch.disable-logging.ts | 29 ++++ tests.txt | 1 + 10 files changed, 473 insertions(+) create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.assets.json create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.template.json create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/cdk-integ-opensearch-with-logging-disabled.assets.json create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/cdk-integ-opensearch-with-logging-disabled.template.json create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/cdk.out create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/integ.json create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/manifest.json create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/tree.json create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.ts diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.assets.json new file mode 100644 index 0000000000000..2af610f0d4a39 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.assets.json @@ -0,0 +1,19 @@ +{ + "version": "36.0.0", + "files": { + "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { + "source": { + "path": "IntegDefaultTestDeployAssert4E6713E1.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-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.template.json new file mode 100644 index 0000000000000..ad9d0fb73d1dd --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.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-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/cdk-integ-opensearch-with-logging-disabled.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/cdk-integ-opensearch-with-logging-disabled.assets.json new file mode 100644 index 0000000000000..b46fb3b2b28a2 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/cdk-integ-opensearch-with-logging-disabled.assets.json @@ -0,0 +1,19 @@ +{ + "version": "36.0.0", + "files": { + "415ec226ad6b4b9ef60a562147e766bbbb20cee0dbafabba072b480f5be4521e": { + "source": { + "path": "cdk-integ-opensearch-with-logging-disabled.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "415ec226ad6b4b9ef60a562147e766bbbb20cee0dbafabba072b480f5be4521e.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-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/cdk-integ-opensearch-with-logging-disabled.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/cdk-integ-opensearch-with-logging-disabled.template.json new file mode 100644 index 0000000000000..e40bf735f746d --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/cdk-integ-opensearch-with-logging-disabled.template.json @@ -0,0 +1,82 @@ +{ + "Resources": { + "Domain66AC69E0": { + "Type": "AWS::OpenSearchService::Domain", + "Properties": { + "ClusterConfig": { + "DedicatedMasterEnabled": false, + "InstanceCount": 1, + "InstanceType": "r5.large.search", + "MultiAZWithStandbyEnabled": false, + "ZoneAwarenessEnabled": false + }, + "DomainEndpointOptions": { + "EnforceHTTPS": false, + "TLSSecurityPolicy": "Policy-Min-TLS-1-0-2019-07" + }, + "EBSOptions": { + "EBSEnabled": true, + "VolumeSize": 10, + "VolumeType": "gp2" + }, + "EncryptionAtRestOptions": { + "Enabled": false + }, + "EngineVersion": "OpenSearch_2.11", + "LogPublishingOptions": { + "SEARCH_SLOW_LOGS": { + "Enabled": false + }, + "INDEX_SLOW_LOGS": { + "Enabled": false + }, + "ES_APPLICATION_LOGS": { + "Enabled": false + }, + "AUDIT_LOGS": { + "Enabled": false + } + }, + "NodeToNodeEncryptionOptions": { + "Enabled": false + } + }, + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + } + }, + "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-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/cdk.out new file mode 100644 index 0000000000000..1f0068d32659a --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/cdk.out @@ -0,0 +1 @@ +{"version":"36.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/integ.json new file mode 100644 index 0000000000000..6da636c654237 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/integ.json @@ -0,0 +1,12 @@ +{ + "version": "36.0.0", + "testCases": { + "Integ/DefaultTest": { + "stacks": [ + "cdk-integ-opensearch-with-logging-disabled" + ], + "assertionStack": "Integ/DefaultTest/DeployAssert", + "assertionStackName": "IntegDefaultTestDeployAssert4E6713E1" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/manifest.json new file mode 100644 index 0000000000000..22189f0b3cf1b --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/manifest.json @@ -0,0 +1,113 @@ +{ + "version": "36.0.0", + "artifacts": { + "cdk-integ-opensearch-with-logging-disabled.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "cdk-integ-opensearch-with-logging-disabled.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "cdk-integ-opensearch-with-logging-disabled": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "cdk-integ-opensearch-with-logging-disabled.template.json", + "terminationProtection": false, + "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}/415ec226ad6b4b9ef60a562147e766bbbb20cee0dbafabba072b480f5be4521e.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "cdk-integ-opensearch-with-logging-disabled.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": [ + "cdk-integ-opensearch-with-logging-disabled.assets" + ], + "metadata": { + "/cdk-integ-opensearch-with-logging-disabled/Domain/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "Domain66AC69E0" + } + ], + "/cdk-integ-opensearch-with-logging-disabled/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/cdk-integ-opensearch-with-logging-disabled/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "cdk-integ-opensearch-with-logging-disabled" + }, + "IntegDefaultTestDeployAssert4E6713E1.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "IntegDefaultTestDeployAssert4E6713E1.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "IntegDefaultTestDeployAssert4E6713E1": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "IntegDefaultTestDeployAssert4E6713E1.template.json", + "terminationProtection": false, + "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": [ + "IntegDefaultTestDeployAssert4E6713E1.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": [ + "IntegDefaultTestDeployAssert4E6713E1.assets" + ], + "metadata": { + "/Integ/DefaultTest/DeployAssert/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/Integ/DefaultTest/DeployAssert/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "Integ/DefaultTest/DeployAssert" + }, + "Tree": { + "type": "cdk:tree", + "properties": { + "file": "tree.json" + } + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/tree.json new file mode 100644 index 0000000000000..4164a22f7ead6 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.js.snapshot/tree.json @@ -0,0 +1,161 @@ +{ + "version": "tree-0.1", + "tree": { + "id": "App", + "path": "", + "children": { + "cdk-integ-opensearch-with-logging-disabled": { + "id": "cdk-integ-opensearch-with-logging-disabled", + "path": "cdk-integ-opensearch-with-logging-disabled", + "children": { + "Domain": { + "id": "Domain", + "path": "cdk-integ-opensearch-with-logging-disabled/Domain", + "children": { + "Resource": { + "id": "Resource", + "path": "cdk-integ-opensearch-with-logging-disabled/Domain/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::OpenSearchService::Domain", + "aws:cdk:cloudformation:props": { + "clusterConfig": { + "dedicatedMasterEnabled": false, + "instanceCount": 1, + "instanceType": "r5.large.search", + "multiAzWithStandbyEnabled": false, + "zoneAwarenessEnabled": false + }, + "domainEndpointOptions": { + "enforceHttps": false, + "tlsSecurityPolicy": "Policy-Min-TLS-1-0-2019-07" + }, + "ebsOptions": { + "ebsEnabled": true, + "volumeSize": 10, + "volumeType": "gp2" + }, + "encryptionAtRestOptions": { + "enabled": false + }, + "engineVersion": "OpenSearch_2.11", + "logPublishingOptions": { + "SEARCH_SLOW_LOGS": { + "enabled": false + }, + "INDEX_SLOW_LOGS": { + "enabled": false + }, + "ES_APPLICATION_LOGS": { + "enabled": false + }, + "AUDIT_LOGS": { + "enabled": false + } + }, + "nodeToNodeEncryptionOptions": { + "enabled": false + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_opensearchservice.CfnDomain", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_opensearchservice.Domain", + "version": "0.0.0" + } + }, + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "cdk-integ-opensearch-with-logging-disabled/BootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "cdk-integ-opensearch-with-logging-disabled/CheckBootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.Stack", + "version": "0.0.0" + } + }, + "Integ": { + "id": "Integ", + "path": "Integ", + "children": { + "DefaultTest": { + "id": "DefaultTest", + "path": "Integ/DefaultTest", + "children": { + "Default": { + "id": "Default", + "path": "Integ/DefaultTest/Default", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.3.0" + } + }, + "DeployAssert": { + "id": "DeployAssert", + "path": "Integ/DefaultTest/DeployAssert", + "children": { + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "Integ/DefaultTest/DeployAssert/BootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "Integ/DefaultTest/DeployAssert/CheckBootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.Stack", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests-alpha.IntegTestCase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests-alpha.IntegTest", + "version": "0.0.0" + } + }, + "Tree": { + "id": "Tree", + "path": "Tree", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.3.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.App", + "version": "0.0.0" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.ts new file mode 100644 index 0000000000000..de1eab2c436c7 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.ts @@ -0,0 +1,29 @@ +import { App, RemovalPolicy, Stack, StackProps } from 'aws-cdk-lib'; +import { Construct } from 'constructs'; +import * as opensearch from 'aws-cdk-lib/aws-opensearchservice'; + +class TestStack extends Stack { + constructor(scope: Construct, id: string, props?: StackProps) { + super(scope, id, props); + + const domainProps: opensearch.DomainProps = { + version: opensearch.EngineVersion.OPENSEARCH_2_11, + removalPolicy: RemovalPolicy.DESTROY, + logging: { + auditLogEnabled: false, + appLogEnabled: false, + slowIndexLogEnabled: false, + slowSearchLogEnabled: false, + }, + capacity: { + multiAzWithStandbyEnabled: false, + }, + }; + + new opensearch.Domain(this, 'Domain', domainProps); + } +} + +const app = new App(); +new TestStack(app, 'cdkinteg-opensearch-with-logging-disabled'); +app.synth(); \ No newline at end of file diff --git a/tests.txt b/tests.txt index 1f6fca662fe94..bfe06fcc83556 100644 --- a/tests.txt +++ b/tests.txt @@ -447,6 +447,7 @@ aws-opensearchservice/test/integ.opensearch.js aws-opensearchservice/test/integ.opensearch.ultrawarm.js aws-opensearchservice/test/integ.opensearch.unsignedbasicauth.js aws-opensearchservice/test/integ.opensearch.vpc.js +aws-opensearchservice/test/integ.opensearch.disable-logging.js aws-rds/test/integ.cluster-dual.js aws-rds/test/integ.cluster-rotation.lit.js aws-rds/test/integ.cluster-s3.js From 9f14a7796109a9d139e2442363a882358860c76d Mon Sep 17 00:00:00 2001 From: Joe Wakefield Date: Mon, 26 Feb 2024 10:35:44 -0500 Subject: [PATCH 4/6] Fix typo in my integ test --- .../test/integ.opensearch.disable-logging.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.ts index de1eab2c436c7..7ebaaa8d1e056 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.ts +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.disable-logging.ts @@ -25,5 +25,5 @@ class TestStack extends Stack { } const app = new App(); -new TestStack(app, 'cdkinteg-opensearch-with-logging-disabled'); +new TestStack(app, 'cdk-integ-opensearch-with-logging-disabled'); app.synth(); \ No newline at end of file From 9fbd134257db2bd2fccbd3ba68cf6da7681d80c2 Mon Sep 17 00:00:00 2001 From: Joe Wakefield Date: Mon, 4 Mar 2024 08:41:11 -0500 Subject: [PATCH 5/6] Replace tests.txt content with current main head --- tests.txt | 599 +----------------------------------------------------- 1 file changed, 1 insertion(+), 598 deletions(-) diff --git a/tests.txt b/tests.txt index 2382f60738488..6e4e3d269e7f4 100644 --- a/tests.txt +++ b/tests.txt @@ -1,598 +1 @@ -aws-amplify/test/integ.app-asset-deployment.js -aws-amplify/test/integ.app-codecommit.js -aws-amplify/test/integ.app.js -aws-apigateway/test/authorizers/integ.cognito-authorizer.js -aws-apigateway/test/authorizers/integ.request-authorizer.lit.js -aws-apigateway/test/authorizers/integ.token-authorizer-iam-role.js -aws-apigateway/test/authorizers/integ.token-authorizer.js -aws-apigateway/test/integ.api-definition.asset.js -aws-apigateway/test/integ.api-definition.inline.js -aws-apigateway/test/integ.base-path-mapping.js -aws-apigateway/test/integ.cloudwatch-disabled.js -aws-apigateway/test/integ.cors.js -aws-apigateway/test/integ.domain-name.js -aws-apigateway/test/integ.lambda-api-nonproxy.js -aws-apigateway/test/integ.lambda-api.js -aws-apigateway/test/integ.lambda-api.latebound-deploymentstage.js -aws-apigateway/test/integ.restapi-import.lit.js -aws-apigateway/test/integ.restapi-metrics.js -aws-apigateway/test/integ.restapi.access-log.js -aws-apigateway/test/integ.restapi.books.js -aws-apigateway/test/integ.restapi.defaults.js -aws-apigateway/test/integ.restapi.js -aws-apigateway/test/integ.restapi.multistack.js -aws-apigateway/test/integ.restapi.multiuse.js -aws-apigateway/test/integ.restapi.vpc-endpoint.js -aws-apigateway/test/integ.spec-restapi.js -aws-apigateway/test/integ.stepfunctions-api.js -aws-apigateway/test/integ.usage-plan.multikey.js -aws-apigateway/test/integ.usage-plan.sharing.js -aws-apigatewayv2/test/http/integ.stage.js -aws-apigatewayv2/test/websocket/integ.api-apikey.js -aws-apigatewayv2/test/websocket/integ.stage.js -aws-apigatewayv2-authorizers/test/http/integ.iam.js -aws-apigatewayv2-authorizers/test/http/integ.lambda.js -aws-apigatewayv2-authorizers/test/http/integ.user-pool.js -aws-apigatewayv2-authorizers/test/websocket/integ.iam.js -aws-apigatewayv2-integrations/test/http/integ.alb.js -aws-apigatewayv2-integrations/test/http/integ.http-proxy.js -aws-apigatewayv2-integrations/test/http/integ.lambda-proxy.js -aws-apigatewayv2-integrations/test/http/integ.nlb.js -aws-apigatewayv2-integrations/test/http/integ.service-discovery.js -aws-apigatewayv2-integrations/test/websocket/integ.lambda.js -aws-apigatewayv2-integrations/test/websocket/integ.mock.js -aws-appmesh/test/integ.mesh.js -aws-apprunner/test/integ.service-ecr-public.js -aws-apprunner/test/integ.service-ecr.js -aws-apprunner/test/integ.service-github.js -aws-apprunner/test/integ.service-vpc-connector.js -aws-appsync/test/integ.api-import.js -aws-appsync/test/integ.appsync-lambda.js -aws-appsync/test/integ.appsync-none.js -aws-appsync/test/integ.auth-apikey.js -aws-appsync/test/integ.graphql-elasticsearch.js -aws-appsync/test/integ.graphql-iam.js -aws-appsync/test/integ.graphql-opensearch.js -aws-appsync/test/integ.graphql-schema.js -aws-appsync/test/integ.graphql.js -aws-appsync/test/integ.log-retention.js -aws-athena/test/integ.workgroup.js -aws-autoscaling/test/integ.amazonlinux2.js -aws-autoscaling/test/integ.asg-lt.js -aws-autoscaling/test/integ.asg-w-classic-loadbalancer.js -aws-autoscaling/test/integ.asg-w-elbv2.js -aws-autoscaling/test/integ.custom-scaling.js -aws-autoscaling/test/integ.external-role.js -aws-autoscaling/test/integ.role-target-hook.js -aws-autoscaling/test/integ.spot-instances.js -aws-autoscaling/test/integ.warm-pool.js -aws-autoscaling-hooktargets/test/integ.queue-hook.js -aws-backup/test/integ.backup.js -aws-batch/test/integ.batch-with-efa.js -aws-batch/test/integ.batch-with-efs.js -aws-batch/test/integ.batch.js -aws-batch/test/integ.job-definition.js -aws-certificatemanager/test/integ.certificate-name.js -aws-certificatemanager/test/integ.dns-validated-certificate.js -aws-chatbot/test/integ.chatbot-logretention.js -aws-chatbot/test/integ.chatbot.js -aws-cloud9/test/integ.cloud9.js -aws-cloud9/test/integ.connection-type.js -aws-cloud9/test/integ.image-id.js -aws-cloudformation/test/integ.core-cross-region-references.js -aws-cloudformation/test/integ.core-custom-resources.js -aws-cloudformation/test/integ.nested-stack.js -aws-cloudformation/test/integ.nested-stacks-assets.js -aws-cloudformation/test/integ.nested-stacks-multi-refs.js -aws-cloudformation/test/integ.nested-stacks-multi.js -aws-cloudformation/test/integ.nested-stacks-nested-export-to-sibling.js -aws-cloudformation/test/integ.nested-stacks-refs1.js -aws-cloudformation/test/integ.nested-stacks-refs2.js -aws-cloudformation/test/integ.nested-stacks-refs3.js -aws-cloudfront/test/integ.cloudfront-bucket-logging.js -aws-cloudfront/test/integ.cloudfront-cross-region-cert.js -aws-cloudfront/test/integ.cloudfront-custom-s3.js -aws-cloudfront/test/integ.cloudfront-custom.js -aws-cloudfront/test/integ.cloudfront-empty-root.js -aws-cloudfront/test/integ.cloudfront-failover.js -aws-cloudfront/test/integ.cloudfront-geo-restrictions.js -aws-cloudfront/test/integ.cloudfront-ipv6-disabled.js -aws-cloudfront/test/integ.cloudfront-key-group.js -aws-cloudfront/test/integ.cloudfront-lambda-association.js -aws-cloudfront/test/integ.cloudfront-s3.js -aws-cloudfront/test/integ.cloudfront-security-policy.js -aws-cloudfront/test/integ.cloudfront.js -aws-cloudfront/test/integ.distribution-basic.js -aws-cloudfront/test/integ.distribution-extensive.js -aws-cloudfront/test/integ.distribution-function.js -aws-cloudfront/test/integ.distribution-http-version.js -aws-cloudfront/test/integ.distribution-key-group.js -aws-cloudfront/test/integ.distribution-lambda-cross-region.js -aws-cloudfront/test/integ.distribution-lambda.js -aws-cloudfront/test/integ.distribution-origin-id.js -aws-cloudfront/test/integ.distribution-policies.js -aws-cloudfront-origins/test/integ.http-origin.js -aws-cloudfront-origins/test/integ.load-balancer-origin.js -aws-cloudfront-origins/test/integ.origin-group.js -aws-cloudfront-origins/test/integ.rest-api-origin.js -aws-cloudfront-origins/test/integ.s3-origin-oai.js -aws-cloudfront-origins/test/integ.s3-origin.js -aws-cloudtrail/test/integ.cloudtrail-supplied-bucket.lit.js -aws-cloudtrail/test/integ.cloudtrail.lit.js -aws-cloudwatch/test/integ.alarm-and-dashboard.js -aws-cloudwatch/test/integ.alarm-with-label.js -aws-cloudwatch/test/integ.composite-alarm.js -aws-cloudwatch/test/integ.dashboard.js -aws-cloudwatch/test/integ.gauge-alarm.js -aws-cloudwatch/test/integ.math-alarm-and-dashboard.js -aws-cloudwatch/test/integ.sparkline-singlevaluewidget-and-dashboard.js -aws-cloudwatch-actions/test/integ.ssm-incident-alarm-action.js -aws-codebuild/test/integ.aws-deep-learning-container-build-image.js -aws-codebuild/test/integ.breakpoint.js -aws-codebuild/test/integ.caching.js -aws-codebuild/test/integ.defaults.lit.js -aws-codebuild/test/integ.docker-asset.lit.js -aws-codebuild/test/integ.docker-registry.lit.js -aws-codebuild/test/integ.ecr.lit.js -aws-codebuild/test/integ.github-webhook-batch.js -aws-codebuild/test/integ.github.js -aws-codebuild/test/integ.project-bucket.js -aws-codebuild/test/integ.project-buildspec-artifacts.js -aws-codebuild/test/integ.project-file-system-location.js -aws-codebuild/test/integ.project-logging.js -aws-codebuild/test/integ.project-notification.js -aws-codebuild/test/integ.project-secondary-sources-artifacts.js -aws-codebuild/test/integ.project-vpc.js -aws-codebuild/test/integ.report-group.js -aws-codecommit/test/integ.codecommit-code-asset-zip.js -aws-codecommit/test/integ.codecommit-code-asset.js -aws-codecommit/test/integ.codecommit-events.js -aws-codecommit/test/integ.repository-notification.js -aws-codedeploy/test/ecs/integ.deployment-config.js -aws-codedeploy/test/ecs/integ.deployment-group.js -aws-codedeploy/test/lambda/integ.deployment-config.js -aws-codedeploy/test/lambda/integ.deployment-group.js -aws-codedeploy/test/server/integ.deployment-group.js -aws-codeguruprofiler/test/integ.profiler-group-import-functions.js -aws-codeguruprofiler/test/integ.profiler-group.js -aws-codepipeline-actions/test/cloudformation/integ.stacksets.js -aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.js -aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.js -aws-codepipeline-actions/test/integ.lambda-pipeline.js -aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js -aws-codepipeline-actions/test/integ.pipeline-alexa-deploy.js -aws-codepipeline-actions/test/integ.pipeline-cfn-cross-region.js -aws-codepipeline-actions/test/integ.pipeline-cfn-with-action-role.js -aws-codepipeline-actions/test/integ.pipeline-cfn.js -aws-codepipeline-actions/test/integ.pipeline-code-build-batch.js -aws-codepipeline-actions/test/integ.pipeline-code-build-multiple-inputs-outputs.js -aws-codepipeline-actions/test/integ.pipeline-code-commit-build.js -aws-codepipeline-actions/test/integ.pipeline-code-commit.js -aws-codepipeline-actions/test/integ.pipeline-code-deploy-ecs.js -aws-codepipeline-actions/test/integ.pipeline-code-deploy.js -aws-codepipeline-actions/test/integ.pipeline-ecr-source.js -aws-codepipeline-actions/test/integ.pipeline-ecs-deploy.js -aws-codepipeline-actions/test/integ.pipeline-ecs-separate-source.lit.js -aws-codepipeline-actions/test/integ.pipeline-events.js -aws-codepipeline-actions/test/integ.pipeline-jenkins.js -aws-codepipeline-actions/test/integ.pipeline-manual-approval.js -aws-codepipeline-actions/test/integ.pipeline-s3-deploy.js -aws-codepipeline-actions/test/integ.pipeline-stepfunctions.js -aws-codepipeline-actions/test/integ.pipeline-with-replication.js -aws-codepipeline-actions/test/s3/integ.source-bucket-events-cross-stack-same-env.js -aws-cognito/test/integ.user-pool-client-explicit-props.js -aws-cognito/test/integ.user-pool-custom-sender.js -aws-cognito/test/integ.user-pool-domain-cfdist.js -aws-cognito/test/integ.user-pool-domain-signinurl.js -aws-cognito/test/integ.user-pool-explicit-props.js -aws-cognito/test/integ.user-pool-idp.amazon.js -aws-cognito/test/integ.user-pool-idp.apple.js -aws-cognito/test/integ.user-pool-idp.google.js -aws-cognito/test/integ.user-pool-idp.oidc.js -aws-cognito/test/integ.user-pool-idp.saml.js -aws-cognito/test/integ.user-pool-resource-server.js -aws-cognito/test/integ.user-pool-ses-email.js -aws-cognito/test/integ.user-pool-signup-code.js -aws-cognito/test/integ.user-pool-signup-link.js -aws-cognito/test/integ.user-pool.js -aws-cognito-identitypool/test/integ.identitypool.js -aws-config/test/integ.custompolicy.js -aws-config/test/integ.rule.lit.js -aws-config/test/integ.scoped-rule.js -aws-docdb/test/integ.cluster-rotation.lit.js -aws-docdb/test/integ.cluster.js -aws-dynamodb/test/integ.autoscaling.lit.js -aws-dynamodb/test/integ.dynamodb.alarm-metrics.js -aws-dynamodb/test/integ.dynamodb.js -aws-dynamodb/test/integ.dynamodb.kinesis-stream.js -aws-dynamodb/test/integ.dynamodb.mixed-key-gsi.js -aws-dynamodb/test/integ.dynamodb.ondemand.js -aws-dynamodb/test/integ.dynamodb.sse.js -aws-dynamodb/test/integ.global-replicas-provisioned.js -aws-dynamodb/test/integ.global.js -aws-ec2/test/integ.bastion-host-arm-support.js -aws-ec2/test/integ.bastion-host.js -aws-ec2/test/integ.client-vpn-endpoint.js -aws-ec2/test/integ.graviton3.js -aws-ec2/test/integ.import-default-vpc.lit.js -aws-ec2/test/integ.instance-init.js -aws-ec2/test/integ.instance-multipart-userdata.js -aws-ec2/test/integ.instance.js -aws-ec2/test/integ.launch-template.js -aws-ec2/test/integ.nat-instances.lit.js -aws-ec2/test/integ.ports.js -aws-ec2/test/integ.reserved-private-subnet.js -aws-ec2/test/integ.share-vpcs.lit.js -aws-ec2/test/integ.userdata.js -aws-ec2/test/integ.vpc-azs.js -aws-ec2/test/integ.vpc-endpoint.lit.js -aws-ec2/test/integ.vpc-flow-logs-interval.js -aws-ec2/test/integ.vpc-flow-logs.js -aws-ec2/test/integ.vpc-gateway.js -aws-ec2/test/integ.vpc-ipam.js -aws-ec2/test/integ.vpc-lookup.js -aws-ec2/test/integ.vpc-networkacl.js -aws-ec2/test/integ.vpc-reserved-azs.js -aws-ec2/test/integ.vpc.js -aws-ec2/test/integ.vpn-pre-shared-key-token.js -aws-ec2/test/integ.vpn.js -aws-ecr/test/integ.basic.js -aws-ecr/test/integ.imagescan.js -aws-ecr-assets/test/integ.assets-docker.js -aws-ecr-assets/test/integ.nested-stacks-docker.js -aws-ecs/test/ec2/integ.app-mesh-proxy-config.js -aws-ecs/test/ec2/integ.bottlerocket.js -aws-ecs/test/ec2/integ.capacity-provider.js -aws-ecs/test/ec2/integ.clb-host-nw.js -aws-ecs/test/ec2/integ.cloudmap-container-port.js -aws-ecs/test/ec2/integ.environment-file.js -aws-ecs/test/ec2/integ.exec-command.js -aws-ecs/test/ec2/integ.firelens-s3-config.js -aws-ecs/test/ec2/integ.graviton-bottlerocket.js -aws-ecs/test/ec2/integ.graviton.js -aws-ecs/test/ec2/integ.lb-awsvpc-nw.js -aws-ecs/test/ec2/integ.lb-bridge-nw.js -aws-ecs/test/ec2/integ.placement-strategies.js -aws-ecs/test/ec2/integ.sd-awsvpc-nw.js -aws-ecs/test/ec2/integ.sd-bridge-nw.js -aws-ecs/test/ec2/integ.secret-json-field.js -aws-ecs/test/ec2/integ.spot-drain.js -aws-ecs/test/ec2/integ.swap-parameters.js -aws-ecs/test/fargate/integ.add-environment-variable.js -aws-ecs/test/fargate/integ.capacity-providers.js -aws-ecs/test/fargate/integ.exec-command.js -aws-ecs/test/fargate/integ.fargate-with-efs.js -aws-ecs/test/fargate/integ.firelens-cloudwatch.js -aws-ecs/test/fargate/integ.lb-awsvpc-nw.js -aws-ecs/test/fargate/integ.nlb-awsvpc-nw.js -aws-ecs/test/fargate/integ.runtime.js -aws-ecs/test/fargate/integ.secret.js -aws-ecs-patterns/test/ec2/integ.alb-ecs-service-command-entry-point.js -aws-ecs-patterns/test/ec2/integ.application-load-balanced-ecs-service.js -aws-ecs-patterns/test/ec2/integ.healthchecks-multiple-application-load-balanced-ecs-service.js -aws-ecs-patterns/test/ec2/integ.healthchecks-multiple-network-load-balanced-ecs-service.js -aws-ecs-patterns/test/ec2/integ.multiple-application-load-balanced-ecs-service-idle-timeout.js -aws-ecs-patterns/test/ec2/integ.multiple-application-load-balanced-ecs-service.js -aws-ecs-patterns/test/ec2/integ.network-load-balanced-ecs-service.js -aws-ecs-patterns/test/ec2/integ.scheduled-ecs-task.js -aws-ecs-patterns/test/fargate/integ.alb-fargate-service-command-entry-point.js -aws-ecs-patterns/test/fargate/integ.alb-fargate-service-https-idle-timeout.js -aws-ecs-patterns/test/fargate/integ.alb-fargate-service-https.js -aws-ecs-patterns/test/fargate/integ.asset-image.js -aws-ecs-patterns/test/fargate/integ.circuit-breaker-load-balanced-fargate-service.js -aws-ecs-patterns/test/fargate/integ.circuit-breaker-queue-processing-fargate-service.js -aws-ecs-patterns/test/fargate/integ.executionrole.js -aws-ecs-patterns/test/fargate/integ.healthchecks-multiple-application-load-balanced-fargate-service.js -aws-ecs-patterns/test/fargate/integ.healthchecks-multiple-network-load-balanced-fargate-service.js -aws-ecs-patterns/test/fargate/integ.l3-autocreate.js -aws-ecs-patterns/test/fargate/integ.l3-capacity-provider-strategies.js -aws-ecs-patterns/test/fargate/integ.l3-vpconly.js -aws-ecs-patterns/test/fargate/integ.l3.js -aws-ecs-patterns/test/fargate/integ.multiple-network-load-balanced-fargate-service.js -aws-ecs-patterns/test/fargate/integ.queue-processing-fargate-service-isolated.js -aws-ecs-patterns/test/fargate/integ.queue-processing-fargate-service-public.js -aws-ecs-patterns/test/fargate/integ.queue-processing-fargate-service.js -aws-ecs-patterns/test/fargate/integ.runtime-platform-application-load-balanced-fargate-service.js -aws-ecs-patterns/test/fargate/integ.scheduled-fargate-task.js -aws-ecs-patterns/test/fargate/integ.special-listener.js -aws-efs/test/integ.efs.js -aws-eks/test/integ.alb-controller.js -aws-eks/test/integ.eks-bottlerocket-ng.js -aws-eks/test/integ.eks-cluster-handlers-vpc.js -aws-eks/test/integ.eks-cluster-private-endpoint.js -aws-eks/test/integ.eks-cluster.js -aws-eks/test/integ.eks-helm-asset.js -aws-eks/test/integ.eks-inference.js -aws-eks/test/integ.eks-inference-nodegroup.js -aws-eks/test/integ.eks-oidc-provider.js -aws-eks/test/integ.eks-service-account-sdk-call.js -aws-eks/test/integ.fargate-cluster.js -aws-elasticloadbalancing/test/integ.elb.js -aws-elasticloadbalancingv2/test/integ.alb.dualstack.js -aws-elasticloadbalancingv2/test/integ.alb.js -aws-elasticloadbalancingv2/test/integ.alb2.js -aws-elasticloadbalancingv2/test/integ.connection-termination.nlb.js -aws-elasticloadbalancingv2/test/integ.nlb.js -aws-elasticloadbalancingv2/test/integ.vpc-endpoint-service.js -aws-elasticloadbalancingv2-actions/test/integ.cognito.js -aws-elasticloadbalancingv2-targets/test/integ.alb-target.js -aws-elasticloadbalancingv2-targets/test/integ.lambda-target.js -aws-elasticsearch/test/integ.elasticsearch-vpc.js -aws-elasticsearch/test/integ.elasticsearch.advancedsecurity.js -aws-elasticsearch/test/integ.elasticsearch.custom-kms-key.js -aws-elasticsearch/test/integ.elasticsearch.js -aws-elasticsearch/test/integ.elasticsearch.ultrawarm.js -aws-elasticsearch/test/integ.elasticsearch.unsignedbasicauth.js -aws-events/test/integ.archive.js -aws-events/test/integ.connection.js -aws-events/test/integ.cross-account-rule.js -aws-events/test/integ.rule.js -aws-events-targets/test/aws-api/integ.aws-api.js -aws-events-targets/test/batch/integ.job-definition-events.js -aws-events-targets/test/codebuild/integ.project-events.js -aws-events-targets/test/codepipeline/integ.pipeline-event-target.js -aws-events-targets/test/ecs/integ.event-ec2-task.js -aws-events-targets/test/ecs/integ.event-fargate-task.js -aws-events-targets/test/event-bus/integ.event-bus.js -aws-events-targets/test/kinesis/integ.kinesis-stream.js -aws-events-targets/test/kinesis-firehose/integ.kinesis-firehose-stream.js -aws-events-targets/test/lambda/integ.events.js -aws-events-targets/test/logs/integ.log-group.js -aws-events-targets/test/sns/integ.sns-event-rule-target.js -aws-events-targets/test/sqs/integ.sqs-event-rule-target.js -aws-fsx/test/integ.lustre-file-system-with-s3.js -aws-fsx/test/integ.lustre-file-system.js -aws-gamelift/test/integ.build.js -aws-gamelift/test/integ.game-server-group.js -aws-gamelift/test/integ.script.js -aws-globalaccelerator-endpoints/test/integ.globalaccelerator.js -aws-glue/test/integ.connection.js -aws-glue/test/integ.job.js -aws-glue/test/integ.partition-index.js -aws-glue/test/integ.security-configuration.js -aws-glue/test/integ.table.js -aws-iam/test/integ.access-key.js -aws-iam/test/integ.composite-principal.js -aws-iam/test/integ.condition-with-ref.js -aws-iam/test/integ.group.js -aws-iam/test/integ.managed-policy.js -aws-iam/test/integ.oidc-provider.js -aws-iam/test/integ.policy.js -aws-iam/test/integ.role.js -aws-iam/test/integ.saml-provider.js -aws-iam/test/integ.user.js -aws-iam/test/integ.users-and-groups.js -aws-iot/test/integ.topic-rule.js -aws-iot-actions/test/cloudwatch/integ.cloudwatch-logs-action.js -aws-iot-actions/test/cloudwatch/integ.cloudwatch-put-metric-action.js -aws-iot-actions/test/cloudwatch/integ.cloudwatch-set-alarm-state-action.js -aws-iot-actions/test/dynamodbv2/integ.dynamodbv2-put-item-action.js -aws-iot-actions/test/iot/integ.iot-republish-action.js -aws-iot-actions/test/iot/integ.iotevents-put-message-action.js -aws-iot-actions/test/kinesis-firehose/integ.firehose-put-record-action.js -aws-iot-actions/test/kinesis-stream/integ.kinesis-put-record-action.js -aws-iot-actions/test/lambda/integ.lambda-function-action.js -aws-iot-actions/test/s3/integ.s3-put-object-action.js -aws-iot-actions/test/sns/integ.sns-topic-action.js -aws-iot-actions/test/sqs/integ.sqs-queue-action.js -aws-iotevents/test/integ.detector-model.js -aws-iotevents-actions/test/iot/integ.set-variable-action.js -aws-iotevents-actions/test/iot/integ.timer-actions.js -aws-iotevents-actions/test/lambda/integ.lambda-invoke-action.js -aws-ivs/test/integ.ivs.js -aws-kinesis/test/integ.stream-dashboard.js -aws-kinesis/test/integ.stream.js -aws-kinesisanalytics-flink/test/integ.application-code-from-bucket.lit.js -aws-kinesisanalytics-flink/test/integ.application.lit.js -aws-kinesisfirehose/test/integ.delivery-stream.js -aws-kinesisfirehose/test/integ.delivery-stream.source-stream.js -aws-kinesisfirehose-destinations/test/integ.s3-bucket.lit.js -aws-kms/test/integ.key-sharing.lit.js -aws-kms/test/integ.key.js -aws-lambda/test/integ.assets.file.js -aws-lambda/test/integ.assets.lit.js -aws-lambda/test/integ.autoscaling.lit.js -aws-lambda/test/integ.bundling.docker-opts.js -aws-lambda/test/integ.bundling.js -aws-lambda/test/integ.current-version.js -aws-lambda/test/integ.lambda-insights-mapping.js -aws-lambda/test/integ.lambda.docker-arm64.js -aws-lambda/test/integ.lambda.docker.js -aws-lambda/test/integ.lambda.filesystem.js -aws-lambda/test/integ.lambda.js -aws-lambda/test/integ.lambda.prov.concurrent.js -aws-lambda/test/integ.layer-version.lit.js -aws-lambda/test/integ.log-retention.js -aws-lambda/test/integ.permissions.js -aws-lambda/test/integ.runtime.inlinecode.js -aws-lambda/test/integ.vpc-lambda.js -aws-lambda-destinations/test/integ.destinations.js -aws-lambda-destinations/test/integ.lambda-chain.js -aws-lambda-event-sources/test/integ.dynamodb-with-filter-criteria.js -aws-lambda-event-sources/test/integ.dynamodb.js -aws-lambda-event-sources/test/integ.kafka-selfmanaged.js -aws-lambda-event-sources/test/integ.kinesis-at-timestamp.js -aws-lambda-event-sources/test/integ.kinesis.js -aws-lambda-event-sources/test/integ.kinesiswithdlq.js -aws-lambda-event-sources/test/integ.s3.js -aws-lambda-event-sources/test/integ.sns.js -aws-lambda-event-sources/test/integ.sqs-with-filter-criteria.js -aws-lambda-event-sources/test/integ.sqs.js -aws-lambda-go/test/integ.function.js -aws-lambda-nodejs/test/integ.compilations.js -aws-lambda-nodejs/test/integ.dependencies.js -aws-lambda-nodejs/test/integ.esm.js -aws-lambda-nodejs/test/integ.function.js -aws-lambda-python/test/integ.function.custom-build.js -aws-lambda-python/test/integ.function.js -aws-lambda-python/test/integ.function.nodeps.js -aws-lambda-python/test/integ.function.pipenv.js -aws-lambda-python/test/integ.function.poetry.js -aws-lambda-python/test/integ.function.project.js -aws-lambda-python/test/integ.function.py38.js -aws-lambda-python/test/integ.function.sub.js -aws-lambda-python/test/integ.function.vpc.js -aws-logs/test/integ.expose-metric.js -aws-logs/test/integ.log-retention.js -aws-logs/test/integ.metricfilter-dimensions.js -aws-logs/test/integ.metricfilter.lit.js -aws-logs/test/integ.save-logs-insights-query-definition.js -aws-msk/test/integ.cluster.js -aws-neptune/test/integ.cluster-ev12.js -aws-neptune/test/integ.cluster.js -aws-opensearchservice/test/integ.opensearch.advancedsecurity.js -aws-opensearchservice/test/integ.opensearch.cognitodashboardsauth.js -aws-opensearchservice/test/integ.opensearch.custom-kms-key.js -aws-opensearchservice/test/integ.opensearch.js -aws-opensearchservice/test/integ.opensearch.ultrawarm.js -aws-opensearchservice/test/integ.opensearch.unsignedbasicauth.js -aws-opensearchservice/test/integ.opensearch.vpc.js -aws-opensearchservice/test/integ.opensearch.disable-logging.js -aws-rds/test/integ.cluster-dual.js -aws-rds/test/integ.cluster-rotation.lit.js -aws-rds/test/integ.cluster-s3.js -aws-rds/test/integ.cluster-s3.mysql-8.js -aws-rds/test/integ.cluster-snapshot.js -aws-rds/test/integ.cluster.js -aws-rds/test/integ.instance-dual.js -aws-rds/test/integ.instance-from-generated-password.js -aws-rds/test/integ.instance-s3-postgres.js -aws-rds/test/integ.instance-s3.js -aws-rds/test/integ.instance.lit.js -aws-rds/test/integ.proxy.js -aws-rds/test/integ.read-replica.js -aws-rds/test/integ.rolling-instance-updates.js -aws-rds/test/integ.serverless-cluster-no-vpc.js -aws-rds/test/integ.serverless-cluster.js -aws-redshift/test/integ.cluster-elasticip.js -aws-redshift/test/integ.cluster-enhancedvpcrouting.js -aws-redshift/test/integ.cluster-loggingbucket.js -aws-redshift/test/integ.database.js -aws-route53/test/integ.cross-account-zone-delegation.js -aws-route53/test/integ.delete-existing-record-set.js -aws-route53/test/integ.route53.js -aws-route53/test/integ.vpc-endpoint-service-domain-name.js -aws-route53-targets/test/integ.alb-alias-target.js -aws-route53-targets/test/integ.api-gateway-domain-name.js -aws-route53-targets/test/integ.cloudfront-alias-target.js -aws-route53-targets/test/integ.globalaccelerator-alias-target.js -aws-route53-targets/test/integ.interface-vpc-endpoint-target.js -aws-route53-targets/test/integ.route53-record.js -aws-route53resolver/test/integ.firewall.js -aws-s3/test/integ.bucket-auto-delete-objects.js -aws-s3/test/integ.bucket-grantdelete-kms.js -aws-s3/test/integ.bucket-intelligent-tiering.js -aws-s3/test/integ.bucket-inventory.js -aws-s3/test/integ.bucket-sharing.lit.js -aws-s3/test/integ.bucket.domain-name.js -aws-s3/test/integ.bucket.js -aws-s3/test/integ.bucket.notifications.js -aws-s3/test/integ.bucket.server-access-logs.js -aws-s3/test/integ.bucket.url.lit.js -aws-s3/test/integ.lifecycle-expiration.js -aws-s3/test/integ.lifecycle.js -aws-s3-assets/test/integ.assets.bundling.docker-opts.js -aws-s3-assets/test/integ.assets.bundling.lit.js -aws-s3-assets/test/integ.assets.directory.lit.js -aws-s3-assets/test/integ.assets.file.lit.js -aws-s3-assets/test/integ.assets.permissions.lit.js -aws-s3-assets/test/integ.assets.refs.lit.js -aws-s3-assets/test/integ.multi-assets.js -aws-s3-deployment/test/integ.bucket-deployment-cloudfront.js -aws-s3-deployment/test/integ.bucket-deployment-data.js -aws-s3-deployment/test/integ.bucket-deployment.js -aws-s3-notifications/test/integ.notifications.js -aws-s3-notifications/test/lambda/integ.bucket-notifications.js -aws-s3-notifications/test/sns/integ.sns-bucket-notifications.js -aws-s3-notifications/test/sqs/integ.bucket-notifications.js -aws-s3objectlambda/test/integ.s3objectlambda.js -aws-secretsmanager/test/integ.hosted-rotation.js -aws-secretsmanager/test/integ.lambda-rotation.js -aws-secretsmanager/test/integ.replica.js -aws-secretsmanager/test/integ.secret-name-parsed.js -aws-secretsmanager/test/integ.secret.lit.js -aws-servicecatalog/test/integ.portfolio.js -aws-servicecatalog/test/integ.product.js -aws-servicecatalogappregistry/test/integ.application-associator.all-stacks-association.js -aws-servicecatalogappregistry/test/integ.application.js -aws-servicecatalogappregistry/test/integ.attribute-group.js -aws-servicediscovery/test/integ.service-with-cname-record.lit.js -aws-servicediscovery/test/integ.service-with-http-namespace.lit.js -aws-servicediscovery/test/integ.service-with-private-dns-namespace.lit.js -aws-servicediscovery/test/integ.service-with-public-dns-namespace.lit.js -aws-ses/test/integ.configuration-set.js -aws-ses/test/integ.email-identity.js -aws-ses/test/integ.receipt.js -aws-ses-actions/test/integ.actions.js -aws-sns/test/integ.sns-fifo.js -aws-sns/test/integ.sns-fifo.no-name.js -aws-sns/test/integ.sns.js -aws-sns-subscriptions/test/integ.sns-lambda-cross-region.js -aws-sns-subscriptions/test/integ.sns-lambda.js -aws-sns-subscriptions/test/integ.sns-sqs-cross-region.lit.js -aws-sns-subscriptions/test/integ.sns-sqs.lit.js -aws-sqs/test/integ.sqs.js -aws-ssm/test/integ.list-parameter.js -aws-ssm/test/integ.parameter-arns.js -aws-ssm/test/integ.parameter-store-string.js -aws-ssm/test/integ.parameter.lit.js -aws-stepfunctions/test/integ.custom-state.js -aws-stepfunctions/test/integ.intrinsics.js -aws-stepfunctions/test/integ.listAt-after-parallel.js -aws-stepfunctions/test/integ.state-machine.js -aws-stepfunctions-tasks/test/apigateway/integ.call-http-api.js -aws-stepfunctions-tasks/test/apigateway/integ.call-rest-api.js -aws-stepfunctions-tasks/test/athena/integ.get-query-execution.js -aws-stepfunctions-tasks/test/athena/integ.get-query-results.js -aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js -aws-stepfunctions-tasks/test/athena/integ.stop-query-execution.js -aws-stepfunctions-tasks/test/aws-sdk/integ.call-aws-service.js -aws-stepfunctions-tasks/test/batch/integ.run-batch-job.js -aws-stepfunctions-tasks/test/batch/integ.submit-job.js -aws-stepfunctions-tasks/test/codebuild/integ.start-build.js -aws-stepfunctions-tasks/test/databrew/integ.start-job-run.js -aws-stepfunctions-tasks/test/dynamodb/integ.call-dynamodb.js -aws-stepfunctions-tasks/test/dynamodb/integ.stringset-after-parallel.js -aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js -aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js -aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js -aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js -aws-stepfunctions-tasks/test/eks/integ.call.js -aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js -aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js -aws-stepfunctions-tasks/test/eventbridge/integ.put-events.js -aws-stepfunctions-tasks/test/glue/integ.glue-task.js -aws-stepfunctions-tasks/test/glue/integ.start-job-run.js -aws-stepfunctions-tasks/test/integ.evaluate-expression.js -aws-stepfunctions-tasks/test/integ.job-poller.js -aws-stepfunctions-tasks/test/integ.start-execution.js -aws-stepfunctions-tasks/test/lambda/integ.invoke-function.js -aws-stepfunctions-tasks/test/lambda/integ.invoke.js -aws-stepfunctions-tasks/test/lambda/integ.invoke.payload.only.js -aws-stepfunctions-tasks/test/lambda/integ.run-lambda.js -aws-stepfunctions-tasks/test/sagemaker/integ.call-sagemaker.js -aws-stepfunctions-tasks/test/sagemaker/integ.create-training-job.js -aws-stepfunctions-tasks/test/sns/integ.publish.js -aws-stepfunctions-tasks/test/sqs/integ.send-message-encrypted.js -aws-stepfunctions-tasks/test/sqs/integ.send-message.js -aws-stepfunctions-tasks/test/stepfunctions/integ.invoke-activity.js -aws-stepfunctions-tasks/test/stepfunctions/integ.start-execution.js -aws-synthetics/test/integ.canary.js -aws-synthetics/test/integ.vpc.js -cloudformation-include/test/integ.nested-stacks.js -custom-resources/test/aws-custom-resource/integ.aws-custom-resource-vpc.js -custom-resources/test/aws-custom-resource/integ.aws-custom-resource.js -custom-resources/test/provider-framework/integ.provider.js -example-construct-library/test/integ.example-resource.js -lambda-layer-awscli/test/integ.awscli-layer.js -lambda-layer-kubectl/test/integ.kubectl-layer.js -lambda-layer-node-proxy-agent/test/integ.node-proxy-agent.js -pipelines/test/integ.newpipeline-with-vpc.js -pipelines/test/integ.newpipeline.js -pipelines/test/integ.pipeline-security.js -pipelines/test/integ.pipeline-with-assets-single-upload.js -pipelines/test/integ.pipeline-with-assets.js -pipelines/test/integ.pipeline-with-variables.js -pipelines/test/integ.pipeline-without-prepare.js -pipelines/test/integ.pipeline.js -triggers/test/integ.triggers.js \ No newline at end of file +@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-auto-delete-objects.js \ No newline at end of file From 87349af8107e3d00135e44d05db8a786d66f72c3 Mon Sep 17 00:00:00 2001 From: Joe Wakefield Date: Fri, 15 Mar 2024 08:42:35 -0400 Subject: [PATCH 6/6] Revert tests.txt better --- tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.txt b/tests.txt index 6e4e3d269e7f4..29d611979db63 100644 --- a/tests.txt +++ b/tests.txt @@ -1 +1 @@ -@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-auto-delete-objects.js \ No newline at end of file +@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-auto-delete-objects.js