@ludeo/cloud-common 1.2.84 → 1.2.85

package/src/v4/events/load-ludeo-resource.ts

@@ -3,14 +3,18 @@ import { LudeoEvent } from "../../infra/ludeo-event";
 import { ValidateNestedType } from "../../decorators/validate-nested-type.decorator";
 import { CloudResourceContext } from "../contexts";
 import {
-  AWSProviderSettings,
   CloudProvider,
   CloudProviderSettings,
+  CloudResourceProviderSettings,
   GameResourceSettings,
+  getProviderSettingsType,
 } from "../types";
 import { IsUUIDOrEmpty } from "../../decorators/is-uuid-or-empty.decorator";
 
-export class LoadLudeoResourcePayload {
+export class LoadLudeoResourcePayload<
+  T extends CloudProviderSettings = CloudProviderSettings,
+  K extends CloudResourceProviderSettings = CloudResourceProviderSettings
+> {
   @IsUUID()
   gameResourceId: string;
 
@@ -34,10 +38,10 @@ export class LoadLudeoResourcePayload {
   ludeoPoolId: string;
 
   @ValidateNestedType(() => GameResourceSettings)
-  gameResourceSettings: GameResourceSettings;
+  gameResourceSettings: GameResourceSettings<K>;
 
-  @ValidateNestedType(() => AWSProviderSettings)
-  providerSettings: CloudProviderSettings;
+  @ValidateNestedType(getProviderSettingsType)
+  providerSettings: T;
 
   @IsEnum(CloudProvider)
   cloudProvider: CloudProvider;

package/src/v4/events/machine-allocated-response.ts

@@ -4,12 +4,14 @@ import { CloudResourceContext } from "../contexts";
 import { LudeoEvent } from "../../infra/ludeo-event";
 import { ValidateNestedType } from "../../decorators/validate-nested-type.decorator";
 import {
-  AWSProviderSettings,
   CloudProviderSettings,
   CloudProvider,
+  getProviderSettingsType,
 } from "../types";
 
-export class MachineAllocatedResponsePayload {
+export class MachineAllocatedResponsePayload<
+  T extends CloudProviderSettings = CloudProviderSettings
+> {
   @IsUUID()
   machineResourceId: string;
 
@@ -22,8 +24,8 @@ export class MachineAllocatedResponsePayload {
   @IsUUID()
   gamePoolId: string;
 
-  @ValidateNestedType(() => AWSProviderSettings)
-  providerSettings: CloudProviderSettings;
+  @ValidateNestedType(getProviderSettingsType)
+  providerSettings: T;
 
   @IsEnum(CloudProvider)
   cloudProvider: CloudProvider;

package/src/v4/events/machine-pool-resizing-task.ts

@@ -2,14 +2,16 @@ import { IsEnum, IsUUID } from "class-validator";
 import { LudeoEvent } from "../../infra/ludeo-event";
 import { ValidateNestedType } from "../../decorators";
 import {
-  AWSProviderSettings,
   CloudProvider,
   CloudProviderSettings,
+  getProviderSettingsType,
 } from "../types";
 
-export class MachinePoolResizingTaskEventPayload {
-  @ValidateNestedType(() => AWSProviderSettings)
-  providerSettings: CloudProviderSettings;
+export class MachinePoolResizingTaskEventPayload<
+  T extends CloudProviderSettings = CloudProviderSettings
+> {
+  @ValidateNestedType(getProviderSettingsType)
+  providerSettings: T;
 
   @IsEnum(CloudProvider)
   cloudProvider: CloudProvider;

package/src/v4/events/machine-resource-batch-creation-failed-response.ts

@@ -4,12 +4,14 @@ import { CloudResourceContext } from "../contexts";
 import { LudeoEvent } from "../../infra/ludeo-event";
 import { ValidateNestedType } from "../../decorators/validate-nested-type.decorator";
 import {
-  AWSProviderSettings,
   CloudProvider,
   CloudProviderSettings,
+  getProviderSettingsType,
 } from "../types";
 
-export class MachineResourceBatchCreationFailedResponsePayload {
+export class MachineResourceBatchCreationFailedResponsePayload<
+  T extends CloudProviderSettings = CloudProviderSettings
+> {
   @IsArray()
   machineResourceIds: string[];
 
@@ -19,8 +21,8 @@ export class MachineResourceBatchCreationFailedResponsePayload {
   @IsEnum(CloudProvider)
   cloudProvider: CloudProvider;
 
-  @ValidateNestedType(() => AWSProviderSettings)
-  cloudProviderSettings: CloudProviderSettings;
+  @ValidateNestedType(getProviderSettingsType)
+  cloudProviderSettings: T;
 
   @IsString()
   errorMessage: string;

package/src/v4/events/machine-resource-batch-termination-failed-response.ts

@@ -4,12 +4,14 @@ import { CloudResourceContext } from "../contexts";
 import { LudeoEvent } from "../../infra/ludeo-event";
 import { ValidateNestedType } from "../../decorators/validate-nested-type.decorator";
 import {
-  AWSProviderSettings,
   CloudProvider,
   CloudProviderSettings,
+  getProviderSettingsType,
 } from "../types";
 
-export class MachineResourceBatchTerminationFailedResponsePayload {
+export class MachineResourceBatchTerminationFailedResponsePayload<
+  T extends CloudProviderSettings = CloudProviderSettings
+> {
   @IsArray()
   machineResourceIds: string[];
 
@@ -19,8 +21,8 @@ export class MachineResourceBatchTerminationFailedResponsePayload {
   @IsEnum(CloudProvider)
   cloudProvider: CloudProvider;
 
-  @ValidateNestedType(() => AWSProviderSettings)
-  cloudProviderSettings: CloudProviderSettings;
+  @ValidateNestedType(getProviderSettingsType)
+  cloudProviderSettings: T;
 
   @IsString()
   errorMessage: string;

package/src/v4/events/monitor-game-resource-task.ts

@@ -1,9 +1,9 @@
 import { IsEnum, IsUUID } from "class-validator";
 import { LudeoEvent } from "../../infra/ludeo-event";
 import {
-  AWSResourceProviderSettings,
   CloudProvider,
   CloudResourceProviderSettings,
+  getResourceProviderSettingsType,
 } from "../types";
 import { ValidateNestedType } from "../../decorators";
 
@@ -14,7 +14,7 @@ export class MonitorGameResourceTaskEventPayload {
   @IsUUID()
   gamePoolId: string;
 
-  @ValidateNestedType(() => AWSResourceProviderSettings)
+  @ValidateNestedType(getResourceProviderSettingsType)
   providerSettings: CloudResourceProviderSettings;
 
   @IsEnum(CloudProvider)

package/src/v4/events/pool-status.ts

@@ -6,9 +6,9 @@ import {
   BasePoolAttributes,
   LudeoPoolAttributes,
   MachinePoolAttributes,
-  AWSProviderSettings,
   CloudProviderSettings,
   GamePoolAttributes,
+  getProviderSettingsType,
 } from "../types";
 import { ValidateNestedType } from "../../decorators/validate-nested-type.decorator";
 import { IsUUIDOrEmpty } from "../../decorators/is-uuid-or-empty.decorator";
@@ -44,7 +44,7 @@ export class PoolStatusEventGamePool extends PoolStatusEventBasePool<GamePoolAtt
 export class PoolStatusEventMachinePool extends PoolStatusEventBasePool<MachinePoolAttributes> {
   games: PoolStatusEventGamePool[];
 
-  @ValidateNestedType(() => AWSProviderSettings)
+  @ValidateNestedType(getProviderSettingsType)
   providerSettings: Partial<CloudProviderSettings>;
 }
 

package/src/v4/events/terminate-game-resource-request.ts

@@ -14,14 +14,18 @@ import {
 import { LudeoEvent } from "../../infra/ludeo-event";
 import { ValidateNestedType } from "../../decorators/validate-nested-type.decorator";
 import {
-  AWSProviderSettings,
   CloudProviderSettings,
   AWSResourceProviderSettings,
   CloudResourceProviderSettings,
   CloudProvider,
+  getProviderSettingsType,
+  getResourceProviderSettingsType,
 } from "../types";
 
-export class TerminateGameResourceRequestPayload {
+export class TerminateGameResourceRequestPayload<
+  T extends CloudProviderSettings = CloudProviderSettings,
+  K extends CloudResourceProviderSettings = CloudResourceProviderSettings
+> {
   @IsUUID()
   gameResourceId: string;
 
@@ -35,11 +39,11 @@ export class TerminateGameResourceRequestPayload {
   @IsEnum(CloudProvider)
   cloudProvider: CloudProvider;
 
-  @ValidateNestedType(() => AWSProviderSettings)
-  providerSettings: CloudProviderSettings;
+  @ValidateNestedType(getProviderSettingsType)
+  providerSettings: T;
 
-  @ValidateNestedType(() => AWSResourceProviderSettings)
-  resourceProviderSettings: CloudResourceProviderSettings;
+  @ValidateNestedType(getResourceProviderSettingsType)
+  resourceProviderSettings: K;
 
   @IsBoolean()
   shouldDeallocateMachineResource: boolean;

package/src/v4/events/terminate-machine-resource-batch-request.ts

@@ -7,9 +7,12 @@ import {
   AWSProviderSettings,
   CloudProvider,
   CloudProviderSettings,
+  getProviderSettingsType,
 } from "../types";
 
-export class TerminateMachineResourceBatchRequestPayload {
+export class TerminateMachineResourceBatchRequestPayload<
+  T extends CloudProviderSettings = CloudProviderSettings
+> {
   @IsArray()
   machineResourceIds: string[];
 
@@ -19,8 +22,8 @@ export class TerminateMachineResourceBatchRequestPayload {
   @IsEnum(CloudProvider)
   cloudProvider: CloudProvider;
 
-  @ValidateNestedType(() => AWSProviderSettings)
-  cloudProviderSettings: CloudProviderSettings;
+  @ValidateNestedType(getProviderSettingsType)
+  cloudProviderSettings: T;
 }
 
 export class TerminateMachineResourceBatchRequest extends LudeoEvent {

package/src/v4/events/terminate-machine-resource-request.ts

@@ -4,12 +4,14 @@ import { CloudResourceContext } from "../contexts";
 import { LudeoEvent } from "../../infra/ludeo-event";
 import { ValidateNestedType } from "../../decorators/validate-nested-type.decorator";
 import {
-  AWSProviderSettings,
   CloudProvider,
   CloudProviderSettings,
+  getProviderSettingsType,
 } from "../types";
 
-export class TerminateMachineResourceRequestPayload {
+export class TerminateMachineResourceRequestPayload<
+  T extends CloudProviderSettings = CloudProviderSettings
+> {
   @IsUUID()
   machineResourceId: string;
 
@@ -19,8 +21,8 @@ export class TerminateMachineResourceRequestPayload {
   @IsEnum(CloudProvider)
   cloudProvider: CloudProvider;
 
-  @ValidateNestedType(() => AWSProviderSettings)
-  cloudProviderSettings: CloudProviderSettings;
+  @ValidateNestedType(getProviderSettingsType)
+  cloudProviderSettings: T;
 }
 
 export class TerminateMachineResourceRequest extends LudeoEvent {

package/src/v4/events/update-ludeo-resource-status-request.ts

@@ -2,15 +2,19 @@ import { IsEnum, IsOptional, IsString, IsUUID } from "class-validator";
 import { LudeoEvent } from "../../infra/ludeo-event";
 import { CloudResourceContext } from "../contexts/cloud-resource-context";
 import {
-  AWSProviderSettings,
   CloudProvider,
   CloudProviderSettings,
+  CloudResourceProviderSettings,
   CloudResourceStatus,
   GameResourceSettings,
+  getProviderSettingsType,
 } from "../types";
 import { ValidateNestedType } from "../../decorators/validate-nested-type.decorator";
 
-export class UpdateLudeoResourceStatusRequestPayload {
+export class UpdateLudeoResourceStatusRequestPayload<
+  T extends CloudProviderSettings = CloudProviderSettings,
+  K extends CloudResourceProviderSettings = CloudResourceProviderSettings
+> {
   @IsUUID()
   ludeoResourceId: string;
 
@@ -36,11 +40,11 @@ export class UpdateLudeoResourceStatusRequestPayload {
   @IsEnum(CloudProvider)
   cloudProvider: CloudProvider;
 
-  @ValidateNestedType(() => AWSProviderSettings)
-  providerSettings: CloudProviderSettings;
+  @ValidateNestedType(getProviderSettingsType)
+  providerSettings: T;
 
   @ValidateNestedType(() => GameResourceSettings)
-  gameResourceSettings: GameResourceSettings;
+  gameResourceSettings: GameResourceSettings<K>;
 }
 
 export class UpdateLudeoResourceStatusRequest extends LudeoEvent {

package/src/v4/types/cloud/provider-settings.ts

@@ -1,4 +1,17 @@
+import { TypeHelpOptions } from "class-transformer";
 import { AWSProviderSettings } from "./aws";
 import { MockProviderSettings } from "./mock";
 
 export type CloudProviderSettings = AWSProviderSettings | MockProviderSettings;
+
+export const getProviderSettingsType = ({
+  object,
+  property,
+}: TypeHelpOptions) => {
+  const providerSettings = object[property];
+  if ("streamGroupId" in providerSettings) {
+    return AWSProviderSettings;
+  }
+
+  return MockProviderSettings;
+};

package/src/v4/types/cloud/resource-provider-settings.ts

@@ -1,6 +1,19 @@
+import { TypeHelpOptions } from "class-transformer";
 import { AWSResourceProviderSettings } from "./aws";
 import { MockResourceProviderSettings } from "./mock";
 
 export type CloudResourceProviderSettings =
   | AWSResourceProviderSettings
   | MockResourceProviderSettings;
+
+export const getResourceProviderSettingsType = ({
+  object,
+  property,
+}: TypeHelpOptions) => {
+  const providerSettings = object[property];
+  if ("streamSessionId" in providerSettings) {
+    return AWSResourceProviderSettings;
+  }
+
+  return MockResourceProviderSettings;
+};

package/src/v4/types/pools/configuration/base.ts

@@ -1,9 +1,9 @@
 import { IsNumber, IsEnum, IsUUID, IsOptional } from "class-validator";
 
 import {
-  AWSProviderSettings,
   CloudProvider,
   CloudProviderSettings,
+  getProviderSettingsType,
 } from "../../cloud";
 import { CloudPoolType } from "../type";
 import { BasePoolAttributes } from "./attributes";
@@ -20,7 +20,7 @@ export class PoolScaleConfiguration {
 
 export class BaseCloudPoolConfiguration {
   @IsOptional()
-  @ValidateNestedType(() => AWSProviderSettings)
+  @ValidateNestedType(getProviderSettingsType)
   providerSettings?: CloudProviderSettings;
 
   @IsEnum(CloudProvider)

package/src/v4/types/pools/resource/game.ts

@@ -3,14 +3,16 @@ import { IsOptional, IsString, IsUUID } from "class-validator";
 import { BaseCloudResource } from "./base";
 import { ValidateNestedType } from "../../../../decorators";
 import {
-  AWSResourceProviderSettings,
   CloudResourceProviderSettings,
-} from "../../cloud";
+  getResourceProviderSettingsType,
+} from "../../cloud/resource-provider-settings";
 
-export class GameResourceSettings {
+export class GameResourceSettings<
+  T extends CloudResourceProviderSettings = CloudResourceProviderSettings
+> {
   @IsOptional()
-  @ValidateNestedType(() => AWSResourceProviderSettings)
-  provider?: CloudResourceProviderSettings;
+  @ValidateNestedType(getResourceProviderSettingsType)
+  provider?: T;
 
   @IsOptional()
   @IsUUID()