Revert "chore: add vpc endpoint for each construct (#614)" (#620)

This reverts commit 486c810.

Author: krokoko

apidocs/classes/QaAppsyncOpensearch.md

@@ -28,7 +28,7 @@ represents the scope for all the resources.
 
 • **id**: `string`
 
-this is a scope-unique id.
+this is a a scope-unique id.
 
 • **props**: [`QaAppsyncOpensearchProps`](../interfaces/QaAppsyncOpensearchProps.md)
 

apidocs/interfaces/QaAppsyncOpensearchProps.md

@@ -108,7 +108,7 @@ Existing Amazon OpenSearch Service domain.
 
 > `readonly` `optional` **existingOpensearchServerlessCollection**: `CfnCollection`
 
-Existing Amazon OpenSearch Serverless collection.
+Existing Amazon Amazon OpenSearch Serverless collection.
 
 #### Default
 

lambda/opensearch-serverless-custom-resources/custom_resources/__init__.py

@@ -19,7 +19,6 @@
 
 from .cr_types import CustomResourceRequest, CustomResourceResponse
 from .opensearch_index import on_event as on_event_opensearch_index
-from .opensearch_vpc_endpoint import on_event as on_event_opensearch_vpc_endpoint
 
 LOG_LEVEL = os.getenv("LOG_LEVEL", "INFO")
 
@@ -33,8 +32,6 @@ def on_event(event: CustomResourceRequest, context):
 
     if resource_type == "Custom::OpenSearchIndex":
         return on_event_opensearch_index(event, context)
-    if resource_type == "Custom::VpcEndpoint":
-        return on_event_opensearch_vpc_endpoint(event, context)
     if resource_type == "Custom::NoOp":
         logger.info("NoOp resource type")
         # Return a response with a physical resource ID that is not empty.

lambda/opensearch-serverless-custom-resources/custom_resources/opensearch_vpc_endpoint.py

@@ -108,7 +108,6 @@ export class AmazonAuroraDefaultVectorStore extends cdk.Resource {
 
     const vpc = buildVpc(this, {
       defaultVpcProps: DefaultVpcProps(),
-      vpcName: 'auroraDefaultVectorStoreVpc',
     });
     vpc.addFlowLog('VpcFlowLog', {
       destination: ec2.FlowLogDestination.toCloudWatchLogs(),
@@ -134,7 +133,7 @@ export class AmazonAuroraDefaultVectorStore extends cdk.Resource {
       clusterIdentifier: this.clusterIdentifier,
       defaultDatabaseName: this.databaseName,
       vpc: vpc,
-      vpcSubnets: { subnetType: ec2.SubnetType.PRIVATE_ISOLATED },
+      vpcSubnets: { subnetType: ec2.SubnetType.PUBLIC },
       securityGroups: [auroraSecurityGroup],
       iamAuthentication: true,
       storageEncrypted: true,

src/cdk-lib/amazonaurora/aurora-default-vector-store.ts

@@ -122,7 +122,7 @@ export function buildCustomResourceProvider(props: CRProviderProps): ICRProvider
         timeout: cdk.Duration.minutes(15),
         memorySize: 128,
         vpc,
-        vpcSubnets: vpc ? { subnetType: ec2.SubnetType.PRIVATE_ISOLATED } : undefined,
+        vpcSubnets: vpc ? { subnetType: ec2.SubnetType.PRIVATE_WITH_EGRESS } : undefined,
         securityGroups: vpc && securityGroup ? [securityGroup] : undefined,
         logRetention: logs.RetentionDays.ONE_WEEK,
         description: 'Custom Resource Provider',

src/common/helpers/custom-resource-provider-helper.ts

@@ -42,11 +42,6 @@ export function CheckOpenSearchProps(propsObject: OpenSearchProps | any) {
     errorFound = true;
   }
 
-  if (propsObject.existingOpenSearchDomain && !propsObject.existingVpc) {
-    errorMessages += 'Error - When using an existing OpenSearch domain, you must also provide an existing VPC.\n';
-    errorFound = true;
-  }
-
   if (errorFound) {
     throw new Error(errorMessages);
   }