Merge branch 'main' into v1.5683.0

Author: Laure-di

packages/clients/src/api/applesilicon/v1alpha1/marshalling.gen.ts

@@ -153,6 +153,7 @@ export const unmarshalServer = (data: unknown): Server => {
     sudoPassword: data.sudo_password,
     type: data.type,
     updatedAt: unmarshalDate(data.updated_at),
+    vncPort: data.vnc_port,
     vncUrl: data.vnc_url,
     zone: data.zone,
   } as Server

packages/clients/src/api/applesilicon/v1alpha1/types.gen.ts

@@ -107,6 +107,8 @@ export interface Server {
   sshUsername: string
   /** Admin password required to execute commands. */
   sudoPassword: string
+  /** VNC port to use for remote desktop connection. */
+  vncPort: number
   /**
    * Initially installed OS, this does not necessarily reflect the current OS
    * version.

packages/clients/src/api/container/v1beta1/marshalling.gen.ts

@@ -54,6 +54,7 @@ const unmarshalContainerScalingOption = (
 
   return {
     concurrentRequestsThreshold: data.concurrent_requests_threshold,
+    cpuUsageThreshold: data.cpu_usage_threshold,
   } as ContainerScalingOption
 }
 
@@ -371,6 +372,7 @@ const marshalContainerScalingOption = (
       param: 'concurrent_requests_threshold',
       value: request.concurrentRequestsThreshold,
     },
+    { param: 'cpu_usage_threshold', value: request.cpuUsageThreshold },
   ]),
 })
 

packages/clients/src/api/container/v1beta1/types.gen.ts

@@ -97,10 +97,15 @@ export type TriggerStatus =
 
 export interface ContainerScalingOption {
   /**
-   * One-of ('scalingRule'): at most one of 'concurrentRequestsThreshold' could
-   * be set.
+   * One-of ('scalingRule'): at most one of 'concurrentRequestsThreshold',
+   * 'cpuUsageThreshold' could be set.
    */
   concurrentRequestsThreshold?: number
+  /**
+   * One-of ('scalingRule'): at most one of 'concurrentRequestsThreshold',
+   * 'cpuUsageThreshold' could be set.
+   */
+  cpuUsageThreshold?: number
 }
 
 export interface SecretHashedValue {
@@ -236,6 +241,8 @@ export interface Container {
    *
    * - Concurrent_requests_threshold: Scale depending on the number of concurrent
    *   requests being processed per container instance.
+   * - Cpu_usage_threshold: Scale depending on the CPU usage of a container
+   *   instance.
    */
   scalingOption?: ContainerScalingOption
   /** Creation date of the container. */
@@ -433,6 +440,8 @@ export type CreateContainerRequest = {
    *
    * - Concurrent_requests_threshold: Scale depending on the number of concurrent
    *   requests being processed per container instance.
+   * - Cpu_usage_threshold: Scale depending on the CPU usage of a container
+   *   instance.
    */
   scalingOption?: ContainerScalingOption
 }
@@ -894,6 +903,8 @@ export type UpdateContainerRequest = {
    *
    * - Concurrent_requests_threshold: Scale depending on the number of concurrent
    *   requests being processed per container instance.
+   * - Cpu_usage_threshold: Scale depending on the CPU usage of a container
+   *   instance.
    */
   scalingOption?: ContainerScalingOption
 }