Skip to content
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
---

Add `/v4beta/nodebalancers` and `/v4/nodebalancers` endpoints for NB-VPC Integration ([#11832](https://github.com/linode/manager/pull/11832))
60 changes: 59 additions & 1 deletion packages/api-v4/src/nodebalancers/nodebalancer-configs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,13 @@ import { ResourcePage as Page, Params } from '../types';
import {
CreateNodeBalancerConfig,
NodeBalancerConfig,
RebuildNodeBalancerConfig,
UpdateNodeBalancerConfig,
} from './types';
import { combineConfigNodeAddressAndPort } from './utils';
import {
combineConfigNodeAddressAndPort,
combineConfigNodeAddressAndPortBeta,
} from './utils';

/**
* getNodeBalancerConfigs
Expand Down Expand Up @@ -96,13 +100,67 @@ export const createNodeBalancerConfigBeta = (
nodeBalancerId
)}/configs`
),
setData(
data,
createNodeBalancerConfigSchema,
combineConfigNodeAddressAndPortBeta
)
);

/**
* rebuildNodeBalancerConfig
*
* Rebuilds a NodeBalancer Config and its Nodes that you have permission to modify.
*
* @param nodeBalancerId { number } The NodeBalancer to receive the new config.
* @param configId { number } The ID of the configuration profile to be updated
*/
export const rebuildNodeBalancerConfig = (
nodeBalancerId: number,
configId: number,
data: RebuildNodeBalancerConfig
) =>
Request<NodeBalancerConfig>(
setMethod('POST'),
setURL(
`${API_ROOT}/nodebalancers/${encodeURIComponent(
nodeBalancerId
)}/configs/${encodeURIComponent(configId)}/rebuild`
),
setData(
data,
createNodeBalancerConfigSchema,
combineConfigNodeAddressAndPort
)
);

/**
* rebuildNodeBalancerConfigBeta
*
* Rebuilds a NodeBalancer Config and its Nodes that you have permission to modify.
*
* @param nodeBalancerId { number } The NodeBalancer to receive the new config.
* @param configId { number } The ID of the configuration profile to be updated
*/
export const rebuildNodeBalancerConfigBeta = (
nodeBalancerId: number,
configId: number,
data: RebuildNodeBalancerConfig
) =>
Request<NodeBalancerConfig>(
setMethod('POST'),
setURL(
`${BETA_API_ROOT}/nodebalancers/${encodeURIComponent(
nodeBalancerId
)}/configs/${encodeURIComponent(configId)}/rebuild`
),
setData(
data,
createNodeBalancerConfigSchema,
combineConfigNodeAddressAndPortBeta
)
);

/**
* updateNodeBalancerConfig
*
Expand Down
50 changes: 48 additions & 2 deletions packages/api-v4/src/nodebalancers/nodebalancers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,12 @@ import type {
CreateNodeBalancerPayload,
NodeBalancer,
NodeBalancerStats,
NodebalancerVpcConfig,
} from './types';
import { combineNodeBalancerConfigNodeAddressAndPort } from './utils';
import {
combineNodeBalancerConfigNodeAddressAndPort,
combineNodeBalancerConfigNodeAddressAndPortBeta,
} from './utils';
import type { Firewall } from '../firewalls/types';

/**
Expand Down Expand Up @@ -107,7 +111,7 @@ export const createNodeBalancerBeta = (data: CreateNodeBalancerPayload) =>
setData(
data,
NodeBalancerSchema,
combineNodeBalancerConfigNodeAddressAndPort
combineNodeBalancerConfigNodeAddressAndPortBeta
)
);

Expand Down Expand Up @@ -174,3 +178,45 @@ export const getNodeBalancerTypes = (params?: Params) =>
setMethod('GET'),
setParams(params)
);

/**
* getNodeBalancerVPCConfigsBeta
*
* View all VPC Config information for this NodeBalancer
*
* @param nodeBalancerId { number } The ID of the NodeBalancer to view vpc config info for.
*/
export const getNodeBalancerVPCConfigsBeta = (
nodeBalancerId: number,
params?: Params,
filter?: Filter
) =>
Request<Page<NodebalancerVpcConfig>>(
setURL(
`${BETA_API_ROOT}/nodebalancers/${encodeURIComponent(
nodeBalancerId
)}/vpcs`
),
setMethod('GET'),
setXFilter(filter),
setParams(params)
);
/**
* getNodeBalancerVPCConfigBeta
*
* View VPC Config information for this NodeBalancer and VPC Config id
*
* @param nodeBalancerId { number } The ID of the NodeBalancer to view vpc config info for.
*/
export const getNodeBalancerVPCConfigBeta = (
nodeBalancerId: number,
nbVpcConfigId: number
) =>
Request<NodebalancerVpcConfig>(
setURL(
`${BETA_API_ROOT}/nodebalancers/${encodeURIComponent(
nodeBalancerId
)}/vpcs/${encodeURIComponent(nbVpcConfigId)}`
),
setMethod('GET')
);
13 changes: 12 additions & 1 deletion packages/api-v4/src/nodebalancers/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,15 @@ export interface NodeBalancerStats {
};
}

export interface NodebalancerVpcConfig {
id: number;
nodebalancer_id: number;
vpc_id: number;
subnet_id: number;
ipv4_range: string | null;
ipv6_range: string | null;
}

export interface CreateNodeBalancerConfig {
port?: number;
/**
Expand Down Expand Up @@ -186,6 +195,8 @@ export interface CreateNodeBalancerConfig {

export type UpdateNodeBalancerConfig = CreateNodeBalancerConfig;

export type RebuildNodeBalancerConfig = CreateNodeBalancerConfig;

export interface CreateNodeBalancerConfigNode {
address: string;
label: string;
Expand Down Expand Up @@ -235,7 +246,7 @@ export interface CreateNodeBalancerPayload {
configs: CreateNodeBalancerConfig[];
firewall_id?: number;
tags?: string[];
vpc?: {
vpcs?: {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feedback from previous PR comment

subnet_id: number;
ipv4_range: string;
ipv6_range?: string;
Expand Down
25 changes: 25 additions & 0 deletions packages/api-v4/src/nodebalancers/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,17 @@ export const combineConfigNodeAddressAndPort = (data: any) => ({
})),
});

export const combineConfigNodeAddressAndPortBeta = (data: any) => ({
...data,
nodes: data.nodes.map((n: any) => ({
address: `${n.address}:${n.port}`,
label: n.label,
mode: n.mode,
weight: n.weight,
subnet_id: n.subnet_id,
})),
});

export const combineNodeBalancerConfigNodeAddressAndPort = (data: any) => ({
...data,
configs: data.configs.map((c: any) => ({
Expand All @@ -23,6 +34,20 @@ export const combineNodeBalancerConfigNodeAddressAndPort = (data: any) => ({
})),
});

export const combineNodeBalancerConfigNodeAddressAndPortBeta = (data: any) => ({
...data,
configs: data.configs.map((c: any) => ({
...c,
nodes: c.nodes.map((n: any) => ({
address: `${n.address}:${n.port}`,
label: n.label,
mode: n.mode,
weight: n.weight,
subnet_id: n.subnet_id,
})),
})),
});

export const mergeAddressAndPort = (node: NodeBalancerConfigNodeWithPort) => ({
...node,
address: `${node.address}:${node.port}`,
Expand Down