linode · coliu-akamai · Jan 27, 2025 · Jan 23, 2025 · Jan 23, 2025 · Jan 23, 2025
@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Upcoming Features
+---
+
+Add and update `/v4/networking` endpoints and types for Linode Interfaces ([#11559](https://github.com/linode/manager/pull/11559))
@@ -11,15 +11,20 @@ import {
   CreateFirewallSchema,
   FirewallDeviceSchema,
   UpdateFirewallSchema,
+  UpdateFirewallSettingsSchema,
 } from '@linode/validation/lib/firewalls.schema';
 import {
   CreateFirewallPayload,
   Firewall,
   FirewallDevice,
   FirewallDevicePayload,
   FirewallRules,
+  FirewallSettings,
   FirewallTemplate,
+  FirewallTemplateSlug,
   UpdateFirewallPayload,
+  UpdateFirewallRules,
+  UpdateFirewallSettings,
 } from './types';
 
 /**
@@ -150,7 +155,10 @@ export const getFirewallRules = (
  * Updates the inbound and outbound Rules for a Firewall. Using this endpoint will
  * replace all of a Firewall's ruleset with the Rules specified in your request.
  */
-export const updateFirewallRules = (firewallID: number, data: FirewallRules) =>
+export const updateFirewallRules = (
+  firewallID: number,
+  data: UpdateFirewallRules
+) =>
   Request<FirewallRules>(
     setMethod('PUT'),
     setData(data), // Validation is too complicated for these; leave it to the API.
@@ -245,6 +253,29 @@ export const deleteFirewallDevice = (firewallID: number, deviceID: number) =>
     )
   );
 
+/**
+ * getFirewallSettings
+ *
+ * Returns current interface default firewall settings
+ */
+export const getFirewallSettings = () =>
+  Request<FirewallSettings>(
+    setMethod('GET'),
+    setURL(`${BETA_API_ROOT}/networking/firewalls/settings`)
+  );
+
+/**
+ * updateFirewallSettings
+ *
+ * Update which firewalls should be the interface default firewalls
+ */
+export const updateFirewallSettings = (data: UpdateFirewallSettings) =>
+  Request<FirewallSettings>(
+    setMethod('PUT'),
+    setURL(`${BETA_API_ROOT}/networking/firewalls/settings`),
+    setData(data, UpdateFirewallSettingsSchema)
+  );
+
 // #region Templates
 
 /**
@@ -262,9 +293,8 @@ export const getTemplates = () =>
  * getTemplate
  *
  * Get a specific firewall template by its slug.
- *
  */
-export const getTemplate = (templateSlug: string) =>
+export const getTemplate = (templateSlug: FirewallTemplateSlug) =>
   Request<FirewallTemplate>(
     setMethod('GET'),
     setURL(

@@ -2,7 +2,7 @@ export type FirewallStatus = 'enabled' | 'disabled' | 'deleted';
 
 export type FirewallRuleProtocol = 'ALL' | 'TCP' | 'UDP' | 'ICMP' | 'IPENCAP';
 
-export type FirewallDeviceEntityType = 'linode' | 'nodebalancer';
+export type FirewallDeviceEntityType = 'linode' | 'nodebalancer' | 'interface';
 
 export type FirewallPolicyType = 'ACCEPT' | 'DROP';
 
@@ -14,21 +14,27 @@ export interface Firewall {
   rules: FirewallRules;
   created: string;
   updated: string;
-  entities: {
-    id: number;
-    type: FirewallDeviceEntityType;
-    label: string;
-    url: string;
-  }[];
+  entities: FirewallDeviceEntity[];
 }
 
 export interface FirewallRules {
+  fingerprint: string;
   inbound?: FirewallRuleType[] | null;
   outbound?: FirewallRuleType[] | null;
   inbound_policy: FirewallPolicyType;
   outbound_policy: FirewallPolicyType;
+  version: number;
 }
 
+export type UpdateFirewallRules = Omit<
+  FirewallRules,
+  'fingerprint' | 'version'
+>;
+
+// @TODO Linode Interfaces - follow up on if FirewallTemplate rules have the fingerprint / version fields.
+// FirewallRules do, but the objects returned from the getFirewallTemplate requests don't
+export type FirewallTemplateRules = UpdateFirewallRules;
+
 export interface FirewallRuleType {
   label?: string | null;
   description?: string | null;
@@ -55,18 +61,21 @@ export interface FirewallDevice {
   entity: FirewallDeviceEntity;
 }
 
+export type FirewallTemplateSlug = 'akamai-non-prod' | 'vpc' | 'public';
+
 export interface FirewallTemplate {
-  slug: string;
-  rules: FirewallRules;
+  slug: FirewallTemplateSlug;
+  rules: FirewallTemplateRules;
 }
 
 export interface CreateFirewallPayload {
   label?: string;
   tags?: string[];
-  rules: FirewallRules;
+  rules: UpdateFirewallRules;
   devices?: {
     linodes?: number[];
     nodebalancers?: number[];
+    interfaces?: number[];
   };
 }
 
@@ -80,3 +89,18 @@ export interface FirewallDevicePayload {
   id: number;
   type: FirewallDeviceEntityType;
 }
+
+export interface DefaultFirewallIDs {
+  interface_public: number;
+  interface_vpc: number;
+  linode: number;
+  nodebalancer: number;
+}
+
+export interface FirewallSettings {
+  default_firewall_ids: DefaultFirewallIDs;
+}
+
+export interface UpdateFirewallSettings {
+  default_firewall_ids: Partial<DefaultFirewallIDs>;
+}
@@ -7,7 +7,13 @@ export interface IPAddress {
   public: boolean;
   rdns: string | null;
   linode_id: number;
+  interface_id: number | null;
   region: string;
+  vpc_nat_1_1?: {
+    address: string;
+    subnet_id: number;
+    vpc_id: number;
+  } | null;
 }
 
 export interface IPRangeBaseData {

@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Fix type errors that result from changes to `/v4/networking` endpoints ([#11559](https://github.com/linode/manager/pull/11559))
@@ -418,9 +418,11 @@ componentTests('Firewall Rules Table', (mount) => {
           mount(
             <FirewallRulesLanding
               rules={{
+                fingerprint: '8a545843',
                 inbound: mockInboundRules,
                 inbound_policy: 'ACCEPT',
                 outbound_policy: 'DROP',
+                version: 1,
               }}
               disabled={false}
               firewallID={randomNumber()}
@@ -478,9 +480,11 @@ componentTests('Firewall Rules Table', (mount) => {
           mount(
             <FirewallRulesLanding
               rules={{
+                fingerprint: '8a545843',
                 inbound_policy: 'ACCEPT',
                 outbound: mockOutboundRules,
                 outbound_policy: 'DROP',
+                version: 1,
               }}
               disabled={false}
               firewallID={randomNumber()}
@@ -547,9 +551,11 @@ componentTests('Firewall Rules Table', (mount) => {
           mount(
             <FirewallRulesLanding
               rules={{
+                fingerprint: '8a545843',
                 inbound: mockInboundRules,
                 inbound_policy: 'ACCEPT',
                 outbound_policy: 'DROP',
+                version: 1,
               }}
               disabled={false}
               firewallID={randomNumber()}
@@ -576,9 +582,11 @@ componentTests('Firewall Rules Table', (mount) => {
           mount(
             <FirewallRulesLanding
               rules={{
+                fingerprint: '8a545843',
                 inbound_policy: 'ACCEPT',
                 outbound: mockOutboundRules,
                 outbound_policy: 'DROP',
+                version: 1,
               }}
               disabled={false}
               firewallID={randomNumber()}

@@ -14,6 +14,7 @@ export const firewall: Firewall = {
   id: 1,
   label: 'my-firewall',
   rules: {
+    fingerprint: '8a545843',
     inbound: [
       {
         action: 'ACCEPT',
@@ -34,6 +35,7 @@ export const firewall: Firewall = {
       },
     ],
     outbound_policy: 'DROP',
+    version: 1,
   },
   status: 'enabled',
   tags: [],
@@ -53,6 +55,7 @@ export const firewall2: Firewall = {
   id: 2,
   label: 'zzz',
   rules: {
+    fingerprint: '8a545843',
     inbound: [],
     inbound_policy: 'DROP',
     outbound: [
@@ -68,6 +71,7 @@ export const firewall2: Firewall = {
       },
     ],
     outbound_policy: 'DROP',
+    version: 1,
   },
   status: 'disabled',
   tags: [],

@@ -1,7 +1,11 @@
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { firewallFactory, firewallTemplateFactory } from 'src/factories';
+import {
+  firewallFactory,
+  firewallRuleFactory,
+  firewallTemplateFactory,
+} from 'src/factories';
 import { makeResourcePage } from 'src/mocks/serverHandlers';
 import { HttpResponse, http, server } from 'src/mocks/testServer';
 import { renderWithTheme } from 'src/utilities/testHelpers';
@@ -11,7 +15,23 @@ import { GenerateFirewallDialog } from './GenerateFirewallDialog';
 describe('GenerateFirewallButton', () => {
   it('Can successfully generate a firewall', async () => {
     const firewalls = firewallFactory.buildList(2);
-    const template = firewallTemplateFactory.build();
+    const template = firewallTemplateFactory.build({
+      rules: {
+        // due to an updated firewallTemplateFactory, we need to specify values for this test
+        inbound: [
+          firewallRuleFactory.build({
+            description: 'firewall-rule-1 description',
+            label: 'firewall-rule-1',
+          }),
+        ],
+        outbound: [
+          firewallRuleFactory.build({
+            description: 'firewall-rule-2 description',
+            label: 'firewall-rule-2',
+          }),
+        ],
+      },
+    });
     const createFirewallCallback = vi.fn();
     const onClose = vi.fn();
     const onFirewallGenerated = vi.fn();
@@ -55,14 +75,14 @@ describe('GenerateFirewallButton', () => {
     expect(onFirewallGenerated).toHaveBeenCalledWith(
       expect.objectContaining({
         label: `${template.slug}-1`,
-        rules: template.rules,
+        rules: { ...template.rules, fingerprint: '8a545843', version: 1 },
       })
     );
 
     expect(createFirewallCallback).toHaveBeenCalledWith(
       expect.objectContaining({
         label: `${template.slug}-1`,
-        rules: template.rules,
+        rules: { ...template.rules, fingerprint: '8a545843', version: 1 },
       })
     );
   });

@@ -4,13 +4,17 @@ import { firewallQueries } from 'src/queries/firewalls';
 import { useCreateFirewall } from 'src/queries/firewalls';
 
 import type { DialogState } from './GenerateFirewallDialog';
-import type { CreateFirewallPayload, Firewall } from '@linode/api-v4';
+import type {
+  CreateFirewallPayload,
+  Firewall,
+  FirewallTemplateSlug,
+} from '@linode/api-v4';
 import type { QueryClient } from '@tanstack/react-query';
 
 export const useCreateFirewallFromTemplate = (options: {
   onFirewallGenerated?: (firewall: Firewall) => void;
   setDialogState: (state: DialogState) => void;
-  templateSlug: string;
+  templateSlug: FirewallTemplateSlug;
 }) => {
   const { onFirewallGenerated, setDialogState, templateSlug } = options;
   const queryClient = useQueryClient();
@@ -44,7 +48,7 @@ export const useCreateFirewallFromTemplate = (options: {
 const createFirewallFromTemplate = async (options: {
   createFirewall: (firewall: CreateFirewallPayload) => Promise<Firewall>;
   queryClient: QueryClient;
-  templateSlug: string;
+  templateSlug: FirewallTemplateSlug;
   updateProgress: (progress: number | undefined) => void;
 }): Promise<Firewall> => {
   const { createFirewall, queryClient, templateSlug, updateProgress } = options;
@@ -66,7 +70,7 @@ const createFirewallFromTemplate = async (options: {
 };
 
 const getUniqueFirewallLabel = (
-  templateSlug: string,
+  templateSlug: FirewallTemplateSlug,
   firewalls: Firewall[]
 ) => {
   let iterator = 1;
@@ -79,7 +83,10 @@ const getUniqueFirewallLabel = (
   return firewallLabelFromSlug(templateSlug, iterator);
 };
 
-const firewallLabelFromSlug = (slug: string, iterator: number) => {
+const firewallLabelFromSlug = (
+  slug: FirewallTemplateSlug,
+  iterator: number
+) => {
   const MAX_LABEL_LENGTH = 32;
   const iteratorSuffix = `-${iterator}`;
   return (