@scaleway/sdk-s2s-vpn 2.3.0 → 2.4.1

package/dist/v1alpha1/api.gen.js

@@ -10,7 +10,11 @@ class API extends API$1 {
    * type ∈ {'zone','region','global','unspecified'}
    */
   static LOCALITY = toApiLocality({
-    regions: ["fr-par", "nl-ams", "pl-waw"]
+    regions: [
+      "fr-par",
+      "nl-ams",
+      "pl-waw"
+    ]
   });
   pageOfListVpnGatewayTypes = (request = {}) => this.client.fetch(
     {
@@ -18,10 +22,7 @@ class API extends API$1 {
       path: `/s2s-vpn/v1alpha1/regions/${validatePathParam("region", request.region ?? this.client.settings.defaultRegion)}/vpn-gateway-types`,
       urlParams: urlParams(
         ["page", request.page],
-        [
-          "page_size",
-          request.pageSize ?? this.client.settings.defaultPageSize
-        ]
+        ["page_size", request.pageSize ?? this.client.settings.defaultPageSize]
       )
     },
     unmarshalListVpnGatewayTypesResponse
@@ -41,11 +42,9 @@ class API extends API$1 {
         ["gateway_types", request.gatewayTypes],
         ["name", request.name],
         ["order_by", request.orderBy],
+        ["organization_id", request.organizationId],
         ["page", request.page],
-        [
-          "page_size",
-          request.pageSize ?? this.client.settings.defaultPageSize
-        ],
+        ["page_size", request.pageSize ?? this.client.settings.defaultPageSize],
         ["private_network_ids", request.privateNetworkIds],
         ["project_id", request.projectId],
         ["statuses", request.statuses],
@@ -82,9 +81,7 @@ class API extends API$1 {
    * @returns A Promise of VpnGateway
    */
   waitForVpnGateway = (request, options) => waitForResource(
-    options?.stop ?? ((res) => Promise.resolve(
-      !VPN_GATEWAY_TRANSIENT_STATUSES.includes(res.status)
-    )),
+    options?.stop ?? ((res) => Promise.resolve(!VPN_GATEWAY_TRANSIENT_STATUSES.includes(res.status))),
     this.getVpnGateway,
     request,
     options
@@ -145,11 +142,9 @@ class API extends API$1 {
         ["is_ipv6", request.isIpv6],
         ["name", request.name],
         ["order_by", request.orderBy],
+        ["organization_id", request.organizationId],
         ["page", request.page],
-        [
-          "page_size",
-          request.pageSize ?? this.client.settings.defaultPageSize
-        ],
+        ["page_size", request.pageSize ?? this.client.settings.defaultPageSize],
         ["project_id", request.projectId],
         ["route_propagation_enabled", request.routePropagationEnabled],
         ["routing_policy_ids", request.routingPolicyIds],
@@ -219,10 +214,12 @@ class API extends API$1 {
    *
    * @param request - The request {@link DeleteConnectionRequest}
    */
-  deleteConnection = (request) => this.client.fetch({
-    method: "DELETE",
-    path: `/s2s-vpn/v1alpha1/regions/${validatePathParam("region", request.region ?? this.client.settings.defaultRegion)}/connections/${validatePathParam("connectionId", request.connectionId)}`
-  });
+  deleteConnection = (request) => this.client.fetch(
+    {
+      method: "DELETE",
+      path: `/s2s-vpn/v1alpha1/regions/${validatePathParam("region", request.region ?? this.client.settings.defaultRegion)}/connections/${validatePathParam("connectionId", request.connectionId)}`
+    }
+  );
   /**
    * Renew pre-shared key. Renew pre-shared key for a given connection.
    *
@@ -309,11 +306,9 @@ class API extends API$1 {
       urlParams: urlParams(
         ["name", request.name],
         ["order_by", request.orderBy],
+        ["organization_id", request.organizationId],
         ["page", request.page],
-        [
-          "page_size",
-          request.pageSize ?? this.client.settings.defaultPageSize
-        ],
+        ["page_size", request.pageSize ?? this.client.settings.defaultPageSize],
         ["project_id", request.projectId],
         ["tags", request.tags]
       )
@@ -379,10 +374,12 @@ class API extends API$1 {
    *
    * @param request - The request {@link DeleteCustomerGatewayRequest}
    */
-  deleteCustomerGateway = (request) => this.client.fetch({
-    method: "DELETE",
-    path: `/s2s-vpn/v1alpha1/regions/${validatePathParam("region", request.region ?? this.client.settings.defaultRegion)}/customer-gateways/${validatePathParam("gatewayId", request.gatewayId)}`
-  });
+  deleteCustomerGateway = (request) => this.client.fetch(
+    {
+      method: "DELETE",
+      path: `/s2s-vpn/v1alpha1/regions/${validatePathParam("region", request.region ?? this.client.settings.defaultRegion)}/customer-gateways/${validatePathParam("gatewayId", request.gatewayId)}`
+    }
+  );
   pageOfListRoutingPolicies = (request = {}) => this.client.fetch(
     {
       method: "GET",
@@ -391,11 +388,9 @@ class API extends API$1 {
         ["ipv6", request.ipv6],
         ["name", request.name],
         ["order_by", request.orderBy],
+        ["organization_id", request.organizationId],
         ["page", request.page],
-        [
-          "page_size",
-          request.pageSize ?? this.client.settings.defaultPageSize
-        ],
+        ["page_size", request.pageSize ?? this.client.settings.defaultPageSize],
         ["project_id", request.projectId],
         ["tags", request.tags]
       )
@@ -408,11 +403,7 @@ class API extends API$1 {
    * @param request - The request {@link ListRoutingPoliciesRequest}
    * @returns A Promise of ListRoutingPoliciesResponse
    */
-  listRoutingPolicies = (request = {}) => enrichForPagination(
-    "routingPolicies",
-    this.pageOfListRoutingPolicies,
-    request
-  );
+  listRoutingPolicies = (request = {}) => enrichForPagination("routingPolicies", this.pageOfListRoutingPolicies, request);
   /**
    * Get routing policy. Get a routing policy for the given routing policy ID. The response object gives information including the policy's name, tags and prefix filters.
    *
@@ -465,10 +456,12 @@ class API extends API$1 {
    *
    * @param request - The request {@link DeleteRoutingPolicyRequest}
    */
-  deleteRoutingPolicy = (request) => this.client.fetch({
-    method: "DELETE",
-    path: `/s2s-vpn/v1alpha1/regions/${validatePathParam("region", request.region ?? this.client.settings.defaultRegion)}/routing-policies/${validatePathParam("routingPolicyId", request.routingPolicyId)}`
-  });
+  deleteRoutingPolicy = (request) => this.client.fetch(
+    {
+      method: "DELETE",
+      path: `/s2s-vpn/v1alpha1/regions/${validatePathParam("region", request.region ?? this.client.settings.defaultRegion)}/routing-policies/${validatePathParam("routingPolicyId", request.routingPolicyId)}`
+    }
+  );
 }
 export {
   API

package/dist/v1alpha1/index.gen.d.ts

@@ -1,5 +1,5 @@
-export { API } from './api.gen.js';
+export { API, } from './api.gen.js';
 export * from './content.gen.js';
 export * from './marshalling.gen.js';
-export type { BgpSession, BgpSessionStatus, Connection, ConnectionCipher, ConnectionDhGroup, ConnectionEncryption, ConnectionInitiationPolicy, ConnectionIntegrity, ConnectionStatus, CreateConnectionRequest, CreateConnectionRequestBgpConfig, CreateConnectionRequestInitiationPolicy, CreateConnectionResponse, CreateCustomerGatewayRequest, CreateRoutingPolicyRequest, CreateVpnGatewayRequest, CreateVpnGatewayRequestPublicConfig, CustomerGateway, DeleteConnectionRequest, DeleteCustomerGatewayRequest, DeleteRoutingPolicyRequest, DeleteVpnGatewayRequest, DetachRoutingPolicyRequest, DisableRoutePropagationRequest, EnableRoutePropagationRequest, GatewayType, GetConnectionRequest, GetCustomerGatewayRequest, GetRoutingPolicyRequest, GetVpnGatewayRequest, ListConnectionsRequest, ListConnectionsRequestOrderBy, ListConnectionsResponse, ListCustomerGatewaysRequest, ListCustomerGatewaysRequestOrderBy, ListCustomerGatewaysResponse, ListRoutingPoliciesRequest, ListRoutingPoliciesRequestOrderBy, ListRoutingPoliciesResponse, ListVpnGatewaysRequest, ListVpnGatewaysRequestOrderBy, ListVpnGatewaysResponse, ListVpnGatewayTypesRequest, ListVpnGatewayTypesResponse, RenewConnectionPskRequest, RenewConnectionPskResponse, RoutingPolicy, SetRoutingPolicyRequest, TunnelStatus, UpdateConnectionRequest, UpdateCustomerGatewayRequest, UpdateRoutingPolicyRequest, UpdateVpnGatewayRequest, VpnGateway, VpnGatewayPrivateConfig, VpnGatewayPublicConfig, VpnGatewayStatus, } from './types.gen.js';
+export type { BgpSession, BgpSessionStatus, Connection, ConnectionCipher, ConnectionDhGroup, ConnectionEncryption, ConnectionInitiationPolicy, ConnectionIntegrity, ConnectionStatus, CreateConnectionRequest, CreateConnectionRequestBgpConfig, CreateConnectionRequestInitiationPolicy, CreateConnectionResponse, CreateCustomerGatewayRequest, CreateRoutingPolicyRequest, CreateVpnGatewayRequest, CreateVpnGatewayRequestDualIpTunnel, CreateVpnGatewayRequestPublicConfig, CreateVpnGatewayRequestPublicTunnelConfig, CreateVpnGatewayRequestSingleIpTunnel, CustomerGateway, DeleteConnectionRequest, DeleteCustomerGatewayRequest, DeleteRoutingPolicyRequest, DeleteVpnGatewayRequest, DetachRoutingPolicyRequest, DisableRoutePropagationRequest, EnableRoutePropagationRequest, GatewayType, GetConnectionRequest, GetCustomerGatewayRequest, GetRoutingPolicyRequest, GetVpnGatewayRequest, ListConnectionsRequest, ListConnectionsRequestOrderBy, ListConnectionsResponse, ListCustomerGatewaysRequest, ListCustomerGatewaysRequestOrderBy, ListCustomerGatewaysResponse, ListRoutingPoliciesRequest, ListRoutingPoliciesRequestOrderBy, ListRoutingPoliciesResponse, ListVpnGatewaysRequest, ListVpnGatewaysRequestOrderBy, ListVpnGatewaysResponse, ListVpnGatewayTypesRequest, ListVpnGatewayTypesResponse, RenewConnectionPskRequest, RenewConnectionPskResponse, RoutingPolicy, SetRoutingPolicyRequest, TunnelStatus, UpdateConnectionRequest, UpdateCustomerGatewayRequest, UpdateRoutingPolicyRequest, UpdateVpnGatewayRequest, VpnGateway, VpnGatewayPrivateConfig, VpnGatewayPublicConfig, VpnGatewayStatus, } from './types.gen.js';
 export * as ValidationRules from './validation-rules.gen.js';

package/dist/v1alpha1/marshalling.gen.js

@@ -36,15 +36,9 @@ const unmarshalConnection = (data) => {
     bgpStatusIpv6: data.bgp_status_ipv6,
     createdAt: unmarshalDate(data.created_at),
     customerGatewayId: data.customer_gateway_id,
-    espCiphers: unmarshalArrayOfObject(
-      data.esp_ciphers,
-      unmarshalConnectionCipher
-    ),
+    espCiphers: unmarshalArrayOfObject(data.esp_ciphers, unmarshalConnectionCipher),
     id: data.id,
-    ikev2Ciphers: unmarshalArrayOfObject(
-      data.ikev2_ciphers,
-      unmarshalConnectionCipher
-    ),
+    ikev2Ciphers: unmarshalArrayOfObject(data.ikev2_ciphers, unmarshalConnectionCipher),
     initiationPolicy: data.initiation_policy,
     isIpv6: data.is_ipv6,
     name: data.name,
@@ -190,10 +184,7 @@ const unmarshalListRoutingPoliciesResponse = (data) => {
     );
   }
   return {
-    routingPolicies: unmarshalArrayOfObject(
-      data.routing_policies,
-      unmarshalRoutingPolicy
-    ),
+    routingPolicies: unmarshalArrayOfObject(data.routing_policies, unmarshalRoutingPolicy),
     totalCount: data.total_count
   };
 };
@@ -218,10 +209,7 @@ const unmarshalListVpnGatewayTypesResponse = (data) => {
     );
   }
   return {
-    gatewayTypes: unmarshalArrayOfObject(
-      data.gateway_types,
-      unmarshalGatewayType
-    ),
+    gatewayTypes: unmarshalArrayOfObject(data.gateway_types, unmarshalGatewayType),
     totalCount: data.total_count
   };
 };
@@ -262,12 +250,8 @@ const marshalCreateConnectionRequest = (request, defaults) => ({
   bgp_config_ipv6: request.bgpConfigIpv6 !== void 0 ? marshalCreateConnectionRequestBgpConfig(request.bgpConfigIpv6) : void 0,
   customer_gateway_id: request.customerGatewayId,
   enable_route_propagation: request.enableRoutePropagation,
-  esp_ciphers: request.espCiphers.map(
-    (elt) => marshalConnectionCipher(elt)
-  ),
-  ikev2_ciphers: request.ikev2Ciphers.map(
-    (elt) => marshalConnectionCipher(elt)
-  ),
+  esp_ciphers: request.espCiphers.map((elt) => marshalConnectionCipher(elt)),
+  ikev2_ciphers: request.ikev2Ciphers.map((elt) => marshalConnectionCipher(elt)),
   initiation_policy: request.initiationPolicy,
   is_ipv6: request.isIpv6,
   name: request.name,
@@ -291,10 +275,33 @@ const marshalCreateRoutingPolicyRequest = (request, defaults) => ({
   project_id: request.projectId ?? defaults.defaultProjectId,
   tags: request.tags
 });
+const marshalCreateVpnGatewayRequestDualIpTunnel = (request, defaults) => ({
+  ipam_ipv4_id: request.ipamIpv4Id,
+  ipam_ipv6_id: request.ipamIpv6Id
+});
+const marshalCreateVpnGatewayRequestSingleIpTunnel = (request, defaults) => ({
+  ipam_id: request.ipamId
+});
 const marshalCreateVpnGatewayRequestPublicConfig = (request, defaults) => ({
   ipam_ipv4_id: request.ipamIpv4Id,
   ipam_ipv6_id: request.ipamIpv6Id
 });
+const marshalCreateVpnGatewayRequestPublicTunnelConfig = (request, defaults) => ({
+  ...resolveOneOf([
+    {
+      param: "single_ipv4_tunnel",
+      value: request.singleIpv4Tunnel !== void 0 ? marshalCreateVpnGatewayRequestSingleIpTunnel(request.singleIpv4Tunnel) : void 0
+    },
+    {
+      param: "single_ipv6_tunnel",
+      value: request.singleIpv6Tunnel !== void 0 ? marshalCreateVpnGatewayRequestSingleIpTunnel(request.singleIpv6Tunnel) : void 0
+    },
+    {
+      param: "dual_ipv4v6_tunnel",
+      value: request.dualIpv4V6Tunnel !== void 0 ? marshalCreateVpnGatewayRequestDualIpTunnel(request.dualIpv4V6Tunnel) : void 0
+    }
+  ])
+});
 const marshalCreateVpnGatewayRequest = (request, defaults) => ({
   gateway_type: request.gatewayType,
   ipam_private_ipv4_id: request.ipamPrivateIpv4Id,
@@ -307,22 +314,36 @@ const marshalCreateVpnGatewayRequest = (request, defaults) => ({
   ...resolveOneOf([
     {
       param: "public_config",
-      value: request.publicConfig !== void 0 ? marshalCreateVpnGatewayRequestPublicConfig(
-        request.publicConfig
-      ) : void 0
+      value: request.publicConfig !== void 0 ? marshalCreateVpnGatewayRequestPublicConfig(request.publicConfig) : void 0
+    },
+    {
+      param: "public_tunnel_config",
+      value: request.publicTunnelConfig !== void 0 ? marshalCreateVpnGatewayRequestPublicTunnelConfig(request.publicTunnelConfig) : void 0
     }
   ])
 });
 const marshalDetachRoutingPolicyRequest = (request, defaults) => ({
   ...resolveOneOf([
-    { param: "routing_policy_v4", value: request.routingPolicyV4 },
-    { param: "routing_policy_v6", value: request.routingPolicyV6 }
+    {
+      param: "routing_policy_v4",
+      value: request.routingPolicyV4
+    },
+    {
+      param: "routing_policy_v6",
+      value: request.routingPolicyV6
+    }
   ])
 });
 const marshalSetRoutingPolicyRequest = (request, defaults) => ({
   ...resolveOneOf([
-    { param: "routing_policy_v4", value: request.routingPolicyV4 },
-    { param: "routing_policy_v6", value: request.routingPolicyV6 }
+    {
+      param: "routing_policy_v4",
+      value: request.routingPolicyV4
+    },
+    {
+      param: "routing_policy_v6",
+      value: request.routingPolicyV6
+    }
   ])
 });
 const marshalUpdateConnectionRequest = (request, defaults) => ({

package/dist/v1alpha1/types.gen.d.ts

@@ -22,6 +22,13 @@ export interface ConnectionCipher {
     integrity?: ConnectionIntegrity;
     dhGroup?: ConnectionDhGroup;
 }
+export interface CreateVpnGatewayRequestDualIpTunnel {
+    ipamIpv4Id?: string;
+    ipamIpv6Id?: string;
+}
+export interface CreateVpnGatewayRequestSingleIpTunnel {
+    ipamId?: string;
+}
 export interface VpnGatewayPrivateConfig {
 }
 export interface VpnGatewayPublicConfig {
@@ -139,6 +146,23 @@ export interface CreateVpnGatewayRequestPublicConfig {
     ipamIpv4Id?: string;
     ipamIpv6Id?: string;
 }
+export interface CreateVpnGatewayRequestPublicTunnelConfig {
+    /**
+     *
+     * One-of ('config'): at most one of 'singleIpv4Tunnel', 'singleIpv6Tunnel', 'dualIpv4V6Tunnel' could be set.
+     */
+    singleIpv4Tunnel?: CreateVpnGatewayRequestSingleIpTunnel;
+    /**
+     *
+     * One-of ('config'): at most one of 'singleIpv4Tunnel', 'singleIpv6Tunnel', 'dualIpv4V6Tunnel' could be set.
+     */
+    singleIpv6Tunnel?: CreateVpnGatewayRequestSingleIpTunnel;
+    /**
+     *
+     * One-of ('config'): at most one of 'singleIpv4Tunnel', 'singleIpv6Tunnel', 'dualIpv4V6Tunnel' could be set.
+     */
+    dualIpv4V6Tunnel?: CreateVpnGatewayRequestDualIpTunnel;
+}
 export interface CustomerGateway {
     /**
      * Unique identifier of the customer gateway.
@@ -468,15 +492,20 @@ export type CreateVpnGatewayRequest = {
      */
     gatewayType: string;
     /**
-     * Public endpoint configuration of the VPN gateway.
+     * @deprecated Public endpoint configuration of the VPN gateway.
      *
-     * One-of ('endpoint'): at most one of 'publicConfig' could be set.
+     * One-of ('endpoint'): at most one of 'publicConfig', 'publicTunnelConfig' could be set.
      */
     publicConfig?: CreateVpnGatewayRequestPublicConfig;
     /**
      * ID of the Private Network to attach to the VPN gateway.
      */
     privateNetworkId: string;
+    /**
+     *
+     * One-of ('endpoint'): at most one of 'publicConfig', 'publicTunnelConfig' could be set.
+     */
+    publicTunnelConfig?: CreateVpnGatewayRequestPublicTunnelConfig;
     /**
      * ID of the IPAM private IPv4 address to attach to the VPN gateway.
      */
@@ -633,6 +662,10 @@ export type ListConnectionsRequest = {
      * Project ID to filter for.
      */
     projectId?: string;
+    /**
+     * Organization ID to filter for.
+     */
+    organizationId?: string;
     /**
      * Connection name to filter for.
      */
@@ -697,6 +730,10 @@ export type ListCustomerGatewaysRequest = {
      * Project ID to filter for.
      */
     projectId?: string;
+    /**
+     * Organization ID to filter for.
+     */
+    organizationId?: string;
     /**
      * Customer gateway name to filter for.
      */
@@ -737,6 +774,10 @@ export type ListRoutingPoliciesRequest = {
      * Project ID to filter for.
      */
     projectId?: string;
+    /**
+     * Organization ID to filter for.
+     */
+    organizationId?: string;
     /**
      * Routing policy name to filter for.
      */
@@ -799,6 +840,10 @@ export type ListVpnGatewaysRequest = {
      * Project ID to filter for.
      */
     projectId?: string;
+    /**
+     * Organization ID to filter for.
+     */
+    organizationId?: string;
     /**
      * VPN gateway name to filter for.
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scaleway/sdk-s2s-vpn",
-  "version": "2.3.0",
+  "version": "2.4.1",
   "description": "Scaleway SDK s2s-vpn",
   "license": "Apache-2.0",
   "files": [
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@scaleway/random-name": "5.1.2",
-    "@scaleway/sdk-std": "2.1.0"
+    "@scaleway/sdk-std": "2.1.1"
   },
   "peerDependencies": {
     "@scaleway/sdk-client": "^2.1.0"