feat(cdk-ops): enable enhancedVpcRouting

- Enables `enhancedVpcRouting` of the Redshift Serverless workgroup for
  production. Merges the changes on `DataWarehouseV2` back to
  `DataWarehouse`. `DataWarehouseV2` is no longer used.

issue codemonger-io#30

cdk-ops/lib/cdk-ops-stack.ts

@@ -8,7 +8,6 @@ import {
 } from './codemonger-resources';
 import { ContentsPipeline } from './contents-pipeline';
 import { DataWarehouse } from './data-warehouse';
-import { DataWarehouseV2 } from './data-warehouse-v2';
 import { LatestBoto3Layer } from './latest-boto3-layer';
 import { LibdatawarehouseLayer } from './libdatawarehouse-layer';
 
@@ -32,7 +31,7 @@ export class CdkOpsStack extends Stack {
     const pipeline = new ContentsPipeline(this, 'ContentsPipeline', {
       codemongerResources,
     });
-    const developmentDataWarehouse = new DataWarehouseV2(
+    const developmentDataWarehouse = new DataWarehouse(
       this,
       'DevelopmentDataWarehouse',
       {

cdk-ops/lib/data-warehouse.ts

@@ -60,8 +60,8 @@ export class DataWarehouse extends Construct {
 
     this.vpc = new ec2.Vpc(this, `DwVpc`, {
       cidr: '192.168.0.0/16',
-      enableDnsSupport: false,
-      enableDnsHostnames: false,
+      enableDnsSupport: true,
+      enableDnsHostnames: true,
       subnetConfiguration: [
         {
           name: CLUSTER_SUBNET_GROUP_NAME,
@@ -71,6 +71,11 @@ export class DataWarehouse extends Construct {
           cidrMask: 22,
         },
       ],
+      gatewayEndpoints: {
+        S3: {
+          service: ec2.GatewayVpcEndpointAwsService.S3,
+        },
+      },
     });
 
     // provisions Redshift Serverless resources
@@ -128,6 +133,7 @@ export class DataWarehouse extends Construct {
       namespaceName: dwNamespace.namespaceName,
       baseCapacity: 32,
       subnetIds: this.getSubnetIdsForCluster(),
+      enhancedVpcRouting: true,
       tags: [
         {
           key: 'project',