Skip to content

Commit 88e8058

Browse files
authored
Merge pull request #148 from iDVB/dvb-destructure
fix(cdk-contentful-webhook): Fix extra props
2 parents 597b63d + d3b0397 commit 88e8058

3 files changed

Lines changed: 14 additions & 8 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"timestamp":1639256525239,"files":[{"filename":"contentful-webhook/index.js","previous":225836,"size":226445,"diff":609}]},{"timestamp":1639158550913,"files":[{"filename":"contentful-webhook/index.js","previous":225902,"size":225836,"diff":-66}]},{"timestamp":1637517394655,"files":[{"filename":"contentful-webhook/index.js","previous":225899,"size":225902,"diff":3}]},{"timestamp":1633809671663,"files":[{"filename":"contentful-webhook/index.js","previous":231384,"size":225899,"diff":-5485}]},{"timestamp":1633807456780,"files":[{"filename":"contentful-webhook/index.js","previous":231381,"size":231384,"diff":3}]},{"timestamp":1620565790484,"files":[{"filename":"contentful-webhook/index.js","previous":231292,"size":231381,"diff":89}]},{"timestamp":1620265629961,"files":[{"filename":"contentful-webhook/index.js","previous":231381,"size":231292,"diff":-89}]},{"timestamp":1615923664936,"files":[{"filename":"contentful-webhook/index.js","previous":1050356,"size":231381,"diff":-818975}]},{"timestamp":1615923376037,"files":[{"filename":"contentful-webhook/index.js","previous":1047464,"size":1050356,"diff":2892}]},{"timestamp":1615809010241,"files":[{"filename":"contentful-webhook/index.js","previous":221347,"size":1047464,"diff":826117}]},{"timestamp":1615022511778,"files":[{"filename":"contentful-webhook/index.js","previous":221344,"size":221347,"diff":3}]},{"timestamp":1609970894222,"files":[{"filename":"contentful-webhook/index.js","previous":217379,"size":221344,"diff":3965}]},{"timestamp":1609970375754,"files":[{"filename":"contentful-webhook/index.js","previous":203415,"size":217379,"diff":13964}]},{"timestamp":1607360020128,"files":[{"filename":"contentful-webhook/index.js","previous":203418,"size":203415,"diff":-3}]},{"timestamp":1600966253111,"files":[{"filename":"contentful-webhook/index.js","previous":203440,"size":203418,"diff":-22}]},{"timestamp":1599246565057,"files":[{"filename":"contentful-webhook/index.js","previous":202993,"size":203440,"diff":447}]},{"timestamp":1598552652514,"files":[{"filename":"contentful-webhook/index.js","previous":202992,"size":202993,"diff":1}]},{"timestamp":1596542526761,"files":[{"filename":"contentful-webhook/index.js","previous":207102,"size":202992,"diff":-4110}]},{"timestamp":1596540034638,"files":[{"filename":"contentful-webhook/index.js","previous":206593,"size":207102,"diff":509}]},{"timestamp":1596457456615,"files":[{"filename":"contentful-webhook/index.js","previous":206357,"size":206593,"diff":236}]},{"timestamp":1596440551356,"files":[{"filename":"contentful-webhook/index.js","previous":206424,"size":206357,"diff":-67}]},{"timestamp":1596437759972,"files":[{"filename":"contentful-webhook/index.js","previous":541950,"size":206424,"diff":-335526}]},{"timestamp":1596413723535,"files":[{"filename":"contentful-webhook/index.js","previous":542071,"size":541950,"diff":-121}]},{"timestamp":1596407623809,"files":[{"filename":"contentful-webhook/index.js","previous":191169,"size":542071,"diff":350902}]}]
1+
[{"timestamp":1642105366703,"files":[{"filename":"contentful-webhook/index.js","previous":226418,"size":226436,"diff":18}]},{"timestamp":1642088368683,"files":[{"filename":"contentful-webhook/index.js","previous":226447,"size":226418,"diff":-29}]},{"timestamp":1642087349625,"files":[{"filename":"contentful-webhook/index.js","previous":226445,"size":226447,"diff":2}]},{"timestamp":1639256525239,"files":[{"filename":"contentful-webhook/index.js","previous":225836,"size":226445,"diff":609}]},{"timestamp":1639158550913,"files":[{"filename":"contentful-webhook/index.js","previous":225902,"size":225836,"diff":-66}]},{"timestamp":1637517394655,"files":[{"filename":"contentful-webhook/index.js","previous":225899,"size":225902,"diff":3}]},{"timestamp":1633809671663,"files":[{"filename":"contentful-webhook/index.js","previous":231384,"size":225899,"diff":-5485}]},{"timestamp":1633807456780,"files":[{"filename":"contentful-webhook/index.js","previous":231381,"size":231384,"diff":3}]},{"timestamp":1620565790484,"files":[{"filename":"contentful-webhook/index.js","previous":231292,"size":231381,"diff":89}]},{"timestamp":1620265629961,"files":[{"filename":"contentful-webhook/index.js","previous":231381,"size":231292,"diff":-89}]},{"timestamp":1615923664936,"files":[{"filename":"contentful-webhook/index.js","previous":1050356,"size":231381,"diff":-818975}]},{"timestamp":1615923376037,"files":[{"filename":"contentful-webhook/index.js","previous":1047464,"size":1050356,"diff":2892}]},{"timestamp":1615809010241,"files":[{"filename":"contentful-webhook/index.js","previous":221347,"size":1047464,"diff":826117}]},{"timestamp":1615022511778,"files":[{"filename":"contentful-webhook/index.js","previous":221344,"size":221347,"diff":3}]},{"timestamp":1609970894222,"files":[{"filename":"contentful-webhook/index.js","previous":217379,"size":221344,"diff":3965}]},{"timestamp":1609970375754,"files":[{"filename":"contentful-webhook/index.js","previous":203415,"size":217379,"diff":13964}]},{"timestamp":1607360020128,"files":[{"filename":"contentful-webhook/index.js","previous":203418,"size":203415,"diff":-3}]},{"timestamp":1600966253111,"files":[{"filename":"contentful-webhook/index.js","previous":203440,"size":203418,"diff":-22}]},{"timestamp":1599246565057,"files":[{"filename":"contentful-webhook/index.js","previous":202993,"size":203440,"diff":447}]},{"timestamp":1598552652514,"files":[{"filename":"contentful-webhook/index.js","previous":202992,"size":202993,"diff":1}]},{"timestamp":1596542526761,"files":[{"filename":"contentful-webhook/index.js","previous":207102,"size":202992,"diff":-4110}]},{"timestamp":1596540034638,"files":[{"filename":"contentful-webhook/index.js","previous":206593,"size":207102,"diff":509}]},{"timestamp":1596457456615,"files":[{"filename":"contentful-webhook/index.js","previous":206357,"size":206593,"diff":236}]},{"timestamp":1596440551356,"files":[{"filename":"contentful-webhook/index.js","previous":206424,"size":206357,"diff":-67}]},{"timestamp":1596437759972,"files":[{"filename":"contentful-webhook/index.js","previous":541950,"size":206424,"diff":-335526}]},{"timestamp":1596413723535,"files":[{"filename":"contentful-webhook/index.js","previous":542071,"size":541950,"diff":-121}]},{"timestamp":1596407623809,"files":[{"filename":"contentful-webhook/index.js","previous":191169,"size":542071,"diff":350902}]}]

