cloudflare 3.0.0-beta.6 → 3.0.0-beta.7

package/src/resources/magic-transit/sites/acls.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,13 +9,13 @@ export class ACLs extends APIResource {
    * Creates a new Site ACL.
    */
   create(
-    accountIdentifier: string,
-    siteIdentifier: string,
-    body: ACLCreateParams,
+    siteId: string,
+    params: ACLCreateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<ACLCreateResponse> {
+    const { account_id, ...body } = params;
     return (
-      this._client.post(`/accounts/${accountIdentifier}/magic/sites/${siteIdentifier}/acls`, {
+      this._client.post(`/accounts/${account_id}/magic/sites/${siteId}/acls`, {
         body,
         ...options,
       }) as Core.APIPromise<{ result: ACLCreateResponse }>
@@ -26,14 +26,14 @@ export class ACLs extends APIResource {
    * Update a specific Site ACL.
    */
   update(
-    accountIdentifier: string,
-    siteIdentifier: string,
+    siteId: string,
     aclIdentifier: string,
-    body: ACLUpdateParams,
+    params: ACLUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<ACLUpdateResponse> {
+    const { account_id, ...body } = params;
     return (
-      this._client.put(`/accounts/${accountIdentifier}/magic/sites/${siteIdentifier}/acls/${aclIdentifier}`, {
+      this._client.put(`/accounts/${account_id}/magic/sites/${siteId}/acls/${aclIdentifier}`, {
         body,
         ...options,
       }) as Core.APIPromise<{ result: ACLUpdateResponse }>
@@ -44,15 +44,15 @@ export class ACLs extends APIResource {
    * Lists Site ACLs associated with an account.
    */
   list(
-    accountIdentifier: string,
-    siteIdentifier: string,
+    siteId: string,
+    params: ACLListParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<ACLListResponse> {
+    const { account_id } = params;
     return (
-      this._client.get(
-        `/accounts/${accountIdentifier}/magic/sites/${siteIdentifier}/acls`,
-        options,
-      ) as Core.APIPromise<{ result: ACLListResponse }>
+      this._client.get(`/accounts/${account_id}/magic/sites/${siteId}/acls`, options) as Core.APIPromise<{
+        result: ACLListResponse;
+      }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -60,14 +60,15 @@ export class ACLs extends APIResource {
    * Remove a specific Site ACL.
    */
   delete(
-    accountIdentifier: string,
-    siteIdentifier: string,
+    siteId: string,
     aclIdentifier: string,
+    params: ACLDeleteParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<ACLDeleteResponse> {
+    const { account_id } = params;
     return (
       this._client.delete(
-        `/accounts/${accountIdentifier}/magic/sites/${siteIdentifier}/acls/${aclIdentifier}`,
+        `/accounts/${account_id}/magic/sites/${siteId}/acls/${aclIdentifier}`,
         options,
       ) as Core.APIPromise<{ result: ACLDeleteResponse }>
     )._thenUnwrap((obj) => obj.result);
@@ -77,14 +78,15 @@ export class ACLs extends APIResource {
    * Get a specific Site ACL.
    */
   get(
-    accountIdentifier: string,
-    siteIdentifier: string,
+    siteId: string,
     aclIdentifier: string,
+    params: ACLGetParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<ACLGetResponse> {
+    const { account_id } = params;
     return (
       this._client.get(
-        `/accounts/${accountIdentifier}/magic/sites/${siteIdentifier}/acls/${aclIdentifier}`,
+        `/accounts/${account_id}/magic/sites/${siteId}/acls/${aclIdentifier}`,
         options,
       ) as Core.APIPromise<{ result: ACLGetResponse }>
     )._thenUnwrap((obj) => obj.result);
@@ -513,6 +515,14 @@ export namespace ACLGetResponse {
 }
 
 export interface ACLCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
   acl?: ACLCreateParams.ACL;
 }
 
@@ -587,6 +597,14 @@ export namespace ACLCreateParams {
 }
 
 export interface ACLUpdateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
   acl?: ACLUpdateParams.ACL;
 }
 
@@ -660,6 +678,27 @@ export namespace ACLUpdateParams {
   }
 }
 
+export interface ACLListParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export interface ACLDeleteParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export interface ACLGetParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
 export namespace ACLs {
   export import ACLCreateResponse = ACLsAPI.ACLCreateResponse;
   export import ACLUpdateResponse = ACLsAPI.ACLUpdateResponse;
@@ -668,4 +707,7 @@ export namespace ACLs {
   export import ACLGetResponse = ACLsAPI.ACLGetResponse;
   export import ACLCreateParams = ACLsAPI.ACLCreateParams;
   export import ACLUpdateParams = ACLsAPI.ACLUpdateParams;
+  export import ACLListParams = ACLsAPI.ACLListParams;
+  export import ACLDeleteParams = ACLsAPI.ACLDeleteParams;
+  export import ACLGetParams = ACLsAPI.ACLGetParams;
 }

package/src/resources/magic-transit/sites/index.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.
 
 export {
   ACLCreateResponse,
@@ -8,6 +8,9 @@ export {
   ACLGetResponse,
   ACLCreateParams,
   ACLUpdateParams,
+  ACLListParams,
+  ACLDeleteParams,
+  ACLGetParams,
   ACLs,
 } from './acls';
 export {
@@ -18,6 +21,9 @@ export {
   LanGetResponse,
   LanCreateParams,
   LanUpdateParams,
+  LanListParams,
+  LanDeleteParams,
+  LanGetParams,
   Lans,
 } from './lans';
 export {
@@ -28,6 +34,9 @@ export {
   SiteGetResponse,
   SiteCreateParams,
   SiteUpdateParams,
+  SiteListParams,
+  SiteDeleteParams,
+  SiteGetParams,
   Sites,
 } from './sites';
 export {
@@ -38,5 +47,8 @@ export {
   WanGetResponse,
   WanCreateParams,
   WanUpdateParams,
+  WanListParams,
+  WanDeleteParams,
+  WanGetParams,
   Wans,
 } from './wans';

package/src/resources/magic-transit/sites/lans.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";
@@ -10,13 +10,13 @@ export class Lans extends APIResource {
    * is required along with secondary and virtual address.
    */
   create(
-    accountIdentifier: string,
-    siteIdentifier: string,
-    body: LanCreateParams,
+    siteId: string,
+    params: LanCreateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<LanCreateResponse> {
+    const { account_id, ...body } = params;
     return (
-      this._client.post(`/accounts/${accountIdentifier}/magic/sites/${siteIdentifier}/lans`, {
+      this._client.post(`/accounts/${account_id}/magic/sites/${siteId}/lans`, {
         body,
         ...options,
       }) as Core.APIPromise<{ result: LanCreateResponse }>
@@ -27,14 +27,14 @@ export class Lans extends APIResource {
    * Update a specific LAN.
    */
   update(
-    accountIdentifier: string,
-    siteIdentifier: string,
-    lanIdentifier: string,
-    body: LanUpdateParams,
+    siteId: string,
+    lanId: string,
+    params: LanUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<LanUpdateResponse> {
+    const { account_id, ...body } = params;
     return (
-      this._client.put(`/accounts/${accountIdentifier}/magic/sites/${siteIdentifier}/lans/${lanIdentifier}`, {
+      this._client.put(`/accounts/${account_id}/magic/sites/${siteId}/lans/${lanId}`, {
         body,
         ...options,
       }) as Core.APIPromise<{ result: LanUpdateResponse }>
@@ -45,15 +45,15 @@ export class Lans extends APIResource {
    * Lists LANs associated with an account and site.
    */
   list(
-    accountIdentifier: string,
-    siteIdentifier: string,
+    siteId: string,
+    params: LanListParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<LanListResponse> {
+    const { account_id } = params;
     return (
-      this._client.get(
-        `/accounts/${accountIdentifier}/magic/sites/${siteIdentifier}/lans`,
-        options,
-      ) as Core.APIPromise<{ result: LanListResponse }>
+      this._client.get(`/accounts/${account_id}/magic/sites/${siteId}/lans`, options) as Core.APIPromise<{
+        result: LanListResponse;
+      }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -61,14 +61,15 @@ export class Lans extends APIResource {
    * Remove a specific LAN.
    */
   delete(
-    accountIdentifier: string,
-    siteIdentifier: string,
-    lanIdentifier: string,
+    siteId: string,
+    lanId: string,
+    params: LanDeleteParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<LanDeleteResponse> {
+    const { account_id } = params;
     return (
       this._client.delete(
-        `/accounts/${accountIdentifier}/magic/sites/${siteIdentifier}/lans/${lanIdentifier}`,
+        `/accounts/${account_id}/magic/sites/${siteId}/lans/${lanId}`,
         options,
       ) as Core.APIPromise<{ result: LanDeleteResponse }>
     )._thenUnwrap((obj) => obj.result);
@@ -78,14 +79,15 @@ export class Lans extends APIResource {
    * Get a specific LAN.
    */
   get(
-    accountIdentifier: string,
-    siteIdentifier: string,
-    lanIdentifier: string,
+    siteId: string,
+    lanId: string,
+    params: LanGetParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<LanGetResponse> {
+    const { account_id } = params;
     return (
       this._client.get(
-        `/accounts/${accountIdentifier}/magic/sites/${siteIdentifier}/lans/${lanIdentifier}`,
+        `/accounts/${account_id}/magic/sites/${siteId}/lans/${lanId}`,
         options,
       ) as Core.APIPromise<{ result: LanGetResponse }>
     )._thenUnwrap((obj) => obj.result);
@@ -760,6 +762,14 @@ export namespace LanGetResponse {
 }
 
 export interface LanCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
   lan?: LanCreateParams.Lan;
 }
 
@@ -883,6 +893,14 @@ export namespace LanCreateParams {
 }
 
 export interface LanUpdateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
   lan?: LanUpdateParams.Lan;
 }
 
@@ -999,6 +1017,27 @@ export namespace LanUpdateParams {
   }
 }
 
+export interface LanListParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export interface LanDeleteParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export interface LanGetParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
 export namespace Lans {
   export import LanCreateResponse = LansAPI.LanCreateResponse;
   export import LanUpdateResponse = LansAPI.LanUpdateResponse;
@@ -1007,4 +1046,7 @@ export namespace Lans {
   export import LanGetResponse = LansAPI.LanGetResponse;
   export import LanCreateParams = LansAPI.LanCreateParams;
   export import LanUpdateParams = LansAPI.LanUpdateParams;
+  export import LanListParams = LansAPI.LanListParams;
+  export import LanDeleteParams = LansAPI.LanDeleteParams;
+  export import LanGetParams = LansAPI.LanGetParams;
 }

package/src/resources/magic-transit/sites/sites.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";
@@ -15,16 +15,12 @@ export class Sites extends APIResource {
   /**
    * Creates a new Site
    */
-  create(
-    accountIdentifier: string,
-    body: SiteCreateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<SiteCreateResponse> {
+  create(params: SiteCreateParams, options?: Core.RequestOptions): Core.APIPromise<SiteCreateResponse> {
+    const { account_id, ...body } = params;
     return (
-      this._client.post(`/accounts/${accountIdentifier}/magic/sites`, {
-        body,
-        ...options,
-      }) as Core.APIPromise<{ result: SiteCreateResponse }>
+      this._client.post(`/accounts/${account_id}/magic/sites`, { body, ...options }) as Core.APIPromise<{
+        result: SiteCreateResponse;
+      }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -32,13 +28,13 @@ export class Sites extends APIResource {
    * Update a specific Site.
    */
   update(
-    accountIdentifier: string,
-    siteIdentifier: string,
-    body: SiteUpdateParams,
+    siteId: string,
+    params: SiteUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<SiteUpdateResponse> {
+    const { account_id, ...body } = params;
     return (
-      this._client.put(`/accounts/${accountIdentifier}/magic/sites/${siteIdentifier}`, {
+      this._client.put(`/accounts/${account_id}/magic/sites/${siteId}`, {
         body,
         ...options,
       }) as Core.APIPromise<{ result: SiteUpdateResponse }>
@@ -50,9 +46,10 @@ export class Sites extends APIResource {
    * return sites where connector_identifier matches either site.ConnectorID or
    * site.SecondaryConnectorID.
    */
-  list(accountIdentifier: string, options?: Core.RequestOptions): Core.APIPromise<SiteListResponse> {
+  list(params: SiteListParams, options?: Core.RequestOptions): Core.APIPromise<SiteListResponse> {
+    const { account_id, ...query } = params;
     return (
-      this._client.get(`/accounts/${accountIdentifier}/magic/sites`, options) as Core.APIPromise<{
+      this._client.get(`/accounts/${account_id}/magic/sites`, { query, ...options }) as Core.APIPromise<{
         result: SiteListResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
@@ -62,15 +59,15 @@ export class Sites extends APIResource {
    * Remove a specific Site.
    */
   delete(
-    accountIdentifier: string,
-    siteIdentifier: string,
+    siteId: string,
+    params: SiteDeleteParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<SiteDeleteResponse> {
+    const { account_id } = params;
     return (
-      this._client.delete(
-        `/accounts/${accountIdentifier}/magic/sites/${siteIdentifier}`,
-        options,
-      ) as Core.APIPromise<{ result: SiteDeleteResponse }>
+      this._client.delete(`/accounts/${account_id}/magic/sites/${siteId}`, options) as Core.APIPromise<{
+        result: SiteDeleteResponse;
+      }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -78,15 +75,15 @@ export class Sites extends APIResource {
    * Get a specific Site.
    */
   get(
-    accountIdentifier: string,
-    siteIdentifier: string,
+    siteId: string,
+    params: SiteGetParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<SiteGetResponse> {
+    const { account_id } = params;
     return (
-      this._client.get(
-        `/accounts/${accountIdentifier}/magic/sites/${siteIdentifier}`,
-        options,
-      ) as Core.APIPromise<{ result: SiteGetResponse }>
+      this._client.get(`/accounts/${account_id}/magic/sites/${siteId}`, options) as Core.APIPromise<{
+        result: SiteGetResponse;
+      }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -384,6 +381,14 @@ export namespace SiteGetResponse {
 }
 
 export interface SiteCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
   site?: SiteCreateParams.Site;
 }
 
@@ -437,6 +442,14 @@ export namespace SiteCreateParams {
 }
 
 export interface SiteUpdateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
   site?: SiteUpdateParams.Site;
 }
 
@@ -483,6 +496,27 @@ export namespace SiteUpdateParams {
   }
 }
 
+export interface SiteListParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export interface SiteDeleteParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export interface SiteGetParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
 export namespace Sites {
   export import SiteCreateResponse = SitesAPI.SiteCreateResponse;
   export import SiteUpdateResponse = SitesAPI.SiteUpdateResponse;
@@ -491,6 +525,9 @@ export namespace Sites {
   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;
   export import ACLs = ACLsAPI.ACLs;
   export import ACLCreateResponse = ACLsAPI.ACLCreateResponse;
   export import ACLUpdateResponse = ACLsAPI.ACLUpdateResponse;
@@ -499,6 +536,9 @@ export namespace Sites {
   export import ACLGetResponse = ACLsAPI.ACLGetResponse;
   export import ACLCreateParams = ACLsAPI.ACLCreateParams;
   export import ACLUpdateParams = ACLsAPI.ACLUpdateParams;
+  export import ACLListParams = ACLsAPI.ACLListParams;
+  export import ACLDeleteParams = ACLsAPI.ACLDeleteParams;
+  export import ACLGetParams = ACLsAPI.ACLGetParams;
   export import Lans = LansAPI.Lans;
   export import LanCreateResponse = LansAPI.LanCreateResponse;
   export import LanUpdateResponse = LansAPI.LanUpdateResponse;
@@ -507,6 +547,9 @@ export namespace Sites {
   export import LanGetResponse = LansAPI.LanGetResponse;
   export import LanCreateParams = LansAPI.LanCreateParams;
   export import LanUpdateParams = LansAPI.LanUpdateParams;
+  export import LanListParams = LansAPI.LanListParams;
+  export import LanDeleteParams = LansAPI.LanDeleteParams;
+  export import LanGetParams = LansAPI.LanGetParams;
   export import Wans = WansAPI.Wans;
   export import WanCreateResponse = WansAPI.WanCreateResponse;
   export import WanUpdateResponse = WansAPI.WanUpdateResponse;
@@ -515,4 +558,7 @@ export namespace Sites {
   export import WanGetResponse = WansAPI.WanGetResponse;
   export import WanCreateParams = WansAPI.WanCreateParams;
   export import WanUpdateParams = WansAPI.WanUpdateParams;
+  export import WanListParams = WansAPI.WanListParams;
+  export import WanDeleteParams = WansAPI.WanDeleteParams;
+  export import WanGetParams = WansAPI.WanGetParams;
 }