cloudflare 3.0.0-beta.6 → 3.0.0-beta.8

package/src/resources/magic-transit/index.ts

@@ -1,10 +1,12 @@
-// File generated from our OpenAPI spec by Stainless.
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
   CfInterconnectUpdateResponse,
   CfInterconnectListResponse,
   CfInterconnectGetResponse,
   CfInterconnectUpdateParams,
+  CfInterconnectListParams,
+  CfInterconnectGetParams,
   CfInterconnects,
 } from './cf-interconnects';
 export {
@@ -15,6 +17,9 @@ export {
   GRETunnelGetResponse,
   GRETunnelCreateParams,
   GRETunnelUpdateParams,
+  GRETunnelListParams,
+  GRETunnelDeleteParams,
+  GRETunnelGetParams,
   GRETunnels,
 } from './gre-tunnels';
 export {
@@ -26,6 +31,10 @@ export {
   IPSECTunnelPSKGenerateResponse,
   IPSECTunnelCreateParams,
   IPSECTunnelUpdateParams,
+  IPSECTunnelListParams,
+  IPSECTunnelDeleteParams,
+  IPSECTunnelGetParams,
+  IPSECTunnelPSKGenerateParams,
   IPSECTunnels,
 } from './ipsec-tunnels';
 export { MagicTransit } from './magic-transit';
@@ -38,7 +47,10 @@ export {
   RouteGetResponse,
   RouteCreateParams,
   RouteUpdateParams,
+  RouteListParams,
+  RouteDeleteParams,
   RouteEmptyParams,
+  RouteGetParams,
   Routes,
 } from './routes';
 export {
@@ -49,5 +61,8 @@ export {
   SiteGetResponse,
   SiteCreateParams,
   SiteUpdateParams,
+  SiteListParams,
+  SiteDeleteParams,
+  SiteGetParams,
   Sites,
 } from './sites/index';

package/src/resources/magic-transit/ipsec-tunnels.ts

@@ -1,4 +1,4 @@
-// File generated from our OpenAPI spec by Stainless.
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import * as Core from "../../core";
 import { APIResource } from "../../resource";
@@ -11,12 +11,12 @@ export class IPSECTunnels extends APIResource {
    * changes.
    */
   create(
-    accountIdentifier: string,
-    body: IPSECTunnelCreateParams,
+    params: IPSECTunnelCreateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<IPSECTunnelCreateResponse> {
+    const { account_id, ...body } = params;
     return (
-      this._client.post(`/accounts/${accountIdentifier}/magic/ipsec_tunnels`, {
+      this._client.post(`/accounts/${account_id}/magic/ipsec_tunnels`, {
         body,
         ...options,
       }) as Core.APIPromise<{ result: IPSECTunnelCreateResponse }>
@@ -29,13 +29,13 @@ export class IPSECTunnels extends APIResource {
    * without persisting changes.
    */
   update(
-    accountIdentifier: string,
     tunnelIdentifier: string,
-    body: IPSECTunnelUpdateParams,
+    params: IPSECTunnelUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<IPSECTunnelUpdateResponse> {
+    const { account_id, ...body } = params;
     return (
-      this._client.put(`/accounts/${accountIdentifier}/magic/ipsec_tunnels/${tunnelIdentifier}`, {
+      this._client.put(`/accounts/${account_id}/magic/ipsec_tunnels/${tunnelIdentifier}`, {
         body,
         ...options,
       }) as Core.APIPromise<{ result: IPSECTunnelUpdateResponse }>
@@ -45,9 +45,13 @@ export class IPSECTunnels extends APIResource {
   /**
    * Lists IPsec tunnels associated with an account.
    */
-  list(accountIdentifier: string, options?: Core.RequestOptions): Core.APIPromise<IPSECTunnelListResponse> {
+  list(
+    params: IPSECTunnelListParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<IPSECTunnelListResponse> {
+    const { account_id } = params;
     return (
-      this._client.get(`/accounts/${accountIdentifier}/magic/ipsec_tunnels`, options) as Core.APIPromise<{
+      this._client.get(`/accounts/${account_id}/magic/ipsec_tunnels`, options) as Core.APIPromise<{
         result: IPSECTunnelListResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
@@ -59,13 +63,14 @@ export class IPSECTunnels extends APIResource {
    * without persisting changes.
    */
   delete(
-    accountIdentifier: string,
     tunnelIdentifier: string,
+    params: IPSECTunnelDeleteParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<IPSECTunnelDeleteResponse> {
+    const { account_id } = params;
     return (
       this._client.delete(
-        `/accounts/${accountIdentifier}/magic/ipsec_tunnels/${tunnelIdentifier}`,
+        `/accounts/${account_id}/magic/ipsec_tunnels/${tunnelIdentifier}`,
         options,
       ) as Core.APIPromise<{ result: IPSECTunnelDeleteResponse }>
     )._thenUnwrap((obj) => obj.result);
@@ -75,13 +80,14 @@ export class IPSECTunnels extends APIResource {
    * Lists details for a specific IPsec tunnel.
    */
   get(
-    accountIdentifier: string,
     tunnelIdentifier: string,
+    params: IPSECTunnelGetParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<IPSECTunnelGetResponse> {
+    const { account_id } = params;
     return (
       this._client.get(
-        `/accounts/${accountIdentifier}/magic/ipsec_tunnels/${tunnelIdentifier}`,
+        `/accounts/${account_id}/magic/ipsec_tunnels/${tunnelIdentifier}`,
         options,
       ) as Core.APIPromise<{ result: IPSECTunnelGetResponse }>
     )._thenUnwrap((obj) => obj.result);
@@ -95,13 +101,14 @@ export class IPSECTunnels extends APIResource {
    * safe place.
    */
   pskGenerate(
-    accountIdentifier: string,
     tunnelIdentifier: string,
+    params: IPSECTunnelPSKGenerateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<IPSECTunnelPSKGenerateResponse> {
+    const { account_id } = params;
     return (
       this._client.post(
-        `/accounts/${accountIdentifier}/magic/ipsec_tunnels/${tunnelIdentifier}/psk_generate`,
+        `/accounts/${account_id}/magic/ipsec_tunnels/${tunnelIdentifier}/psk_generate`,
         options,
       ) as Core.APIPromise<{ result: IPSECTunnelPSKGenerateResponse }>
     )._thenUnwrap((obj) => obj.result);
@@ -365,41 +372,50 @@ export namespace IPSECTunnelPSKGenerateResponse {
 
 export interface IPSECTunnelCreateParams {
   /**
-   * The IP address assigned to the Cloudflare side of the IPsec tunnel.
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: The IP address assigned to the Cloudflare side of the IPsec tunnel.
    */
   cloudflare_endpoint: string;
 
   /**
-   * A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
-   * of the tunnel. Select the subnet from the following private IP space:
+   * Body param: A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for
+   * each side of the tunnel. Select the subnet from the following private IP space:
    * 10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
    */
   interface_address: string;
 
   /**
-   * The name of the IPsec tunnel. The name cannot share a name with other tunnels.
+   * Body param: The name of the IPsec tunnel. The name cannot share a name with
+   * other tunnels.
    */
   name: string;
 
   /**
-   * The IP address assigned to the customer side of the IPsec tunnel.
+   * Body param: The IP address assigned to the customer side of the IPsec tunnel.
    */
   customer_endpoint?: string;
 
   /**
-   * An optional description forthe IPsec tunnel.
+   * Body param: An optional description forthe IPsec tunnel.
    */
   description?: string;
 
+  /**
+   * Body param:
+   */
   health_check?: IPSECTunnelCreateParams.HealthCheck;
 
   /**
-   * A randomly generated or provided string for use in the IPsec tunnel.
+   * Body param: A randomly generated or provided string for use in the IPsec tunnel.
    */
   psk?: string;
 
   /**
-   * If `true`, then IPsec replay protection will be supported in the
+   * Body param: If `true`, then IPsec replay protection will be supported in the
    * Cloudflare-to-customer direction.
    */
   replay_protection?: boolean;
@@ -445,41 +461,50 @@ export namespace IPSECTunnelCreateParams {
 
 export interface IPSECTunnelUpdateParams {
   /**
-   * The IP address assigned to the Cloudflare side of the IPsec tunnel.
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: The IP address assigned to the Cloudflare side of the IPsec tunnel.
    */
   cloudflare_endpoint: string;
 
   /**
-   * A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
-   * of the tunnel. Select the subnet from the following private IP space:
+   * Body param: A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for
+   * each side of the tunnel. Select the subnet from the following private IP space:
    * 10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
    */
   interface_address: string;
 
   /**
-   * The name of the IPsec tunnel. The name cannot share a name with other tunnels.
+   * Body param: The name of the IPsec tunnel. The name cannot share a name with
+   * other tunnels.
    */
   name: string;
 
   /**
-   * The IP address assigned to the customer side of the IPsec tunnel.
+   * Body param: The IP address assigned to the customer side of the IPsec tunnel.
    */
   customer_endpoint?: string;
 
   /**
-   * An optional description forthe IPsec tunnel.
+   * Body param: An optional description forthe IPsec tunnel.
    */
   description?: string;
 
+  /**
+   * Body param:
+   */
   health_check?: IPSECTunnelUpdateParams.HealthCheck;
 
   /**
-   * A randomly generated or provided string for use in the IPsec tunnel.
+   * Body param: A randomly generated or provided string for use in the IPsec tunnel.
    */
   psk?: string;
 
   /**
-   * If `true`, then IPsec replay protection will be supported in the
+   * Body param: If `true`, then IPsec replay protection will be supported in the
    * Cloudflare-to-customer direction.
    */
   replay_protection?: boolean;
@@ -523,6 +548,34 @@ export namespace IPSECTunnelUpdateParams {
   }
 }
 
+export interface IPSECTunnelListParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export interface IPSECTunnelDeleteParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export interface IPSECTunnelGetParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export interface IPSECTunnelPSKGenerateParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
 export namespace IPSECTunnels {
   export import IPSECTunnelCreateResponse = IPSECTunnelsAPI.IPSECTunnelCreateResponse;
   export import IPSECTunnelUpdateResponse = IPSECTunnelsAPI.IPSECTunnelUpdateResponse;
@@ -532,4 +585,8 @@ export namespace IPSECTunnels {
   export import IPSECTunnelPSKGenerateResponse = IPSECTunnelsAPI.IPSECTunnelPSKGenerateResponse;
   export import IPSECTunnelCreateParams = IPSECTunnelsAPI.IPSECTunnelCreateParams;
   export import IPSECTunnelUpdateParams = IPSECTunnelsAPI.IPSECTunnelUpdateParams;
+  export import IPSECTunnelListParams = IPSECTunnelsAPI.IPSECTunnelListParams;
+  export import IPSECTunnelDeleteParams = IPSECTunnelsAPI.IPSECTunnelDeleteParams;
+  export import IPSECTunnelGetParams = IPSECTunnelsAPI.IPSECTunnelGetParams;
+  export import IPSECTunnelPSKGenerateParams = IPSECTunnelsAPI.IPSECTunnelPSKGenerateParams;
 }

package/src/resources/magic-transit/magic-transit.ts

@@ -1,4 +1,4 @@
-// File generated from our OpenAPI spec by Stainless.
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from "../../resource";
 import * as CfInterconnectsAPI from "./cf-interconnects";
@@ -21,6 +21,8 @@ export namespace MagicTransit {
   export import CfInterconnectListResponse = CfInterconnectsAPI.CfInterconnectListResponse;
   export import CfInterconnectGetResponse = CfInterconnectsAPI.CfInterconnectGetResponse;
   export import CfInterconnectUpdateParams = CfInterconnectsAPI.CfInterconnectUpdateParams;
+  export import CfInterconnectListParams = CfInterconnectsAPI.CfInterconnectListParams;
+  export import CfInterconnectGetParams = CfInterconnectsAPI.CfInterconnectGetParams;
   export import GRETunnels = GRETunnelsAPI.GRETunnels;
   export import GRETunnelCreateResponse = GRETunnelsAPI.GRETunnelCreateResponse;
   export import GRETunnelUpdateResponse = GRETunnelsAPI.GRETunnelUpdateResponse;
@@ -29,6 +31,9 @@ export namespace MagicTransit {
   export import GRETunnelGetResponse = GRETunnelsAPI.GRETunnelGetResponse;
   export import GRETunnelCreateParams = GRETunnelsAPI.GRETunnelCreateParams;
   export import GRETunnelUpdateParams = GRETunnelsAPI.GRETunnelUpdateParams;
+  export import GRETunnelListParams = GRETunnelsAPI.GRETunnelListParams;
+  export import GRETunnelDeleteParams = GRETunnelsAPI.GRETunnelDeleteParams;
+  export import GRETunnelGetParams = GRETunnelsAPI.GRETunnelGetParams;
   export import IPSECTunnels = IPSECTunnelsAPI.IPSECTunnels;
   export import IPSECTunnelCreateResponse = IPSECTunnelsAPI.IPSECTunnelCreateResponse;
   export import IPSECTunnelUpdateResponse = IPSECTunnelsAPI.IPSECTunnelUpdateResponse;
@@ -38,6 +43,10 @@ export namespace MagicTransit {
   export import IPSECTunnelPSKGenerateResponse = IPSECTunnelsAPI.IPSECTunnelPSKGenerateResponse;
   export import IPSECTunnelCreateParams = IPSECTunnelsAPI.IPSECTunnelCreateParams;
   export import IPSECTunnelUpdateParams = IPSECTunnelsAPI.IPSECTunnelUpdateParams;
+  export import IPSECTunnelListParams = IPSECTunnelsAPI.IPSECTunnelListParams;
+  export import IPSECTunnelDeleteParams = IPSECTunnelsAPI.IPSECTunnelDeleteParams;
+  export import IPSECTunnelGetParams = IPSECTunnelsAPI.IPSECTunnelGetParams;
+  export import IPSECTunnelPSKGenerateParams = IPSECTunnelsAPI.IPSECTunnelPSKGenerateParams;
   export import Routes = RoutesAPI.Routes;
   export import RouteCreateResponse = RoutesAPI.RouteCreateResponse;
   export import RouteUpdateResponse = RoutesAPI.RouteUpdateResponse;
@@ -47,7 +56,10 @@ export namespace MagicTransit {
   export import RouteGetResponse = RoutesAPI.RouteGetResponse;
   export import RouteCreateParams = RoutesAPI.RouteCreateParams;
   export import RouteUpdateParams = RoutesAPI.RouteUpdateParams;
+  export import RouteListParams = RoutesAPI.RouteListParams;
+  export import RouteDeleteParams = RoutesAPI.RouteDeleteParams;
   export import RouteEmptyParams = RoutesAPI.RouteEmptyParams;
+  export import RouteGetParams = RoutesAPI.RouteGetParams;
   export import Sites = SitesAPI.Sites;
   export import SiteCreateResponse = SitesAPI.SiteCreateResponse;
   export import SiteUpdateResponse = SitesAPI.SiteUpdateResponse;
@@ -56,4 +68,7 @@ export namespace MagicTransit {
   export import SiteGetResponse = SitesAPI.SiteGetResponse;
   export import SiteCreateParams = SitesAPI.SiteCreateParams;
   export import SiteUpdateParams = SitesAPI.SiteUpdateParams;
+  export import SiteListParams = SitesAPI.SiteListParams;
+  export import SiteDeleteParams = SitesAPI.SiteDeleteParams;
+  export import SiteGetParams = SitesAPI.SiteGetParams;
 }

package/src/resources/magic-transit/routes.ts

@@ -1,4 +1,4 @@
-// File generated from our OpenAPI spec by Stainless.
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import * as Core from "../../core";
 import { APIResource } from "../../resource";
@@ -9,14 +9,11 @@ export class Routes extends APIResource {
    * Creates a new Magic static route. Use `?validate_only=true` as an optional query
    * parameter to run validation only without persisting changes.
    */
-  create(
-    accountIdentifier: string,
-    body: RouteCreateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<RouteCreateResponse> {
+  create(params: RouteCreateParams, options?: Core.RequestOptions): Core.APIPromise<RouteCreateResponse> {
+    const { account_id, body } = params;
     return (
-      this._client.post(`/accounts/${accountIdentifier}/magic/routes`, {
-        body,
+      this._client.post(`/accounts/${account_id}/magic/routes`, {
+        body: body,
         ...options,
       }) as Core.APIPromise<{ result: RouteCreateResponse }>
     )._thenUnwrap((obj) => obj.result);
@@ -27,13 +24,13 @@ export class Routes extends APIResource {
    * query parameter to run validation only without persisting changes.
    */
   update(
-    accountIdentifier: string,
     routeIdentifier: string,
-    body: RouteUpdateParams,
+    params: RouteUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<RouteUpdateResponse> {
+    const { account_id, ...body } = params;
     return (
-      this._client.put(`/accounts/${accountIdentifier}/magic/routes/${routeIdentifier}`, {
+      this._client.put(`/accounts/${account_id}/magic/routes/${routeIdentifier}`, {
         body,
         ...options,
       }) as Core.APIPromise<{ result: RouteUpdateResponse }>
@@ -43,9 +40,10 @@ export class Routes extends APIResource {
   /**
    * List all Magic static routes.
    */
-  list(accountIdentifier: string, options?: Core.RequestOptions): Core.APIPromise<RouteListResponse> {
+  list(params: RouteListParams, options?: Core.RequestOptions): Core.APIPromise<RouteListResponse> {
+    const { account_id } = params;
     return (
-      this._client.get(`/accounts/${accountIdentifier}/magic/routes`, options) as Core.APIPromise<{
+      this._client.get(`/accounts/${account_id}/magic/routes`, options) as Core.APIPromise<{
         result: RouteListResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
@@ -55,13 +53,14 @@ export class Routes extends APIResource {
    * Disable and remove a specific Magic static route.
    */
   delete(
-    accountIdentifier: string,
     routeIdentifier: string,
+    params: RouteDeleteParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<RouteDeleteResponse> {
+    const { account_id } = params;
     return (
       this._client.delete(
-        `/accounts/${accountIdentifier}/magic/routes/${routeIdentifier}`,
+        `/accounts/${account_id}/magic/routes/${routeIdentifier}`,
         options,
       ) as Core.APIPromise<{ result: RouteDeleteResponse }>
     )._thenUnwrap((obj) => obj.result);
@@ -70,16 +69,12 @@ export class Routes extends APIResource {
   /**
    * Delete multiple Magic static routes.
    */
-  empty(
-    accountIdentifier: string,
-    body: RouteEmptyParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<RouteEmptyResponse> {
+  empty(params: RouteEmptyParams, options?: Core.RequestOptions): Core.APIPromise<RouteEmptyResponse> {
+    const { account_id, ...body } = params;
     return (
-      this._client.delete(`/accounts/${accountIdentifier}/magic/routes`, {
-        body,
-        ...options,
-      }) as Core.APIPromise<{ result: RouteEmptyResponse }>
+      this._client.delete(`/accounts/${account_id}/magic/routes`, { body, ...options }) as Core.APIPromise<{
+        result: RouteEmptyResponse;
+      }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -87,13 +82,14 @@ export class Routes extends APIResource {
    * Get a specific Magic static route.
    */
   get(
-    accountIdentifier: string,
     routeIdentifier: string,
+    params: RouteGetParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<RouteGetResponse> {
+    const { account_id } = params;
     return (
       this._client.get(
-        `/accounts/${accountIdentifier}/magic/routes/${routeIdentifier}`,
+        `/accounts/${account_id}/magic/routes/${routeIdentifier}`,
         options,
       ) as Core.APIPromise<{ result: RouteGetResponse }>
     )._thenUnwrap((obj) => obj.result);
@@ -262,36 +258,51 @@ export interface RouteGetResponse {
   route?: unknown;
 }
 
-export type RouteCreateParams = unknown;
+export interface RouteCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  body: unknown;
+}
 
 export interface RouteUpdateParams {
   /**
-   * The next-hop IP Address for the static route.
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: The next-hop IP Address for the static route.
    */
   nexthop: string;
 
   /**
-   * IP Prefix in Classless Inter-Domain Routing format.
+   * Body param: IP Prefix in Classless Inter-Domain Routing format.
    */
   prefix: string;
 
   /**
-   * Priority of the static route.
+   * Body param: Priority of the static route.
    */
   priority: number;
 
   /**
-   * An optional human provided description of the static route.
+   * Body param: An optional human provided description of the static route.
    */
   description?: string;
 
   /**
-   * Used only for ECMP routes.
+   * Body param: Used only for ECMP routes.
    */
   scope?: RouteUpdateParams.Scope;
 
   /**
-   * Optional weight of the ECMP scope - if provided.
+   * Body param: Optional weight of the ECMP scope - if provided.
    */
   weight?: number;
 }
@@ -313,7 +324,29 @@ export namespace RouteUpdateParams {
   }
 }
 
+export interface RouteListParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export interface RouteDeleteParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
 export interface RouteEmptyParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
   routes: Array<RouteEmptyParams.Route>;
 }
 
@@ -321,6 +354,13 @@ export namespace RouteEmptyParams {
   export interface Route {}
 }
 
+export interface RouteGetParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
 export namespace Routes {
   export import RouteCreateResponse = RoutesAPI.RouteCreateResponse;
   export import RouteUpdateResponse = RoutesAPI.RouteUpdateResponse;
@@ -330,5 +370,8 @@ export namespace Routes {
   export import RouteGetResponse = RoutesAPI.RouteGetResponse;
   export import RouteCreateParams = RoutesAPI.RouteCreateParams;
   export import RouteUpdateParams = RoutesAPI.RouteUpdateParams;
+  export import RouteListParams = RoutesAPI.RouteListParams;
+  export import RouteDeleteParams = RoutesAPI.RouteDeleteParams;
   export import RouteEmptyParams = RoutesAPI.RouteEmptyParams;
+  export import RouteGetParams = RoutesAPI.RouteGetParams;
 }