cloudflare 3.0.0-beta.9 → 3.1.0

package/src/resources/dns/analytics/reports/bytimes.ts

@@ -3,6 +3,7 @@
 import * as Core from "../../../../core";
 import { APIResource } from "../../../../resource";
 import * as BytimesAPI from "./bytimes";
+import * as DNSAPI from "../../dns";
 
 export class Bytimes extends APIResource {
   /**
@@ -12,25 +13,22 @@ export class Bytimes extends APIResource {
    * [Analytics API properties](https://developers.cloudflare.com/dns/reference/analytics-api-properties/)
    * for detailed information about the available query parameters.
    */
-  get(
-    params: BytimeGetParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<DNSDNSAnalyticsAPIReportBytime> {
+  get(params: BytimeGetParams, options?: Core.RequestOptions): Core.APIPromise<ByTime> {
     const { zone_id, ...query } = params;
     return (
       this._client.get(`/zones/${zone_id}/dns_analytics/report/bytime`, {
         query,
         ...options,
-      }) as Core.APIPromise<{ result: DNSDNSAnalyticsAPIReportBytime }>
+      }) as Core.APIPromise<{ result: ByTime }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
-export interface DNSDNSAnalyticsAPIReportBytime {
+export interface ByTime {
   /**
    * Array with one row per combination of dimension values.
    */
-  data: Array<DNSDNSAnalyticsAPIReportBytime.Data>;
+  data: Array<ByTime.Data>;
 
   /**
    * Number of seconds between current time and last processed event, in another
@@ -50,7 +48,7 @@ export interface DNSDNSAnalyticsAPIReportBytime {
    */
   min: unknown;
 
-  query: DNSDNSAnalyticsAPIReportBytime.Query;
+  query: DNSAPI.DNSAnalyticsQuery;
 
   /**
    * Total number of rows in the result.
@@ -70,7 +68,7 @@ export interface DNSDNSAnalyticsAPIReportBytime {
   totals: unknown;
 }
 
-export namespace DNSDNSAnalyticsAPIReportBytime {
+export namespace ByTime {
   export interface Data {
     /**
      * Array of dimension values, representing the combination of dimension values
@@ -82,60 +80,7 @@ export namespace DNSDNSAnalyticsAPIReportBytime {
      * Array with one item per requested metric. Each item is an array of values,
      * broken down by time interval.
      */
-    metrics: Array<Array<unknown>>;
-  }
-
-  export interface Query {
-    /**
-     * Array of dimension names.
-     */
-    dimensions: Array<string>;
-
-    /**
-     * Limit number of returned metrics.
-     */
-    limit: number;
-
-    /**
-     * Array of metric names.
-     */
-    metrics: Array<string>;
-
-    /**
-     * Start date and time of requesting data period in ISO 8601 format.
-     */
-    since: string;
-
-    /**
-     * Unit of time to group data by.
-     */
-    time_delta:
-      | 'all'
-      | 'auto'
-      | 'year'
-      | 'quarter'
-      | 'month'
-      | 'week'
-      | 'day'
-      | 'hour'
-      | 'dekaminute'
-      | 'minute';
-
-    /**
-     * End date and time of requesting data period in ISO 8601 format.
-     */
-    until: string;
-
-    /**
-     * Segmentation filter in 'attribute operator value' format.
-     */
-    filters?: string;
-
-    /**
-     * Array of dimensions to sort by, where each dimension may be prefixed by -
-     * (descending) or + (ascending).
-     */
-    sort?: Array<string>;
+    metrics: Array<DNSAPI.DNSAnalyticsNominalMetric>;
   }
 }
 
@@ -198,6 +143,6 @@ export interface BytimeGetParams {
 }
 
 export namespace Bytimes {
-  export import DNSDNSAnalyticsAPIReportBytime = BytimesAPI.DNSDNSAnalyticsAPIReportBytime;
+  export import ByTime = BytimesAPI.ByTime;
   export import BytimeGetParams = BytimesAPI.BytimeGetParams;
 }

package/src/resources/dns/analytics/reports/index.ts

@@ -1,4 +1,4 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { DNSDNSAnalyticsAPIReport, ReportGetParams, Reports } from './reports';
-export { DNSDNSAnalyticsAPIReportBytime, BytimeGetParams, Bytimes } from './bytimes';
+export { ByTime, BytimeGetParams, Bytimes } from './bytimes';
+export { Report, ReportGetParams, Reports } from './reports';

package/src/resources/dns/analytics/reports/reports.ts

@@ -15,21 +15,21 @@ export class Reports extends APIResource {
    * [Analytics API properties](https://developers.cloudflare.com/dns/reference/analytics-api-properties/)
    * for detailed information about the available query parameters.
    */
-  get(params: ReportGetParams, options?: Core.RequestOptions): Core.APIPromise<DNSDNSAnalyticsAPIReport> {
+  get(params: ReportGetParams, options?: Core.RequestOptions): Core.APIPromise<Report> {
     const { zone_id, ...query } = params;
     return (
       this._client.get(`/zones/${zone_id}/dns_analytics/report`, { query, ...options }) as Core.APIPromise<{
-        result: DNSDNSAnalyticsAPIReport;
+        result: Report;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
-export interface DNSDNSAnalyticsAPIReport {
+export interface Report {
   /**
    * Array with one row per combination of dimension values.
    */
-  data: Array<DNSDNSAnalyticsAPIReport.Data>;
+  data: Array<Report.Data>;
 
   /**
    * Number of seconds between current time and last processed event, in another
@@ -49,7 +49,7 @@ export interface DNSDNSAnalyticsAPIReport {
    */
   min: unknown;
 
-  query: DNSDNSAnalyticsAPIReport.Query;
+  query: Report.Query;
 
   /**
    * Total number of rows in the result.
@@ -63,7 +63,7 @@ export interface DNSDNSAnalyticsAPIReport {
   totals: unknown;
 }
 
-export namespace DNSDNSAnalyticsAPIReport {
+export namespace Report {
   export interface Data {
     /**
      * Array of dimension values, representing the combination of dimension values
@@ -160,9 +160,9 @@ export interface ReportGetParams {
 }
 
 export namespace Reports {
-  export import DNSDNSAnalyticsAPIReport = ReportsAPI.DNSDNSAnalyticsAPIReport;
+  export import Report = ReportsAPI.Report;
   export import ReportGetParams = ReportsAPI.ReportGetParams;
   export import Bytimes = BytimesAPI.Bytimes;
-  export import DNSDNSAnalyticsAPIReportBytime = BytimesAPI.DNSDNSAnalyticsAPIReportBytime;
+  export import ByTime = BytimesAPI.ByTime;
   export import BytimeGetParams = BytimesAPI.BytimeGetParams;
 }

package/src/resources/dns/dns.ts

@@ -8,17 +8,99 @@ import * as FirewallAPI from "./firewall/firewall";
 export class DNS extends APIResource {
   records: RecordsAPI.Records = new RecordsAPI.Records(this._client);
   analytics: AnalyticsAPI.Analytics = new AnalyticsAPI.Analytics(this._client);
-  firewall: FirewallAPI.Firewall = new FirewallAPI.Firewall(this._client);
+  firewall: FirewallAPI.FirewallResource = new FirewallAPI.FirewallResource(this._client);
+}
+
+/**
+ * Nominal metric values, broken down by time interval.
+ */
+export type DNSAnalyticsNominalMetric = Array<unknown>;
+
+export interface DNSAnalyticsQuery {
+  /**
+   * Array of dimension names.
+   */
+  dimensions: Array<string>;
+
+  /**
+   * Limit number of returned metrics.
+   */
+  limit: number;
+
+  /**
+   * Array of metric names.
+   */
+  metrics: Array<string>;
+
+  /**
+   * Start date and time of requesting data period in ISO 8601 format.
+   */
+  since: string;
+
+  /**
+   * Unit of time to group data by.
+   */
+  time_delta:
+    | 'all'
+    | 'auto'
+    | 'year'
+    | 'quarter'
+    | 'month'
+    | 'week'
+    | 'day'
+    | 'hour'
+    | 'dekaminute'
+    | 'minute';
+
+  /**
+   * End date and time of requesting data period in ISO 8601 format.
+   */
+  until: string;
+
+  /**
+   * Segmentation filter in 'attribute operator value' format.
+   */
+  filters?: string;
+
+  /**
+   * Array of dimensions to sort by, where each dimension may be prefixed by -
+   * (descending) or + (ascending).
+   */
+  sort?: Array<string>;
 }
 
 export namespace DNS {
   export import Records = RecordsAPI.Records;
-  export import DNSRecord = RecordsAPI.DNSRecord;
+  export import ARecord = RecordsAPI.ARecord;
+  export import AAAARecord = RecordsAPI.AAAARecord;
+  export import CAARecord = RecordsAPI.CAARecord;
+  export import CERTRecord = RecordsAPI.CERTRecord;
+  export import CNAMERecord = RecordsAPI.CNAMERecord;
+  export import DNSKEYRecord = RecordsAPI.DNSKEYRecord;
+  export import DSRecord = RecordsAPI.DSRecord;
+  export import HTTPSRecord = RecordsAPI.HTTPSRecord;
+  export import LOCRecord = RecordsAPI.LOCRecord;
+  export import MXRecord = RecordsAPI.MXRecord;
+  export import NAPTRRecord = RecordsAPI.NAPTRRecord;
+  export import NSRecord = RecordsAPI.NSRecord;
+  export import PTRRecord = RecordsAPI.PTRRecord;
+  export import Record = RecordsAPI.Record;
+  export import RecordMetadata = RecordsAPI.RecordMetadata;
+  export import RecordProcessTiming = RecordsAPI.RecordProcessTiming;
+  export import RecordTags = RecordsAPI.RecordTags;
+  export import SMIMEARecord = RecordsAPI.SMIMEARecord;
+  export import SRVRecord = RecordsAPI.SRVRecord;
+  export import SSHFPRecord = RecordsAPI.SSHFPRecord;
+  export import SVCBRecord = RecordsAPI.SVCBRecord;
+  export import TLSARecord = RecordsAPI.TLSARecord;
+  export import TTL = RecordsAPI.TTL;
+  export import TXTRecord = RecordsAPI.TXTRecord;
+  export import URIRecord = RecordsAPI.URIRecord;
   export import RecordDeleteResponse = RecordsAPI.RecordDeleteResponse;
   export import RecordExportResponse = RecordsAPI.RecordExportResponse;
   export import RecordImportResponse = RecordsAPI.RecordImportResponse;
   export import RecordScanResponse = RecordsAPI.RecordScanResponse;
-  export import DNSRecordsV4PagePaginationArray = RecordsAPI.DNSRecordsV4PagePaginationArray;
+  export import RecordsV4PagePaginationArray = RecordsAPI.RecordsV4PagePaginationArray;
   export import RecordCreateParams = RecordsAPI.RecordCreateParams;
   export import RecordUpdateParams = RecordsAPI.RecordUpdateParams;
   export import RecordListParams = RecordsAPI.RecordListParams;
@@ -29,10 +111,13 @@ export namespace DNS {
   export import RecordImportParams = RecordsAPI.RecordImportParams;
   export import RecordScanParams = RecordsAPI.RecordScanParams;
   export import Analytics = AnalyticsAPI.Analytics;
+  export import FirewallResource = FirewallAPI.FirewallResource;
+  export import AttackMitigation = FirewallAPI.AttackMitigation;
   export import Firewall = FirewallAPI.Firewall;
-  export import DNSFirewallDNSFirewall = FirewallAPI.DNSFirewallDNSFirewall;
+  export import FirewallIPs = FirewallAPI.FirewallIPs;
+  export import UpstreamIPs = FirewallAPI.UpstreamIPs;
   export import FirewallDeleteResponse = FirewallAPI.FirewallDeleteResponse;
-  export import DNSFirewallDNSFirewallsV4PagePaginationArray = FirewallAPI.DNSFirewallDNSFirewallsV4PagePaginationArray;
+  export import FirewallsV4PagePaginationArray = FirewallAPI.FirewallsV4PagePaginationArray;
   export import FirewallCreateParams = FirewallAPI.FirewallCreateParams;
   export import FirewallListParams = FirewallAPI.FirewallListParams;
   export import FirewallDeleteParams = FirewallAPI.FirewallDeleteParams;

package/src/resources/dns/firewall/analytics/reports/bytimes.ts

@@ -17,13 +17,13 @@ export class Bytimes extends APIResource {
     dnsFirewallId: string,
     params: BytimeGetParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<BytimesAPI.DNSDNSAnalyticsAPIReportBytime> {
+  ): Core.APIPromise<BytimesAPI.ByTime> {
     const { account_id, ...query } = params;
     return (
       this._client.get(`/accounts/${account_id}/dns_firewall/${dnsFirewallId}/dns_analytics/report/bytime`, {
         query,
         ...options,
-      }) as Core.APIPromise<{ result: BytimesAPI.DNSDNSAnalyticsAPIReportBytime }>
+      }) as Core.APIPromise<{ result: BytimesAPI.ByTime }>
     )._thenUnwrap((obj) => obj.result);
   }
 }

package/src/resources/dns/firewall/analytics/reports/reports.ts

@@ -20,13 +20,13 @@ export class Reports extends APIResource {
     dnsFirewallId: string,
     params: ReportGetParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<ReportsAPI.DNSDNSAnalyticsAPIReport> {
+  ): Core.APIPromise<ReportsAPI.Report> {
     const { account_id, ...query } = params;
     return (
       this._client.get(`/accounts/${account_id}/dns_firewall/${dnsFirewallId}/dns_analytics/report`, {
         query,
         ...options,
-      }) as Core.APIPromise<{ result: ReportsAPI.DNSDNSAnalyticsAPIReport }>
+      }) as Core.APIPromise<{ result: ReportsAPI.Report }>
     )._thenUnwrap((obj) => obj.result);
   }
 }

package/src/resources/dns/firewall/firewall.ts

@@ -6,20 +6,17 @@ import * as FirewallAPI from "./firewall";
 import * as AnalyticsAPI from "./analytics/analytics";
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from "../../../pagination";
 
-export class Firewall extends APIResource {
+export class FirewallResource extends APIResource {
   analytics: AnalyticsAPI.Analytics = new AnalyticsAPI.Analytics(this._client);
 
   /**
    * Create a configured DNS Firewall Cluster.
    */
-  create(
-    params: FirewallCreateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<DNSFirewallDNSFirewall> {
+  create(params: FirewallCreateParams, options?: Core.RequestOptions): Core.APIPromise<Firewall> {
     const { account_id, ...body } = params;
     return (
       this._client.post(`/accounts/${account_id}/dns_firewall`, { body, ...options }) as Core.APIPromise<{
-        result: DNSFirewallDNSFirewall;
+        result: Firewall;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -30,13 +27,12 @@ export class Firewall extends APIResource {
   list(
     params: FirewallListParams,
     options?: Core.RequestOptions,
-  ): Core.PagePromise<DNSFirewallDNSFirewallsV4PagePaginationArray, DNSFirewallDNSFirewall> {
+  ): Core.PagePromise<FirewallsV4PagePaginationArray, Firewall> {
     const { account_id, ...query } = params;
-    return this._client.getAPIList(
-      `/accounts/${account_id}/dns_firewall`,
-      DNSFirewallDNSFirewallsV4PagePaginationArray,
-      { query, ...options },
-    );
+    return this._client.getAPIList(`/accounts/${account_id}/dns_firewall`, FirewallsV4PagePaginationArray, {
+      query,
+      ...options,
+    });
   }
 
   /**
@@ -47,12 +43,12 @@ export class Firewall extends APIResource {
     params: FirewallDeleteParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<FirewallDeleteResponse> {
-    const { account_id } = params;
+    const { account_id, body } = params;
     return (
-      this._client.delete(
-        `/accounts/${account_id}/dns_firewall/${dnsFirewallId}`,
-        options,
-      ) as Core.APIPromise<{ result: FirewallDeleteResponse }>
+      this._client.delete(`/accounts/${account_id}/dns_firewall/${dnsFirewallId}`, {
+        body: body,
+        ...options,
+      }) as Core.APIPromise<{ result: FirewallDeleteResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -63,13 +59,13 @@ export class Firewall extends APIResource {
     dnsFirewallId: string,
     params: FirewallEditParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<DNSFirewallDNSFirewall> {
+  ): Core.APIPromise<Firewall> {
     const { account_id, ...body } = params;
     return (
       this._client.patch(`/accounts/${account_id}/dns_firewall/${dnsFirewallId}`, {
         body,
         ...options,
-      }) as Core.APIPromise<{ result: DNSFirewallDNSFirewall }>
+      }) as Core.APIPromise<{ result: Firewall }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -80,19 +76,35 @@ export class Firewall extends APIResource {
     dnsFirewallId: string,
     params: FirewallGetParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<DNSFirewallDNSFirewall> {
+  ): Core.APIPromise<Firewall> {
     const { account_id } = params;
     return (
       this._client.get(`/accounts/${account_id}/dns_firewall/${dnsFirewallId}`, options) as Core.APIPromise<{
-        result: DNSFirewallDNSFirewall;
+        result: Firewall;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
-export class DNSFirewallDNSFirewallsV4PagePaginationArray extends V4PagePaginationArray<DNSFirewallDNSFirewall> {}
+export class FirewallsV4PagePaginationArray extends V4PagePaginationArray<Firewall> {}
+
+/**
+ * Attack mitigation settings.
+ */
+export interface AttackMitigation {
+  /**
+   * When enabled, random-prefix attacks are automatically mitigated and the upstream
+   * DNS servers protected.
+   */
+  enabled?: boolean;
 
-export interface DNSFirewallDNSFirewall {
+  /**
+   * Only mitigate attacks when upstream servers seem unhealthy.
+   */
+  only_when_upstream_unhealthy?: boolean;
+}
+
+export interface Firewall {
   /**
    * Identifier
    */
@@ -103,7 +115,7 @@ export interface DNSFirewallDNSFirewall {
    */
   deprecate_any_requests: boolean;
 
-  dns_firewall_ips: Array<string | string>;
+  dns_firewall_ips: Array<FirewallIPs>;
 
   /**
    * Forward client IP (resolver) subnet if no EDNS Client Subnet is sent.
@@ -130,23 +142,18 @@ export interface DNSFirewallDNSFirewall {
    */
   name: string;
 
-  upstream_ips: Array<string | string>;
+  upstream_ips: Array<UpstreamIPs>;
 
   /**
    * Attack mitigation settings.
    */
-  attack_mitigation?: DNSFirewallDNSFirewall.AttackMitigation | null;
+  attack_mitigation?: AttackMitigation | null;
 
   /**
    * Negative DNS Cache TTL.
    */
   negative_cache_ttl?: number | null;
 
-  /**
-   * @deprecated: Deprecated alias for "upstream_ips".
-   */
-  origin_ips?: unknown;
-
   /**
    * Ratelimit in queries per second per datacenter (applies to DNS queries sent to
    * the upstream nameservers configured on the cluster).
@@ -160,28 +167,15 @@ export interface DNSFirewallDNSFirewall {
   retries?: number;
 }
 
-export namespace DNSFirewallDNSFirewall {
-  /**
-   * Attack mitigation settings.
-   */
-  export interface AttackMitigation {
-    /**
-     * When enabled, random-prefix attacks are automatically mitigated and the upstream
-     * DNS servers protected.
-     */
-    enabled?: boolean;
-
-    /**
-     * @deprecated: Deprecated alias for "only_when_upstream_unhealthy".
-     */
-    only_when_origin_unhealthy?: unknown;
-
-    /**
-     * Only mitigate attacks when upstream servers seem unhealthy.
-     */
-    only_when_upstream_unhealthy?: boolean;
-  }
-}
+/**
+ * Cloudflare-assigned DNS IPv4 Address.
+ */
+export type FirewallIPs = string | string;
+
+/**
+ * Upstream DNS Server IPv4 Address.
+ */
+export type UpstreamIPs = string | string;
 
 export interface FirewallDeleteResponse {
   /**
@@ -204,12 +198,12 @@ export interface FirewallCreateParams {
   /**
    * Body param:
    */
-  upstream_ips: Array<string | string>;
+  upstream_ips: Array<UpstreamIPs>;
 
   /**
    * Body param: Attack mitigation settings.
    */
-  attack_mitigation?: FirewallCreateParams.AttackMitigation | null;
+  attack_mitigation?: AttackMitigation | null;
 
   /**
    * Body param: Deprecate the response to ANY requests.
@@ -237,11 +231,6 @@ export interface FirewallCreateParams {
    */
   negative_cache_ttl?: number | null;
 
-  /**
-   * Body param: Deprecated alias for "upstream_ips".
-   */
-  origin_ips?: unknown;
-
   /**
    * Body param: Ratelimit in queries per second per datacenter (applies to DNS
    * queries sent to the upstream nameservers configured on the cluster).
@@ -255,29 +244,6 @@ export interface FirewallCreateParams {
   retries?: number;
 }
 
-export namespace FirewallCreateParams {
-  /**
-   * Attack mitigation settings.
-   */
-  export interface AttackMitigation {
-    /**
-     * When enabled, random-prefix attacks are automatically mitigated and the upstream
-     * DNS servers protected.
-     */
-    enabled?: boolean;
-
-    /**
-     * @deprecated: Deprecated alias for "only_when_upstream_unhealthy".
-     */
-    only_when_origin_unhealthy?: unknown;
-
-    /**
-     * Only mitigate attacks when upstream servers seem unhealthy.
-     */
-    only_when_upstream_unhealthy?: boolean;
-  }
-}
-
 export interface FirewallListParams extends V4PagePaginationArrayParams {
   /**
    * Path param: Identifier
@@ -287,9 +253,14 @@ export interface FirewallListParams extends V4PagePaginationArrayParams {
 
 export interface FirewallDeleteParams {
   /**
-   * Identifier
+   * Path param: Identifier
    */
   account_id: string;
+
+  /**
+   * Body param:
+   */
+  body: unknown;
 }
 
 export interface FirewallEditParams {
@@ -306,7 +277,7 @@ export interface FirewallEditParams {
   /**
    * Body param:
    */
-  dns_firewall_ips: Array<string | string>;
+  dns_firewall_ips: Array<FirewallIPs>;
 
   /**
    * Body param: Forward client IP (resolver) subnet if no EDNS Client Subnet is
@@ -332,23 +303,18 @@ export interface FirewallEditParams {
   /**
    * Body param:
    */
-  upstream_ips: Array<string | string>;
+  upstream_ips: Array<UpstreamIPs>;
 
   /**
    * Body param: Attack mitigation settings.
    */
-  attack_mitigation?: FirewallEditParams.AttackMitigation | null;
+  attack_mitigation?: AttackMitigation | null;
 
   /**
    * Body param: Negative DNS Cache TTL.
    */
   negative_cache_ttl?: number | null;
 
-  /**
-   * Body param: Deprecated alias for "upstream_ips".
-   */
-  origin_ips?: unknown;
-
   /**
    * Body param: Ratelimit in queries per second per datacenter (applies to DNS
    * queries sent to the upstream nameservers configured on the cluster).
@@ -362,29 +328,6 @@ export interface FirewallEditParams {
   retries?: number;
 }
 
-export namespace FirewallEditParams {
-  /**
-   * Attack mitigation settings.
-   */
-  export interface AttackMitigation {
-    /**
-     * When enabled, random-prefix attacks are automatically mitigated and the upstream
-     * DNS servers protected.
-     */
-    enabled?: boolean;
-
-    /**
-     * @deprecated: Deprecated alias for "only_when_upstream_unhealthy".
-     */
-    only_when_origin_unhealthy?: unknown;
-
-    /**
-     * Only mitigate attacks when upstream servers seem unhealthy.
-     */
-    only_when_upstream_unhealthy?: boolean;
-  }
-}
-
 export interface FirewallGetParams {
   /**
    * Identifier
@@ -392,10 +335,13 @@ export interface FirewallGetParams {
   account_id: string;
 }
 
-export namespace Firewall {
-  export import DNSFirewallDNSFirewall = FirewallAPI.DNSFirewallDNSFirewall;
+export namespace FirewallResource {
+  export import AttackMitigation = FirewallAPI.AttackMitigation;
+  export import Firewall = FirewallAPI.Firewall;
+  export import FirewallIPs = FirewallAPI.FirewallIPs;
+  export import UpstreamIPs = FirewallAPI.UpstreamIPs;
   export import FirewallDeleteResponse = FirewallAPI.FirewallDeleteResponse;
-  export import DNSFirewallDNSFirewallsV4PagePaginationArray = FirewallAPI.DNSFirewallDNSFirewallsV4PagePaginationArray;
+  export import FirewallsV4PagePaginationArray = FirewallAPI.FirewallsV4PagePaginationArray;
   export import FirewallCreateParams = FirewallAPI.FirewallCreateParams;
   export import FirewallListParams = FirewallAPI.FirewallListParams;
   export import FirewallDeleteParams = FirewallAPI.FirewallDeleteParams;