fix: explicitly pin neptune engine version to 1.2.0.1 (#962)

* fix: explicitly pin neptune version to 1.2.0.1 * chore: self mutation Signed-off-by: github-actions <[email protected]> Signed-off-by: github-actions <[email protected]> Co-authored-by: github-actions <[email protected]>
awslabs · Nov 20, 2022 · bad5114 · bad5114
1 parent b652f6e
commit bad5114
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 50 deletions.
diff --git a/.projen/deps.json b/.projen/deps.json
diff --git a/.projen/tasks.json b/.projen/tasks.json
diff --git a/.projenrc.js b/.projenrc.js
@@ -16,7 +16,7 @@ const cdkAlphaDeps = [
   '@aws-cdk/aws-glue-alpha',
   '@aws-cdk/aws-lambda-python-alpha',
   '@aws-cdk/aws-neptune-alpha',
-].map(dep => `${dep}@2.0.0-alpha.11`);
+].map(dep => `${dep}@^2.51.1-alpha.0`);
 const awsSDKDeps = [
   '@aws-sdk/client-glue',
   '@aws-sdk/client-secrets-manager',

diff --git a/package.json b/package.json
diff --git a/src/lib/dashboard-stack.ts b/src/lib/dashboard-stack.ts
@@ -7,7 +7,7 @@ import {
   HttpMethod,
   HttpStage,
 } from '@aws-cdk/aws-apigatewayv2-alpha';
-import { LambdaProxyIntegration } from '@aws-cdk/aws-apigatewayv2-integrations-alpha';
+import { HttpLambdaIntegration } from '@aws-cdk/aws-apigatewayv2-integrations-alpha';
 import {
   GraphqlApi,
   Schema,
@@ -538,7 +538,7 @@ export class TransactionDashboardStack extends NestedStack {
       'GeneratorStartIntegration',
       {
         apiId: httpApi.httpApiId,
-        integrationType: HttpIntegrationType.LAMBDA_PROXY,
+        integrationType: HttpIntegrationType.AWS_PROXY,
         integrationSubtype: 'StepFunctions-StartExecution',
         connectionType: HttpConnectionType.INTERNET,
         credentialsArn: apiRole.roleArn,
@@ -595,8 +595,7 @@ export class TransactionDashboardStack extends NestedStack {
           },
         ],
       });
-    const tokenFnIntegration = new LambdaProxyIntegration({
-      handler: tokenFn,
+    const tokenFnIntegration = new HttpLambdaIntegration('TokenInteg', tokenFn, {
       payloadFormatVersion: PayloadFormatVersion.VERSION_2_0,
     });
     httpApi.addRoutes({

diff --git a/src/lib/stack.ts b/src/lib/stack.ts
@@ -1,4 +1,4 @@
-import { ClusterParameterGroup, ParameterGroup, DatabaseCluster, InstanceType, IDatabaseCluster } from '@aws-cdk/aws-neptune-alpha';
+import { ClusterParameterGroup, ParameterGroup, DatabaseCluster, InstanceType, IDatabaseCluster, EngineVersion, ParameterGroupFamily } from '@aws-cdk/aws-neptune-alpha';
 import { RemovalPolicy, Stack, StackProps, Duration, CfnParameter, CfnOutput, CfnResource } from 'aws-cdk-lib';
 import { GatewayVpcEndpointAwsService, Vpc, FlowLogDestination, SubnetType, IVpc, SecurityGroup } from 'aws-cdk-lib/aws-ec2';
 import { Role, ServicePrincipal } from 'aws-cdk-lib/aws-iam';
@@ -177,13 +177,15 @@ export class FraudDetectionStack extends Stack {
         neptune_enable_audit_log: '1',
         neptune_streams: '1',
       },
+      family: ParameterGroupFamily.NEPTUNE_1_2,
     });
 
     const dbParams = new ParameterGroup(this, 'DBParamGroup', {
       description: 'Neptune DB Param Group',
       parameters: {
         neptune_query_timeout: '600000',
       },
+      family: ParameterGroupFamily.NEPTUNE_1_2,
     });
 
     const neptuneRole = new Role(this, 'NeptuneBulkLoadRole', {
@@ -224,6 +226,7 @@ export class FraudDetectionStack extends Stack {
       removalPolicy: RemovalPolicy.DESTROY,
       backupRetention: Duration.days(7),
       securityGroups: [graphDBSG],
+      engineVersion: new EngineVersion('1.2.0.1'),
     });
     graphDBCluster.node.findAll().filter(c => (c as CfnDBInstance).cfnOptions)
       .forEach(c => (c as CfnDBInstance).autoMinorVersionUpgrade = true);

diff --git a/test/stack.test.ts b/test/stack.test.ts
@@ -88,12 +88,16 @@ describe('fraud detection stack test suite', () => {
   test('Neptune cluster and dbs created', () => {
 
     Template.fromStack(stack).hasResourceProperties('AWS::Neptune::DBClusterParameterGroup', {
-      Family: 'neptune1',
+      Family: 'neptune1.2',
       Parameters: {
         neptune_enable_audit_log: '1',
       },
     });
 
+    Template.fromStack(stack).hasResourceProperties('AWS::Neptune::DBParameterGroup', {
+      Family: 'neptune1.2',
+    });
+
     Template.fromStack(stack).hasResource('AWS::Neptune::DBCluster', {
       Properties: {
         AssociatedRoles: [
@@ -116,6 +120,7 @@ describe('fraud detection stack test suite', () => {
         Port: 8182,
         BackupRetentionPeriod: 7,
         StorageEncrypted: true,
+        EngineVersion: '1.2.0.1',
         VpcSecurityGroupIds: [
           {
             'Fn::GetAtt': [

diff --git a/test/training-stack.test.ts b/test/training-stack.test.ts
@@ -628,7 +628,6 @@ describe('training stack test suite', () => {
         Statement: [
           {
             Action: [
-              'glue:BatchDeletePartition',
               'glue:BatchGetPartition',
               'glue:GetPartition',
               'glue:GetPartitions',
@@ -692,7 +691,6 @@ describe('training stack test suite', () => {
           },
           {
             Action: [
-              'glue:BatchDeletePartition',
               'glue:BatchGetPartition',
               'glue:GetPartition',
               'glue:GetPartitions',

diff --git a/yarn.lock b/yarn.lock