paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 21 Packages Projects Releases Wiki Activity

Merge pull request #18870 from backstage/renovate/luxon-3.x-lockfile

Browse Source 
fix(deps): update dependency luxon to v3.4.2
This commit is contained in:
Fredrik Adelöw
2023-09-04 11:54:23 +02:00
committed by GitHub
parent e2dd7b7bf2 814feeed73
commit 88a03f3e4d
21 changed files with 87 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.changeset/young-panthers-mix.md
+13
View File
@@ -0,0 +1,13 @@
---
'@backstage/plugin-tech-insights-backend': patch
'@backstage/plugin-microsoft-calendar': patch
'@backstage/plugin-scaffolder-backend': patch
'@backstage/plugin-catalog-backend': patch
'@backstage/backend-tasks': patch
'@backstage/plugin-cloudbuild': patch
'@backstage/plugin-gcalendar': patch
'@backstage/plugin-xcmetrics': patch
'@backstage/plugin-ilert': patch
---
Update to handle invalid luxon values
microsite/yarn.lock
+6 -6
View File
@@ -2950,9 +2950,9 @@ __metadata:
linkType: hard
"@types/luxon@npm:^3.0.0":
version: 3.3.0
resolution: "@types/luxon@npm:3.3.0"
checksum: f7e3a89fc3ca404fbc3ea538653ed6860bc28f570a8c4d6d24449b89b9b553b7d6ad6cc94a9e129c5b8c9a2b97f0c365b3017f811e59c4a859a9c219a1c918e0
version: 3.3.2
resolution: "@types/luxon@npm:3.3.2"
checksum: b9111132720eae0269538872a5a496b29587ecfc8edc3b0ff7d269aa93a5ff00a131b23d1e9d1f12ec39f2c779ad21bd8d9f90b122c85a182771aabde7f676b8
languageName: node
linkType: hard
@@ -7366,9 +7366,9 @@ __metadata:
linkType: hard
"luxon@npm:^3.0.0":
version: 3.3.0
resolution: "luxon@npm:3.3.0"
checksum: 50cf17a0dc155c3dcacbeae8c0b7e80db425e0ba97b9cbdf12a7fc142d841ff1ab1560919f033af46240ed44e2f70c49f76e3422524c7fc8bb8d81ca47c66187
version: 3.4.2
resolution: "luxon@npm:3.4.2"
checksum: efefdfaea90f4c8e502db8eb255385e6dac6733b6a9e1372eaf1a866cc1118363e235a3f6df505b837abc8bbcdfd8f0718a8de387b80cef9ee624d8791ca0844
languageName: node
linkType: hard
packages/backend-tasks/src/setupTests.ts
+4 -1
View File
@@ -14,4 +14,7 @@
* limitations under the License.
*/
export {};
import { Settings } from 'luxon';
// TS still thinks that methods can return null / placeholders, but we still want to throw as soon as possible when things go wrong
Settings.throwOnInvalid = true;
packages/backend-tasks/src/tasks/PluginTaskSchedulerImpl.ts
+9 -3
View File
@@ -112,9 +112,15 @@ export function parseDuration(
return frequency.cron;
}
if (Duration.isDuration(frequency)) {
return frequency.toISO();
const parsed = Duration.isDuration(frequency)
? frequency
: Duration.fromObject(frequency);
if (!parsed.isValid) {
throw new Error(
`Invalid duration, ${parsed.invalidReason}: ${parsed.invalidExplanation}`,
);
}
return Duration.fromObject(frequency).toISO();
return parsed.toISO()!;
}
packages/backend-tasks/src/tasks/TaskWorker.test.ts
+6 -6
View File
@@ -47,8 +47,8 @@ describe('TaskWorker', () => {
const settings: TaskSettingsV2 = {
version: 2,
cadence: '*/2 * * * * *',
initialDelayDuration: Duration.fromObject({ seconds: 1 }).toISO(),
timeoutAfterDuration: Duration.fromObject({ minutes: 1 }).toISO(),
initialDelayDuration: Duration.fromObject({ seconds: 1 }).toISO()!,
timeoutAfterDuration: Duration.fromObject({ minutes: 1 }).toISO()!,
};
const worker = new TaskWorker('task1', fn, knex, logger);
@@ -131,7 +131,7 @@ describe('TaskWorker', () => {
version: 2,
initialDelayDuration: undefined,
cadence: '* * * * * *',
timeoutAfterDuration: Duration.fromMillis(60000).toISO(),
timeoutAfterDuration: Duration.fromMillis(60000).toISO()!,
};
const checkFrequency = Duration.fromObject({ milliseconds: 100 });
const worker = new TaskWorker('task1', fn, knex, logger, checkFrequency);
@@ -154,7 +154,7 @@ describe('TaskWorker', () => {
version: 2,
initialDelayDuration: undefined,
cadence: '* * * * * *',
timeoutAfterDuration: Duration.fromMillis(60000).toISO(),
timeoutAfterDuration: Duration.fromMillis(60000).toISO()!,
};
const checkFrequency = Duration.fromObject({ milliseconds: 100 });
const worker = new TaskWorker('task1', fn, knex, logger, checkFrequency);
@@ -179,7 +179,7 @@ describe('TaskWorker', () => {
version: 2,
initialDelayDuration: undefined,
cadence: '* * * * * *',
timeoutAfterDuration: Duration.fromMillis(60000).toISO(),
timeoutAfterDuration: Duration.fromMillis(60000).toISO()!,
};
const worker = new TaskWorker('task1', fn, knex, logger);
@@ -235,7 +235,7 @@ describe('TaskWorker', () => {
version: 2,
initialDelayDuration: undefined,
cadence: '* * * * * *',
timeoutAfterDuration: Duration.fromMillis(60000).toISO(),
timeoutAfterDuration: Duration.fromMillis(60000).toISO()!,
};
const worker1 = new TaskWorker('task1', fn, knex, logger);
plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
+1 -1
View File
@@ -375,7 +375,7 @@ export class DefaultProcessingDatabase implements ProcessingDatabase {
entityRef,
newLocationKey: locationKey,
existingLocationKey: conflictingKey,
lastConflictAt: DateTime.now().toISO(),
lastConflictAt: DateTime.now().toISO()!,
},
};
await this.options.eventBroker?.publish(eventParams);
plugins/cloudbuild/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx
+1 -1
View File
@@ -87,7 +87,7 @@ const generatedColumns: TableColumn[] = [
title: 'Created',
render: (row: Partial<WorkflowRun>) => (
<Typography data-testid="cell-created" variant="body2" noWrap>
{DateTime.fromISO(row.createTime ?? DateTime.now().toISO()).toFormat(
{DateTime.fromISO(row.createTime ?? DateTime.now().toISO()!).toFormat(
'dd-MM-yyyy hh:mm:ss',
)}
</Typography>
plugins/gcalendar/dev/mocks.ts
+3 -2
View File
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { DateTime } from 'luxon';
import { GCalendar, GCalendarEvent } from '../src/api';
@@ -38,11 +39,11 @@ export const eventsMock: GCalendarEvent[] = [...Array(3).keys()].map(i => ({
start: {
dateTime: DateTime.now()
.minus({ hour: i + 1 })
.toISO(),
.toISO()!,
timeZone: 'Europe/London',
},
end: {
dateTime: DateTime.now().minus({ hour: i }).toISO(),
dateTime: DateTime.now().minus({ hour: i }).toISO()!,
timeZone: 'Europe/London',
},
description: '<h3>Dummy title</h3><p>Dummy description</p>',
plugins/gcalendar/src/components/CalendarCard/CalendarCard.tsx
+4 -3
View File
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { sortBy } from 'lodash';
import { DateTime } from 'luxon';
import React, { useState } from 'react';
@@ -67,9 +68,9 @@ export const CalendarCard = () => {
calendars,
selectedCalendars: storedCalendars,
enabled: isSignedIn && calendars.length > 0,
timeMin: date.startOf('day').toISO(),
timeMax: date.endOf('day').toISO(),
timeZone: date.zoneName,
timeMin: date.startOf('day').toISO()!,
timeMax: date.endOf('day').toISO()!,
timeZone: date.zoneName ?? 'UTC', // TODO: Use browser timezone? This probably never happens anyway
});
const showLoader =
plugins/gcalendar/src/hooks/useEventsQuery.ts
+1
View File
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { compact, unescape } from 'lodash';
import { useMemo } from 'react';
import { useQueries } from '@tanstack/react-query';
plugins/ilert/src/components/Shift/ShiftOverrideModal.tsx
+3 -2
View File
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import React from 'react';
import { makeStyles } from '@material-ui/core/styles';
import Button from '@material-ui/core/Button';
@@ -161,7 +162,7 @@ export const ShiftOverrideModal = ({
value={start}
className={classes.formControl}
onChange={date => {
setStart(date ? date.toISO() : '');
setStart(date?.toISO() ?? '');
}}
/>
<DateTimePicker
@@ -173,7 +174,7 @@ export const ShiftOverrideModal = ({
value={end}
className={classes.formControl}
onChange={date => {
setEnd(date ? date.toISO() : '');
setEnd(date?.toISO() ?? '');
}}
/>
</MuiPickersUtilsProvider>
plugins/kubernetes/src/components/Pods/PodDrawer/PendingPodContent.test.tsx
Generated
+4 -3
View File
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import React from 'react';
import { render } from '@testing-library/react';
@@ -44,7 +45,7 @@ const podWithConditions = (conditions: IPodCondition[]): any => {
describe('PendingPodContent', () => {
it('show startup conditions - all healthy', async () => {
const oneDayAgo = DateTime.now().minus({ days: 1 }).toISO();
const oneDayAgo = DateTime.now().minus({ days: 1 }).toISO()!;
const { getByText, queryByLabelText, queryAllByLabelText } = render(
wrapInTestApp(
<PendingPodContent
@@ -87,7 +88,7 @@ describe('PendingPodContent', () => {
expect(queryByLabelText('Status error')).not.toBeInTheDocument();
});
it('show startup conditions - all fail', async () => {
const oneHourAgo = DateTime.now().minus({ hours: 1 }).toISO();
const oneHourAgo = DateTime.now().minus({ hours: 1 }).toISO()!;
const { getByText, queryByLabelText, queryAllByLabelText } = render(
wrapInTestApp(
<PendingPodContent
@@ -154,7 +155,7 @@ describe('PendingPodContent', () => {
expect(queryAllByLabelText('Status error')).toHaveLength(4);
});
it('show startup conditions - show unknown', async () => {
const oneHourAgo = DateTime.now().minus({ hours: 1 }).toISO();
const oneHourAgo = DateTime.now().minus({ hours: 1 }).toISO()!;
const { getByText, queryByLabelText, getByLabelText } = render(
wrapInTestApp(
<PendingPodContent
plugins/microsoft-calendar/src/components/CalendarCard.tsx
+4 -3
View File
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { sortBy } from 'lodash';
import { DateTime } from 'luxon';
import React, { useState } from 'react';
@@ -56,9 +57,9 @@ export const CalendarCard = () => {
const { data: events, isLoading: isEventLoading } = useEventsQuery({
calendarId: selectedCalendarId || defaultCalendarId || '',
enabled: isSignedIn && calendars.length > 0,
timeMin: date.startOf('day').toISO(),
timeMax: date.endOf('day').toISO(),
timeZone: date.zoneName,
timeMin: date.startOf('day').toISO()!,
timeMax: date.endOf('day').toISO()!,
timeZone: date.zoneName ?? undefined,
});
const showLoader =
plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
+8 -2
View File
@@ -69,7 +69,7 @@ export type DatabaseTaskStoreOptions = {
};
/**
* Typeguard to help DatabaseTaskStore understand when database is PluginDatabaseManager vs. when database is a Knex instance.
* Type guard to help DatabaseTaskStore understand when database is PluginDatabaseManager vs. when database is a Knex instance.
*
* * @public
*/
@@ -81,7 +81,13 @@ function isPluginDatabaseManager(
const parseSqlDateToIsoString = <T>(input: T): T | string => {
if (typeof input === 'string') {
return DateTime.fromSQL(input, { zone: 'UTC' }).toISO();
const parsed = DateTime.fromSQL(input, { zone: 'UTC' });
if (!parsed.isValid) {
throw new Error(
`Failed to parse database timestamp '${input}', ${parsed.invalidReason}: ${parsed.invalidExplanation}`,
);
}
return parsed.toISO()!;
}
return input;
plugins/scaffolder/src/components/ListTasksPage/columns/CreatedAtColumn.test.tsx
+1 -1
View File
@@ -23,7 +23,7 @@ import { DateTime } from 'luxon';
describe('<CreatedAtColumn />', () => {
it('should render the column with the time', async () => {
const props = {
createdAt: DateTime.now().toISO(),
createdAt: DateTime.now().toISO()!,
};
const { getByText } = await renderInTestApp(<CreatedAtColumn {...props} />);
plugins/sentry/src/components/SentryIssuesTable/SentryIssuesTable.test.tsx
+1 -1
View File
@@ -63,7 +63,7 @@ describe('SentryIssuesTable', () => {
},
count: '101',
userCount: 202,
lastSeen: DateTime.now().toISO(),
lastSeen: DateTime.now().toISO()!,
},
];
const table = await renderInTestApp(
plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.test.ts
+6 -6
View File
@@ -74,13 +74,13 @@ const secondSchema = {
}),
};
const now = DateTime.now().toISO();
const now = DateTime.now().toISO()!;
const shortlyInTheFuture = DateTime.now()
.plus(Duration.fromMillis(555))
.toISO();
.toISO()!;
const farInTheFuture = DateTime.now()
.plus(Duration.fromMillis(555666777))
.toISO();
.toISO()!;
const facts = [
{
@@ -127,13 +127,13 @@ const sameFactsDiffDateSchema = {
}),
};
const sameFactsDiffDateNow = DateTime.now().toISO();
const sameFactsDiffDateNow = DateTime.now().toISO()!;
const sameFactsDiffDateNearFuture = DateTime.now()
.plus(Duration.fromMillis(555))
.toISO();
.toISO()!;
const sameFactsDiffDateFuture = DateTime.now()
.plus(Duration.fromMillis(1000))
.toISO();
.toISO()!;
const multipleSameFacts = [
{
plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts
+3 -1
View File
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { Knex } from 'knex';
import {
FactLifecycle,
@@ -105,12 +106,13 @@ export class TechInsightsDatabase implements TechInsightsStore {
if (facts.length === 0) return;
const currentSchema = await this.getLatestSchema(id);
const factRows = facts.map(it => {
const ts = it.timestamp?.toISO();
return {
id,
version: currentSchema.version,
entity: stringifyEntityRef(it.entity),
facts: JSON.stringify(it.facts),
...(it.timestamp && { timestamp: it.timestamp.toISO() }),
...(ts && { timestamp: ts }),
};
});
plugins/xcmetrics/src/components/BuildList/BuildList.test.tsx
+1
View File
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import React from 'react';
import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
import { BuildList } from './BuildList';
plugins/xcmetrics/src/components/BuildList/BuildList.tsx
+2 -2
View File
@@ -39,8 +39,8 @@ export const BuildList = () => {
const tableRef = useRef<any>();
const initialFilters = {
from: DateTime.now().minus({ years: 1 }).toISODate(),
to: DateTime.now().toISODate(),
from: DateTime.now().minus({ years: 1 }).toISODate()!,
to: DateTime.now().toISODate()!,
};
const [filters, setFilters] = useState<BuildFilters>(initialFilters);
yarn.lock
+6 -6
View File
@@ -17819,9 +17819,9 @@ __metadata:
linkType: hard
"@types/luxon@npm:*, @types/luxon@npm:^3.0.0":
version: 3.2.0
resolution: "@types/luxon@npm:3.2.0"
checksum: 051bfbf841c6ce98728df6538342ce4aaddfcf0ec6e8b473e0195dcfc3ba6b1fe4b3ce17f2ba6d25344f41cb70032c1debe96da9e384e5f6e639665c1e6d368c
version: 3.3.2
resolution: "@types/luxon@npm:3.3.2"
checksum: b9111132720eae0269538872a5a496b29587ecfc8edc3b0ff7d269aa93a5ff00a131b23d1e9d1f12ec39f2c779ad21bd8d9f90b122c85a182771aabde7f676b8
languageName: node
linkType: hard
@@ -32024,9 +32024,9 @@ __metadata:
linkType: hard
"luxon@npm:^3.0.0, luxon@npm:^3.2.1, luxon@npm:^3.3.0":
version: 3.3.0
resolution: "luxon@npm:3.3.0"
checksum: 50cf17a0dc155c3dcacbeae8c0b7e80db425e0ba97b9cbdf12a7fc142d841ff1ab1560919f033af46240ed44e2f70c49f76e3422524c7fc8bb8d81ca47c66187
version: 3.4.2
resolution: "luxon@npm:3.4.2"
checksum: efefdfaea90f4c8e502db8eb255385e6dac6733b6a9e1372eaf1a866cc1118363e235a3f6df505b837abc8bbcdfd8f0718a8de387b80cef9ee624d8791ca0844
languageName: node
linkType: hard