feat: feature flag

aws · mergify · Jan 30, 2024 · Jan 10, 2024 · Jan 10, 2024 · Jan 10, 2024
commit a7daf85d066649b5b22dd1ebdc2e41cb29ee6a7c
diff --git a/packages/@aws-cdk/aws-neptune-alpha/lib/cluster.ts b/packages/@aws-cdk/aws-neptune-alpha/lib/cluster.ts
@@ -3,13 +3,14 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2';
 import * as iam from 'aws-cdk-lib/aws-iam';
 import * as kms from 'aws-cdk-lib/aws-kms';
 import * as logs from 'aws-cdk-lib/aws-logs';
-import { Aws, Duration, IResource, Lazy, RemovalPolicy, Resource, Token } from 'aws-cdk-lib/core';
+import { Aws, Duration, FeatureFlags, IResource, Lazy, RemovalPolicy, Resource, Token } from 'aws-cdk-lib/core';
 import { Construct } from 'constructs';
 import { Endpoint } from './endpoint';
 import { InstanceType } from './instance';
 import { CfnDBCluster, CfnDBInstance } from 'aws-cdk-lib/aws-neptune';
 import { IClusterParameterGroup, IParameterGroup } from './parameter-group';
 import { ISubnetGroup, SubnetGroup } from './subnet-group';
+import { NEPTUNE_ALPHA_USE_LOG_TYPE_IN_LOG_RETENTION_ID } from 'aws-cdk-lib/cx-api';
 
 /**
  * Possible Instances Types to use in Neptune cluster
@@ -633,11 +634,14 @@ export class DatabaseCluster extends DatabaseClusterBase implements IDatabaseClu
     const retention = props.cloudwatchLogsRetention;
     if (retention) {
       props.cloudwatchLogsExports?.forEach(logType => {
-        new logs.LogRetention(this, `${logType.value}LogRetention`, {
-          logGroupName: `/aws/neptune/${this.clusterIdentifier}/${logType.value}`,
-          role: props.cloudwatchLogsRetentionRole,
-          retention,
-        });
+        new logs.LogRetention(
+          this,
+          `${FeatureFlags.of(this).isEnabled(NEPTUNE_ALPHA_USE_LOG_TYPE_IN_LOG_RETENTION_ID) ? logType : logType.value}LogRetention`,
+          {
+            logGroupName: `/aws/neptune/${this.clusterIdentifier}/${logType.value}`,
+            role: props.cloudwatchLogsRetentionRole,
+            retention,
+          });
       });
     }
 

diff --git a/packages/@aws-cdk/aws-neptune-alpha/test/cluster.test.ts b/packages/@aws-cdk/aws-neptune-alpha/test/cluster.test.ts
@@ -7,6 +7,7 @@ import * as logs from 'aws-cdk-lib/aws-logs';
 import * as cdk from 'aws-cdk-lib';
 
 import { ClusterParameterGroup, DatabaseCluster, EngineVersion, InstanceType, LogType } from '../lib';
+import { NEPTUNE_ALPHA_USE_LOG_TYPE_IN_LOG_RETENTION_ID } from 'aws-cdk-lib/cx-api';
 
 describe('DatabaseCluster', () => {
 
@@ -834,6 +835,7 @@ describe('DatabaseCluster', () => {
   test('cloudwatchLogsExports log retention is enabled when configured for multiple logs exports', () => {
     // GIVEN
     const stack = testStack();
+    stack.node.setContext(NEPTUNE_ALPHA_USE_LOG_TYPE_IN_LOG_RETENTION_ID, true);
     const vpc = new ec2.Vpc(stack, 'VPC');
 
     // WHEN

diff --git a/packages/@aws-cdk/aws-neptune-alpha/test/integ.cluster-multiple-log-exports.ts b/packages/@aws-cdk/aws-neptune-alpha/test/integ.cluster-multiple-log-exports.ts
@@ -5,6 +5,7 @@ import * as cdk from 'aws-cdk-lib';
 import * as integ from '@aws-cdk/integ-tests-alpha';
 import { DatabaseCluster, EngineVersion, InstanceType, LogType } from '../lib';
 import { ClusterParameterGroup, ParameterGroupFamily } from '../lib/parameter-group';
+import { NEPTUNE_ALPHA_USE_LOG_TYPE_IN_LOG_RETENTION_ID } from 'aws-cdk-lib/cx-api';
 
 /*
  * Test creating a cluster without specifying engine version.
@@ -15,8 +16,8 @@ import { ClusterParameterGroup, ParameterGroupFamily } from '../lib/parameter-gr
  */
 
 const app = new cdk.App();
-
 const stack = new cdk.Stack(app, 'aws-cdk-neptune-integ');
+stack.node.setContext(NEPTUNE_ALPHA_USE_LOG_TYPE_IN_LOG_RETENTION_ID, true);
 
 const vpc = new ec2.Vpc(stack, 'VPC', { maxAzs: 2, restrictDefaultSecurityGroup: false });