Skip to content

Commit 5724cc4

Browse files
Merge branch 'develop' into feature/UIE-10132-block-interface-creation-without-firewall
2 parents 262df83 + f01ef1a commit 5724cc4

File tree

190 files changed

+2949
-1540
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+2949
-1540
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@linode/api-v4": Changed
3+
---
4+
5+
New fields in the NodeBalancer details object and NodeBalancerVPC object to align with recent API updates ([#13394](https://github.com/linode/manager/pull/13394))
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@linode/api-v4": Tech Stories
3+
---
4+
5+
Clean up unused marketplace v2 apiv4 endpoints ([#13396](https://github.com/linode/manager/pull/13396))
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@linode/api-v4": Removed
3+
---
4+
5+
The value 'in-progress' from cloudpulse/types.ts ([#13406](https://github.com/linode/manager/pull/13406))

packages/api-v4/src/cloudpulse/types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ export type AlertStatusType =
2727
| 'enabled'
2828
| 'enabling'
2929
| 'failed'
30-
| 'in progress'
3130
| 'provisioning';
3231
export type CriteriaConditionType = 'ALL';
3332
export type MetricUnitType =

packages/api-v4/src/iam/delegation.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,13 @@ export const updateChildAccountDelegates = ({
8181

8282
export const getMyDelegatedChildAccounts = ({
8383
params,
84+
filter,
8485
}: GetMyDelegatedChildAccountsParams) =>
8586
Request<Page<Account>>(
8687
setURL(`${BETA_API_ROOT}/iam/delegation/profile/child-accounts`),
8788
setMethod('GET'),
8889
setParams(params),
90+
setXFilter(filter),
8991
);
9092

9193
export const getDelegatedChildAccount = ({ euuid }: { euuid: string }) =>

packages/api-v4/src/iam/delegation.types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export interface ChildAccountWithDelegates extends ChildAccount {
1717
}
1818

1919
export interface GetMyDelegatedChildAccountsParams {
20+
filter?: Filter;
2021
params?: Params;
2122
}
2223

packages/api-v4/src/iam/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ export type AccountAdmin =
125125
| 'view_account_login'
126126
| 'view_account_settings'
127127
| 'view_child_account'
128+
| 'view_default_delegate_access'
128129
| 'view_enrolled_beta_program'
129130
| 'view_lock'
130131
| 'view_network_usage'

packages/api-v4/src/marketplace/marketplace.ts

Lines changed: 2 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,9 @@
11
import { createPartnerReferralSchema } from '@linode/validation';
22

33
import { BETA_API_ROOT } from 'src/constants';
4-
import Request, {
5-
setData,
6-
setMethod,
7-
setParams,
8-
setURL,
9-
setXFilter,
10-
} from 'src/request';
4+
import Request, { setData, setMethod, setURL } from 'src/request';
115

12-
import type {
13-
MarketplaceCategory,
14-
MarketplacePartner,
15-
MarketplacePartnerReferralPayload,
16-
MarketplaceProduct,
17-
MarketplaceType,
18-
} from './types';
19-
import type { Filter, ResourcePage as Page, Params } from 'src/types';
20-
21-
export const getMarketplaceProducts = (params?: Params, filters?: Filter) =>
22-
Request<Page<MarketplaceProduct>>(
23-
setURL(`${BETA_API_ROOT}/marketplace/products`),
24-
setMethod('GET'),
25-
setParams(params),
26-
setXFilter(filters),
27-
);
28-
29-
export const getMarketplaceProduct = (productId: number) =>
30-
Request<MarketplaceProduct>(
31-
setURL(
32-
`${BETA_API_ROOT}/marketplace/products/${encodeURIComponent(productId)}/details`,
33-
),
34-
setMethod('GET'),
35-
);
36-
37-
export const getMarketplaceCategories = (params?: Params, filters?: Filter) =>
38-
Request<Page<MarketplaceCategory>>(
39-
setURL(`${BETA_API_ROOT}/marketplace/categories`),
40-
setMethod('GET'),
41-
setParams(params),
42-
setXFilter(filters),
43-
);
44-
45-
export const getMarketplaceTypes = (params?: Params, filters?: Filter) =>
46-
Request<Page<MarketplaceType>>(
47-
setURL(`${BETA_API_ROOT}/marketplace/types`),
48-
setMethod('GET'),
49-
setParams(params),
50-
setXFilter(filters),
51-
);
52-
53-
export const getMarketplacePartners = (params?: Params, filters?: Filter) =>
54-
Request<Page<MarketplacePartner>>(
55-
setURL(`${BETA_API_ROOT}/marketplace/partners`),
56-
setMethod('GET'),
57-
setParams(params),
58-
setXFilter(filters),
59-
);
6+
import type { MarketplacePartnerReferralPayload } from './types';
607

618
export const createPartnerReferral = (
629
data: MarketplacePartnerReferralPayload,

packages/api-v4/src/marketplace/types.ts

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,3 @@
1-
export interface MarketplaceProductDetail {
2-
documentation?: string;
3-
overview?: {
4-
description: string;
5-
};
6-
pricing?: string;
7-
support?: string;
8-
}
9-
10-
export interface MarketplaceProduct {
11-
category_ids: number[];
12-
created_at: string;
13-
created_by: string;
14-
details?: MarketplaceProductDetail;
15-
id: number;
16-
info_banner?: string;
17-
logo_url: string;
18-
name: string;
19-
partner_id: number;
20-
product_tags?: string[];
21-
short_description: string;
22-
tile_tag?: string;
23-
type_id: number;
24-
updated_at?: string;
25-
updated_by?: string;
26-
}
27-
28-
export interface MarketplaceCategory {
29-
created_at: string;
30-
created_by: string;
31-
id: number;
32-
name: string;
33-
products_count: number;
34-
updated_at?: string;
35-
updated_by?: string;
36-
}
37-
38-
export interface MarketplaceType {
39-
created_at: string;
40-
created_by: string;
41-
id: number;
42-
name: string;
43-
products_count: number;
44-
updated_at?: string;
45-
updated_by?: string;
46-
}
47-
48-
export interface MarketplacePartner {
49-
created_at: string;
50-
created_by: string;
51-
id: number;
52-
logo_url_dark_mode: string;
53-
logo_url_light_mode: string;
54-
name: string;
55-
updated_at?: string;
56-
updated_by?: string;
57-
url: string;
58-
}
59-
601
export interface MarketplacePartnerReferralPayload {
612
account_executive_email?: string;
623
additional_emails?: string[];

packages/api-v4/src/nodebalancers/types.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ type UDPStickiness = 'none' | 'session' | 'source_ip';
1010

1111
export type Stickiness = TCPStickiness | UDPStickiness;
1212

13-
type NodeBalancerType = 'common' | 'premium';
13+
type NodeBalancerType = 'common' | 'premium' | 'premium_40GB';
1414

1515
export interface LKEClusterInfo {
1616
id: number;
@@ -33,6 +33,8 @@ export interface NodeBalancer {
3333
*/
3434
client_udp_sess_throttle?: number;
3535
created: string;
36+
frontend_address_type: 'public' | 'vpc';
37+
frontend_vpc_subnet_id: null | number;
3638
hostname: string;
3739
id: number;
3840
ipv4: string;
@@ -145,6 +147,7 @@ export interface NodeBalancerVpcConfig {
145147
ipv4_range: null | string;
146148
ipv6_range: null | string;
147149
nodebalancer_id: number;
150+
purpose: 'backend' | 'frontend';
148151
subnet_id: number;
149152
vpc_id: number;
150153
}

0 commit comments

Comments
 (0)