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

feat: [M3-6965] - Update api-v4 and mocks for DC-specific pricing #9586

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@linode/api-v4": Upcoming Features
---

Update account and linode types for DC-specific pricing ([#9586](https://github.com/linode/manager/pull/9586))
4 changes: 2 additions & 2 deletions packages/api-v4/src/account/account.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import {
AccountSettings,
CancelAccount,
CancelAccountPayload,
NetworkUtilization,
Agreements,
RegionalNetworkUtilization,
} from './types';

/**
Expand All @@ -31,7 +31,7 @@ export const getAccountInfo = () => {
*
*/
export const getNetworkUtilization = () =>
Request<NetworkUtilization>(
Request<RegionalNetworkUtilization>(
setURL(`${API_ROOT}/account/transfer`),
setMethod('GET')
);
Expand Down
8 changes: 8 additions & 0 deletions packages/api-v4/src/account/types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { APIWarning } from '../types';
import { Beta } from '../betas/types';
import { Region } from 'src/regions';

export interface User {
username: string;
Expand Down Expand Up @@ -117,6 +118,7 @@ export interface InvoiceItem {
unit_price: null | string;
tax: number;
total: number;
region: Region['id'];
}

export interface Payment {
Expand Down Expand Up @@ -171,6 +173,12 @@ export interface NetworkUtilization {
used: number;
quota: number;
}
export interface RegionalNetworkUtilization extends NetworkUtilization {
region_transfers: RegionalTransferObject[];
}
export interface RegionalTransferObject extends NetworkUtilization {
id: Region['id'];
}

export interface NetworkTransfer {
bytes_in: number;
Expand Down
2 changes: 1 addition & 1 deletion packages/api-v4/src/linodes/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ export interface LinodeType extends BaseType {
price: PriceObject;
region_prices: RegionPriceObject[];
addons: {
backups: { price: PriceObject };
backups: { price: PriceObject; region_prices: RegionPriceObject[] };
};
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@linode/manager": Upcoming Features
---

Update mocks for DC-specific pricing API responses ([#9586](https://github.com/linode/manager/pull/9586))
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,18 @@ export const Default: Story = {
hourly: 0.0015,
monthly: 5,
},
region_prices: [
{
hourly: 0.0048,
id: 'id-cgk',
monthly: 3.57,
},
{
hourly: 0.0056,
id: 'br-gru',
monthly: 4.17,
},
],
},
},
class: 'standard',
Expand Down
8 changes: 6 additions & 2 deletions packages/manager/src/factories/account.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
Account,
ActivePromotion,
NetworkUtilization,
RegionalNetworkUtilization,
} from '@linode/api-v4/lib/account/types';
import * as Factory from 'factory.ts';

Expand Down Expand Up @@ -60,10 +60,14 @@ export const accountFactory = Factory.Sync.makeFactory<Account>({
zip: '19106',
});

export const accountTransferFactory = Factory.Sync.makeFactory<NetworkUtilization>(
export const accountTransferFactory = Factory.Sync.makeFactory<RegionalNetworkUtilization>(
{
billable: 0,
quota: 11347,
used: 50,
region_transfers: [
{ id: 'id-cgk', billable: 0, quota: 10000, used: 10 },
{ id: 'br-gru', billable: 0, quota: 15000, used: 20 },
],
}
);
1 change: 1 addition & 0 deletions packages/manager/src/factories/billing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export const invoiceItemFactory = Factory.Sync.makeFactory<InvoiceItem>({
from: '2020-01-01T12:00:00',
label: Factory.each((i) => `Nanode 1GB - my-linode-${i} (${i})`),
quantity: 730,
region: 'id-cgk',
tax: 0,
to: '2020-01-31T12:00:00',
total: 5,
Expand Down
32 changes: 30 additions & 2 deletions packages/manager/src/factories/linodes.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NetworkUtilization } from '@linode/api-v4/lib/account';
import { RegionalNetworkUtilization } from '@linode/api-v4/lib/account';
import {
CreateLinodeRequest,
Linode,
Expand Down Expand Up @@ -123,11 +123,15 @@ export const linodeBackupsFactory = Factory.Sync.makeFactory<LinodeBackups>({
},
});

export const linodeTransferFactory = Factory.Sync.makeFactory<NetworkUtilization>(
export const linodeTransferFactory = Factory.Sync.makeFactory<RegionalNetworkUtilization>(
{
billable: 0,
quota: 1950,
used: 13956637,
region_transfers: [
{ id: 'id-cgk', billable: 0, quota: 10000, used: 10 },
{ id: 'br-gru', billable: 0, quota: 15000, used: 20 },
],
}
);

Expand All @@ -138,6 +142,18 @@ export const linodeTypeFactory = Factory.Sync.makeFactory<LinodeType>({
hourly: 0.004,
monthly: 2.5,
},
region_prices: [
{
hourly: 0.0048,
id: 'id-cgk',
monthly: 3.57,
},
{
hourly: 0.0056,
id: 'br-gru',
monthly: 4.17,
},
],
},
},
class: 'standard',
Expand Down Expand Up @@ -181,6 +197,18 @@ export const proDedicatedTypeFactory = Factory.Sync.makeFactory<LinodeType>({
hourly: null,
monthly: null,
},
region_prices: [
{
hourly: null,
id: null,
monthly: null,
},
{
hourly: null,
id: null,
monthly: null,
},
],
},
},
class: 'prodedicated',
Expand Down
12 changes: 12 additions & 0 deletions packages/manager/src/factories/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,18 @@ export const typeFactory = Factory.Sync.makeFactory<LinodeType>({
hourly: 10,
monthly: 10,
},
region_prices: [
{
hourly: 0.0048,
id: 'id-cgk',
monthly: 3.57,
},
{
hourly: 0.0056,
id: 'br-gru',
monthly: 4.17,
},
],
},
},
class: 'standard',
Expand Down
23 changes: 22 additions & 1 deletion packages/manager/src/mocks/serverHandlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -605,14 +605,26 @@ export const handlers = [
label: 'eu-linode',
region: 'eu-west',
}),
linodeFactory.build({
backups: { enabled: false },
label: 'DC-Specific Pricing Linode',
region: 'id-cgk',
}),
eventLinode,
multipleIPLinode,
];
return res(ctx.json(makeResourcePage(linodes)));
}),
rest.get('*/linode/instances/:id', async (req, res, ctx) => {
const id = Number(req.params.id);
return res(ctx.json(linodeFactory.build({ id })));
return res(
ctx.json(
linodeFactory.build({
backups: { enabled: false },
id,
})
)
);
}),
rest.delete('*/instances/*', async (req, res, ctx) => {
return res(ctx.json({}));
Expand Down Expand Up @@ -920,6 +932,15 @@ export const handlers = [
});
return res(ctx.json(makeResourcePage([linodeInvoice, akamaiInvoice])));
}),
rest.get('*/account/invoices/:invoiceId', (req, res, ctx) => {
const linodeInvoice = invoiceFactory.build({
date: '2022-12-01T18:04:01',
id: 1234,
label: 'LinodeInvoice',
});
return res(ctx.json(linodeInvoice));
}),

rest.get('*/account/maintenance', (req, res, ctx) => {
accountMaintenanceFactory.resetSequenceNumber();
const page = Number(req.url.searchParams.get('page') || 1);
Expand Down
4 changes: 2 additions & 2 deletions packages/manager/src/queries/accountTransfer.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {
NetworkUtilization,
RegionalNetworkUtilization,
getNetworkUtilization,
} from '@linode/api-v4/lib/account';
import { APIError } from '@linode/api-v4/lib/types';
Expand All @@ -8,7 +8,7 @@ import { useQuery } from 'react-query';
import { queryPresets } from './base';

export const useAccountTransfer = () =>
useQuery<NetworkUtilization, APIError[]>(
useQuery<RegionalNetworkUtilization, APIError[]>(
'network-utilization',
getNetworkUtilization,
queryPresets.oneTimeFetch
Expand Down