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.

Sign up for GitHub

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

Jump to bottom

chore(logs): migrate log retention handler #27814

Merged
merged 16 commits into from
Nov 17, 2023
Merged

chore(logs): migrate log retention handler #27814

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
294b563
migrated log retention provider
colifran Nov 2, 2023
85c570e
fix unit test
colifran Nov 2, 2023
bafe6e2
snaps
colifran Nov 2, 2023
af37d2d
rename provider to handler
colifran Nov 3, 2023
c19b531
snaps
colifran Nov 3, 2023
15b4236
snaps
colifran Nov 3, 2023
89808ce
fix path
colifran Nov 3, 2023
25d2604
fix path
colifran Nov 3, 2023
f718f05
snaps
colifran Nov 3, 2023
1cc62d1
snaps
colifran Nov 3, 2023
a821bb8
Merge branch 'main' into colifran/migrate-log-retention
colifran Nov 9, 2023
6effb12
snaps
colifran Nov 9, 2023
5934581
Merge branch 'main' into colifran/migrate-log-retention
colifran Nov 16, 2023
245329d
Merge branch 'main' into colifran/migrate-log-retention
colifran Nov 17, 2023
4131220
dependencies
colifran Nov 17, 2023
0551837
Merge branch 'main' into colifran/migrate-log-retention
mergify[bot] Nov 17, 2023
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
0 ...-logs/lib/log-retention-provider/index.ts → .../aws-logs/log-retention-provider/index.ts
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions packages/@aws-cdk/custom-resource-handlers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"@aws-sdk/client-synthetics": "^3.421.0",
"@aws-sdk/client-ecr": "^3.421.0",
"@aws-sdk/client-s3": "^3.421.0",
"@aws-sdk/client-cloudwatch-logs": "^3.441.0",
"aws-sdk": "^2.1466.0"
},
"repository": {
Expand Down
4 changes: 2 additions & 2 deletions ...-logs/test/log-retention-provider.test.ts → ...t/aws-logs/log-retention-provider.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { CloudWatchLogsClient, CloudWatchLogsClientResolvedConfig, CreateLogGrou
import { AwsStub, mockClient } from 'aws-sdk-client-mock';
import 'aws-sdk-client-mock-jest';
import * as nock from 'nock';
import * as provider from '../lib/log-retention-provider';
import * as provider from '../../lib/aws-logs/log-retention-provider/index';

const cloudwatchLogsMock = mockClient(CloudWatchLogsClient);
const OPERATION_ABORTED = new OperationAbortedException({ message: '', $metadata: {} });
Expand Down Expand Up @@ -73,7 +73,7 @@ describe('log retention provider', () => {

expect(cloudwatchLogsMock).toHaveReceivedCommandWith(PutRetentionPolicyCommand, {
logGroupName: 'group',
retentionInDays: 30,
retentionInDays: 29,
});

expect(cloudwatchLogsMock).toHaveReceivedCommandWith(CreateLogGroupCommand, {
Expand Down
Empty file removed packages/aws-cdk-lib/aws-logs/lib/log-retention-provider/.is_custom_resource
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-logs/lib/log-retention.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ class LogRetentionFunction extends Construct implements cdk.ITaggable {
super(scope, id);

const asset = new s3_assets.Asset(this, 'Code', {
path: path.join(__dirname, 'log-retention-provider'),
path: path.join(__dirname, '..', '..', 'custom-resource-handlers', 'dist', 'aws-logs', 'log-retention-provider'),
});

const role = props.role || new iam.Role(this, 'ServiceRole', {
Expand Down
Loading
Loading