Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(neptune-alpha): multiple cloudwatchLogsExports cannot be set when configuring log retention #28643

Merged
merged 27 commits into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
da91441
fix: logName
badmintoncryer Jan 10, 2024
a6ba118
fix: remove irrevant update
badmintoncryer Jan 10, 2024
a3eaf7f
test: integ test
badmintoncryer Jan 10, 2024
811d19a
feat: add feature flag
badmintoncryer Jan 18, 2024
a7daf85
feat: feature flag
badmintoncryer Jan 18, 2024
78e3a6f
fix: integ test
badmintoncryer Jan 18, 2024
015a758
Merge branch 'main' into 26295-logExport
badmintoncryer Jan 18, 2024
b1218a8
fix: integ test
badmintoncryer Jan 19, 2024
59f0466
Merge branch 'main' into 26295-logExport
badmintoncryer Jan 19, 2024
bfc21d6
Revert "Merge branch 'main' into 26295-logExport"
badmintoncryer Jan 19, 2024
a1e707e
Revert "fix: integ test"
badmintoncryer Jan 19, 2024
9b595cd
Revert "Merge branch 'main' into 26295-logExport"
badmintoncryer Jan 19, 2024
b76c283
Revert "fix: integ test"
badmintoncryer Jan 19, 2024
a06e9aa
Revert "feat: feature flag"
badmintoncryer Jan 19, 2024
b9d99ca
Revert "feat: add feature flag"
badmintoncryer Jan 19, 2024
12249ec
Revert "test: integ test"
badmintoncryer Jan 19, 2024
61402fc
Merge branch 'main' into 26295-logExport
badmintoncryer Jan 19, 2024
3ceba53
fix
badmintoncryer Jan 19, 2024
f66f974
Merge branch 'main' into 26295-logExport
badmintoncryer Jan 23, 2024
82b453b
Merge branch 'main' into 26295-logExport
badmintoncryer Jan 23, 2024
0b0c0b7
Merge branch 'main' into 26295-logExport
paulhcsun Jan 25, 2024
68f4c5c
Merge branch 'main' into 26295-logExport
badmintoncryer Jan 26, 2024
9a3cbb0
Merge branch 'main' into 26295-logExport
paulhcsun Jan 26, 2024
cd32bd5
Merge branch 'main' into 26295-logExport
paulhcsun Jan 29, 2024
cef5ad3
Merge branch 'main' into 26295-logExport
paulhcsun Jan 29, 2024
9844c1d
Merge branch 'main' into 26295-logExport
paulhcsun Jan 29, 2024
3703619
Merge branch 'main' into 26295-logExport
paulhcsun Jan 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: add feature flag
  • Loading branch information
badmintoncryer committed Jan 18, 2024
commit 811d19a4166acdc4b9d65d6d97323c70c6c59c45
15 changes: 14 additions & 1 deletion packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ Flags come in three types:
| [@aws-cdk/aws-rds:auroraClusterChangeScopeOfInstanceParameterGroupWithEachParameters](#aws-cdkaws-rdsauroraclusterchangescopeofinstanceparametergroupwitheachparameters) | When enabled, a scope of InstanceParameterGroup for AuroraClusterInstance with each parameters will change. | 2.97.0 | (fix) |
| [@aws-cdk/aws-rds:preventRenderingDeprecatedCredentials](#aws-cdkaws-rdspreventrenderingdeprecatedcredentials) | When enabled, creating an RDS database cluster from a snapshot will only render credentials for snapshot credentials. | 2.98.0 | (fix) |
| [@aws-cdk/aws-codepipeline-actions:useNewDefaultBranchForCodeCommitSource](#aws-cdkaws-codepipeline-actionsusenewdefaultbranchforcodecommitsource) | When enabled, the CodeCommit source action is using the default branch name 'main'. | 2.103.1 | (fix) |
| [@aws-cdk/aws-neptune-alpha:useLogTypeInLogRetentionId](#aws-cdkaws-neptune-alphauselogtypeinlogretentionid)| When enabled, the LogRetention ID includes the logtype. | V2NEXT | (fix) |

<!-- END table -->

Expand Down Expand Up @@ -116,7 +117,8 @@ The following json shows the current recommended set of flags, as `cdk init` wou
"@aws-cdk/aws-rds:auroraClusterChangeScopeOfInstanceParameterGroupWithEachParameters": true,
"@aws-cdk/aws-appsync:useArnForSourceApiAssociationIdentifier": true,
"@aws-cdk/aws-rds:preventRenderingDeprecatedCredentials": true,
"@aws-cdk/aws-codepipeline-actions:useNewDefaultBranchForCodeCommitSource": true
"@aws-cdk/aws-codepipeline-actions:useNewDefaultBranchForCodeCommitSource": true,
"@aws-cdk/aws-neptune-alpha:useLogTypeInLogRetentionId": true
}
}
```
Expand Down Expand Up @@ -1193,4 +1195,15 @@ However, with the activation of this feature flag, the default branch is updated
| 2.103.1 | `false` | `true` |


### @aws-cdk/aws-neptune-alpha:useLogTypeInLogRetentionId

*When enabled, the log type is included in the log retention ID.* (fix)

When this feature flag is enabled, setting `LogRetention` during the creation of a `DatabaseCluster` will include the `logType` in the logical ID of the generated `LogRetention`. If the flag is set to false, the logical ID of `LogRetention` will contain the string 'objectObject' regardless of the logType.

| Since | Default | Recommended |
| ----- | ----- | ----- |
| (not in v1) | | |
| V2NEXT | `false` | `true` |

<!-- END details -->
14 changes: 14 additions & 0 deletions packages/aws-cdk-lib/cx-api/lib/features.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ export const RDS_PREVENT_RENDERING_DEPRECATED_CREDENTIALS = '@aws-cdk/aws-rds:pr
export const AURORA_CLUSTER_CHANGE_SCOPE_OF_INSTANCE_PARAMETER_GROUP_WITH_EACH_PARAMETERS = '@aws-cdk/aws-rds:auroraClusterChangeScopeOfInstanceParameterGroupWithEachParameters';
export const APPSYNC_ENABLE_USE_ARN_IDENTIFIER_SOURCE_API_ASSOCIATION = '@aws-cdk/aws-appsync:useArnForSourceApiAssociationIdentifier';
export const CODECOMMIT_SOURCE_ACTION_DEFAULT_BRANCH_NAME = '@aws-cdk/aws-codepipeline-actions:useNewDefaultBranchForCodeCommitSource';
export const NEPTUNE_ALPHA_USE_LOG_TYPE_IN_LOG_RETENTION_ID = '@aws-cdk/aws-neptune-alpha:useLogTypeInLogRetentionId';

export const FLAGS: Record<string, FlagInfo> = {
//////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -976,6 +977,19 @@ export const FLAGS: Record<string, FlagInfo> = {
introducedIn: { v2: '2.103.1' },
recommendedValue: true,
},

//////////////////////////////////////////////////////////////////////
[NEPTUNE_ALPHA_USE_LOG_TYPE_IN_LOG_RETENTION_ID]: {
type: FlagType.BugFix,
summary: 'When enabled, the Neptune log retention ID will include the log type.',
detailsMd: `
When this feature flag is enabled, setting \`LogRetention\` during the creation of a \`DatabaseCluster\`
will include the \`logType\` in the logical ID of the generated \`LogRetention\`.
If the flag is set to false, the logical ID of \`LogRetention\` will contain the string 'objectObject' regardless of the logType.
`,
introducedIn: { v2: 'V2NEXT' },
recommendedValue: true,
},
};

const CURRENT_MV = 'v2';
Expand Down