packages/cdk-contentful-webhook/src/lambdas/contentful-webhook/index.ts

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ export interface WebhookProps {
1818
name: string;
1919
url: string;
2020
topics: string[];
21+
serviceToken?: string;
22+
logLevel?: string;
2123
}
2224

2325
const getSpace = async (accessToken: string, spaceId: string) => {
@@ -29,9 +31,11 @@ const getSpace = async (accessToken: string, spaceId: string) => {
2931
};
3032

3133
const handleCreate: OnCreateHandler = async (event): Promise<ResourceHandlerReturn> => {
32-
const { accessTokenString, spaceId, ...props } = camelizeKeys<WebhookProps, CloudFormationCustomResourceEventCommon['ResourceProperties']>(
33-
event.ResourceProperties,
34-
);
34+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
35+
const { accessTokenString, spaceId, serviceToken, logLevel, ...props } = camelizeKeys<
36+
WebhookProps,
37+
CloudFormationCustomResourceEventCommon['ResourceProperties']
38+
>(event.ResourceProperties);
3539

3640
const secretKey = new SecretKey(accessTokenString);
3741
const accessToken = await secretKey.getValue();
@@ -51,9 +55,11 @@ const handleCreate: OnCreateHandler = async (event): Promise<ResourceHandlerRetu
5155
};
5256

5357
const handleUpdate: OnUpdateHandler = async (event): Promise<ResourceHandlerReturn> => {
54-
const { accessTokenString, spaceId, ...props } = camelizeKeys<WebhookProps, CloudFormationCustomResourceEventCommon['ResourceProperties']>(
55-
event.ResourceProperties,
56-
);
58+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
59+
const { accessTokenString, spaceId, serviceToken, logLevel, ...props } = camelizeKeys<
60+
WebhookProps,
61+
CloudFormationCustomResourceEventCommon['ResourceProperties']
62+
>(event.ResourceProperties);
5763

5864
const secretKey = new SecretKey(accessTokenString);
5965
const accessToken = await secretKey.getValue();
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"timestamp":1639256526267,"files":[{"filename":"github-webhook/index.js","previous":262001,"size":262354,"diff":353}]},{"timestamp":1639158552522,"files":[{"filename":"github-webhook/index.js","previous":262040,"size":262001,"diff":-39}]},{"timestamp":1637517397296,"files":[{"filename":"github-webhook/index.js","previous":262039,"size":262040,"diff":1}]},{"timestamp":1633809689104,"files":[{"filename":"github-webhook/index.js","previous":193368,"size":262039,"diff":68671}]},{"timestamp":1633809137901,"files":[{"filename":"github-webhook/index.js","previous":191869,"size":193368,"diff":1499}]},{"timestamp":1622147586657,"files":[{"filename":"github-webhook/index.js","previous":191792,"size":191869,"diff":77}]},{"timestamp":1620565795835,"files":[{"filename":"github-webhook/index.js","previous":191427,"size":191792,"diff":365}]},{"timestamp":1620265643898,"files":[{"filename":"github-webhook/index.js","previous":191792,"size":191427,"diff":-365}]},{"timestamp":1619038419269,"files":[{"filename":"github-webhook/index.js","previous":191797,"size":191792,"diff":-5}]},{"timestamp":1617394285426,"files":[{"filename":"github-webhook/index.js","previous":191760,"size":191797,"diff":37}]},{"timestamp":1616697789259,"files":[{"filename":"github-webhook/index.js","previous":191665,"size":191760,"diff":95}]},{"timestamp":1615923673723,"files":[{"filename":"github-webhook/index.js","previous":1011459,"size":191665,"diff":-819794}]},{"timestamp":1615923385141,"files":[{"filename":"github-webhook/index.js","previous":1008634,"size":1011459,"diff":2825}]},{"timestamp":1615809019316,"files":[{"filename":"github-webhook/index.js","previous":182432,"size":1008634,"diff":826202}]},{"timestamp":1615023549795,"files":[{"filename":"github-webhook/index.js","previous":182255,"size":182432,"diff":177}]},{"timestamp":1615022566740,"files":[{"filename":"github-webhook/index.js","previous":181954,"size":182255,"diff":301}]},{"timestamp":1614104217580,"files":[{"filename":"github-webhook/index.js","previous":181904,"size":181954,"diff":50}]},{"timestamp":1612464188131,"files":[{"filename":"github-webhook/index.js","previous":181855,"size":181904,"diff":49}]},{"timestamp":1611769329263,"files":[{"filename":"github-webhook/index.js","previous":181805,"size":181855,"diff":50}]},{"timestamp":1609970949480,"files":[{"filename":"github-webhook/index.js","previous":179020,"size":181805,"diff":2785}]},{"timestamp":1607360063925,"files":[{"filename":"github-webhook/index.js","previous":178533,"size":179020,"diff":487}]},{"timestamp":1606896280100,"files":[{"filename":"github-webhook/index.js","previous":177980,"size":178533,"diff":553}]},{"timestamp":1606329557431,"files":[{"filename":"github-webhook/index.js","previous":177960,"size":177980,"diff":20}]},{"timestamp":1604259061964,"files":[{"filename":"github-webhook/index.js","previous":177961,"size":177960,"diff":-1}]},{"timestamp":1600966304194,"files":[{"filename":"github-webhook/index.js","previous":177682,"size":177961,"diff":279}]},{"timestamp":1599246609676,"files":[{"filename":"github-webhook/index.js","previous":177721,"size":177682,"diff":-39}]},{"timestamp":1596542584192,"files":[{"filename":"github-webhook/index.js","previous":181657,"size":177721,"diff":-3936}]},{"timestamp":1596540416823,"files":[{"filename":"github-webhook/index.js","previous":181110,"size":181657,"diff":547}]},{"timestamp":1596457756702,"files":[{"filename":"github-webhook/index.js","previous":181095,"size":181110,"diff":15}]},{"timestamp":1596455025723,"files":[{"filename":"github-webhook/index.js","previous":473647,"size":181095,"diff":-292552}]},{"timestamp":1596407673941,"files":[{"filename":"github-webhook/index.js","previous":332785,"size":473647,"diff":140862}]}]
1+
[{"timestamp":1642087662545,"files":[{"filename":"github-webhook/index.js","previous":262354,"size":262322,"diff":-32}]},{"timestamp":1639256526267,"files":[{"filename":"github-webhook/index.js","previous":262001,"size":262354,"diff":353}]},{"timestamp":1639158552522,"files":[{"filename":"github-webhook/index.js","previous":262040,"size":262001,"diff":-39}]},{"timestamp":1637517397296,"files":[{"filename":"github-webhook/index.js","previous":262039,"size":262040,"diff":1}]},{"timestamp":1633809689104,"files":[{"filename":"github-webhook/index.js","previous":193368,"size":262039,"diff":68671}]},{"timestamp":1633809137901,"files":[{"filename":"github-webhook/index.js","previous":191869,"size":193368,"diff":1499}]},{"timestamp":1622147586657,"files":[{"filename":"github-webhook/index.js","previous":191792,"size":191869,"diff":77}]},{"timestamp":1620565795835,"files":[{"filename":"github-webhook/index.js","previous":191427,"size":191792,"diff":365}]},{"timestamp":1620265643898,"files":[{"filename":"github-webhook/index.js","previous":191792,"size":191427,"diff":-365}]},{"timestamp":1619038419269,"files":[{"filename":"github-webhook/index.js","previous":191797,"size":191792,"diff":-5}]},{"timestamp":1617394285426,"files":[{"filename":"github-webhook/index.js","previous":191760,"size":191797,"diff":37}]},{"timestamp":1616697789259,"files":[{"filename":"github-webhook/index.js","previous":191665,"size":191760,"diff":95}]},{"timestamp":1615923673723,"files":[{"filename":"github-webhook/index.js","previous":1011459,"size":191665,"diff":-819794}]},{"timestamp":1615923385141,"files":[{"filename":"github-webhook/index.js","previous":1008634,"size":1011459,"diff":2825}]},{"timestamp":1615809019316,"files":[{"filename":"github-webhook/index.js","previous":182432,"size":1008634,"diff":826202}]},{"timestamp":1615023549795,"files":[{"filename":"github-webhook/index.js","previous":182255,"size":182432,"diff":177}]},{"timestamp":1615022566740,"files":[{"filename":"github-webhook/index.js","previous":181954,"size":182255,"diff":301}]},{"timestamp":1614104217580,"files":[{"filename":"github-webhook/index.js","previous":181904,"size":181954,"diff":50}]},{"timestamp":1612464188131,"files":[{"filename":"github-webhook/index.js","previous":181855,"size":181904,"diff":49}]},{"timestamp":1611769329263,"files":[{"filename":"github-webhook/index.js","previous":181805,"size":181855,"diff":50}]},{"timestamp":1609970949480,"files":[{"filename":"github-webhook/index.js","previous":179020,"size":181805,"diff":2785}]},{"timestamp":1607360063925,"files":[{"filename":"github-webhook/index.js","previous":178533,"size":179020,"diff":487}]},{"timestamp":1606896280100,"files":[{"filename":"github-webhook/index.js","previous":177980,"size":178533,"diff":553}]},{"timestamp":1606329557431,"files":[{"filename":"github-webhook/index.js","previous":177960,"size":177980,"diff":20}]},{"timestamp":1604259061964,"files":[{"filename":"github-webhook/index.js","previous":177961,"size":177960,"diff":-1}]},{"timestamp":1600966304194,"files":[{"filename":"github-webhook/index.js","previous":177682,"size":177961,"diff":279}]},{"timestamp":1599246609676,"files":[{"filename":"github-webhook/index.js","previous":177721,"size":177682,"diff":-39}]},{"timestamp":1596542584192,"files":[{"filename":"github-webhook/index.js","previous":181657,"size":177721,"diff":-3936}]},{"timestamp":1596540416823,"files":[{"filename":"github-webhook/index.js","previous":181110,"size":181657,"diff":547}]},{"timestamp":1596457756702,"files":[{"filename":"github-webhook/index.js","previous":181095,"size":181110,"diff":15}]},{"timestamp":1596455025723,"files":[{"filename":"github-webhook/index.js","previous":473647,"size":181095,"diff":-292552}]},{"timestamp":1596407673941,"files":[{"filename":"github-webhook/index.js","previous":332785,"size":473647,"diff":140862}]}]

0 commit comments

Comments
 (0)