@ludeo/cloud-common 1.2.83-ygarbage6 → 1.2.83-ygarbage8

package/src/v4/events/allocate-ludeo-resource-request.ts

@@ -4,10 +4,10 @@ import { ValidateNestedType } from "../../decorators/validate-nested-type.decora
 import { CloudSessionContext } from "../contexts";
 import {
   AllocationRequestData,
-  AWSProviderSettings,
   CloudProvider,
   CloudProviderSettings,
   GameResourceSettings,
+  getProviderSettingsType,
   LudeoResourceSettings,
 } from "../types";
 import { IsUUIDOrEmpty } from "../../decorators/is-uuid-or-empty.decorator";
@@ -19,7 +19,7 @@ export class AllocateLudeoResourceRequestPayload {
   @IsUUID()
   ludeoPoolId: string;
 
-  @ValidateNestedType(() => AWSProviderSettings)
+  @ValidateNestedType(getProviderSettingsType)
   providerSettings: CloudProviderSettings;
 
   @IsEnum(CloudProvider)

package/src/v4/events/aws-reactivate-stream-session-task.ts

@@ -2,7 +2,10 @@ import { IsUUID } from "class-validator";
 
 import { LudeoEvent } from "../../infra";
 import { ValidateNestedType } from "../../decorators";
-import { AWSResourceProviderSettings } from "../types";
+import {
+  CloudResourceProviderSettings,
+  getResourceProviderSettingsType,
+} from "../types";
 
 export class AwsReactivateStreamSessionTaskPayload {
   @IsUUID()
@@ -11,8 +14,8 @@ export class AwsReactivateStreamSessionTaskPayload {
   @IsUUID()
   gamePoolId: string;
 
-  @ValidateNestedType(() => AWSResourceProviderSettings)
-  providerSettings: AWSResourceProviderSettings;
+  @ValidateNestedType(getResourceProviderSettingsType)
+  providerSettings: CloudResourceProviderSettings;
 }
 
 export class AwsReactivateStreamSessionTask extends LudeoEvent {

package/src/v4/events/aws-stream-session-active.ts

@@ -3,14 +3,17 @@ import { ValidateNestedType } from "../../decorators";
 import { CreateGameResourceRequestPayload } from "./create-game-resource-request";
 import { IsString } from "class-validator";
 import { CloudResourceContext } from "../contexts";
-import { AWSResourceProviderSettings } from "../types";
+import {
+  CloudResourceProviderSettings,
+  getResourceProviderSettingsType,
+} from "../types";
 
 export class AwsStreamSessionActivePayload {
   @ValidateNestedType(() => CreateGameResourceRequestPayload)
   creationPayload: CreateGameResourceRequestPayload;
 
-  @ValidateNestedType(() => AWSResourceProviderSettings)
-  providerSettings: AWSResourceProviderSettings;
+  @ValidateNestedType(getResourceProviderSettingsType)
+  providerSettings: CloudResourceProviderSettings;
 
   @IsString()
   streamSessionId: string;
@@ -21,7 +24,7 @@ export class AwsStreamSessionActive extends LudeoEvent {
 
   constructor(
     payload: AwsStreamSessionActivePayload,
-    context: CloudResourceContext,
+    context: CloudResourceContext
   ) {
     super(AwsStreamSessionActive.EVENT_NAME);
     this.payload = payload;

package/src/v4/events/aws-stream-session-reactivation-started.ts

@@ -2,7 +2,10 @@ import { IsUUID } from "class-validator";
 
 import { LudeoEvent } from "../../infra";
 import { ValidateNestedType } from "../../decorators";
-import { AWSResourceProviderSettings } from "../types";
+import {
+  CloudResourceProviderSettings,
+  getResourceProviderSettingsType,
+} from "../types";
 
 export class AwsStreamSessionReactivationStartedPayload {
   @IsUUID()
@@ -11,8 +14,8 @@ export class AwsStreamSessionReactivationStartedPayload {
   @IsUUID()
   gamePoolId: string;
 
-  @ValidateNestedType(() => AWSResourceProviderSettings)
-  providerSettings: AWSResourceProviderSettings;
+  @ValidateNestedType(getResourceProviderSettingsType)
+  providerSettings: CloudResourceProviderSettings;
 }
 
 export class AwsStreamSessionReactivationStarted extends LudeoEvent {

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

@@ -4,9 +4,9 @@ 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 CreateMachineResourceBatchRequestPayload {
@@ -19,7 +19,7 @@ export class CreateMachineResourceBatchRequestPayload {
   @IsEnum(CloudProvider)
   cloudProvider: CloudProvider;
 
-  @ValidateNestedType(() => AWSProviderSettings)
+  @ValidateNestedType(getProviderSettingsType)
   cloudProviderSettings: CloudProviderSettings;
 }
 

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

@@ -4,9 +4,9 @@ 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 CreateMachineResourceRequestPayload {
@@ -19,7 +19,7 @@ export class CreateMachineResourceRequestPayload {
   @IsEnum(CloudProvider)
   cloudProvider: CloudProvider;
 
-  @ValidateNestedType(() => AWSProviderSettings)
+  @ValidateNestedType(getProviderSettingsType)
   cloudProviderSettings: CloudProviderSettings;
 }
 

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

@@ -1,10 +1,10 @@
 import { CloudResourceContext } from "../contexts";
 import { LudeoEvent } from "../../infra/ludeo-event";
 import {
-  AWSProviderSettings,
   CloudProvider,
   CloudProviderSettings,
   GameResourceSettings,
+  getProviderSettingsType,
 } from "../types";
 import { ValidateNestedType } from "../../decorators/validate-nested-type.decorator";
 import { IsEnum, IsUUID, IsOptional } from "class-validator";
@@ -27,7 +27,7 @@ export class GameAllocatedResponsePayload {
   @IsUUIDOrEmpty()
   ludeoId?: string;
 
-  @ValidateNestedType(() => AWSProviderSettings)
+  @ValidateNestedType(getProviderSettingsType)
   providerSettings: CloudProviderSettings;
 
   @IsUUID()

package/src/v4/events/game-resource-status-changed.ts

@@ -1,7 +1,11 @@
 import { IsOptional, IsString, IsUUID } from "class-validator";
 import { LudeoEvent } from "../../infra/ludeo-event";
 import { CloudResourceContext } from "../contexts/cloud-resource-context";
-import { AWSResourceProviderSettings, CloudResourceStatus } from "../types";
+import {
+  CloudResourceProviderSettings,
+  CloudResourceStatus,
+  getResourceProviderSettingsType,
+} from "../types";
 import { ValidateNestedType } from "../../decorators/validate-nested-type.decorator";
 
 export class GameResourceStatusChangedEventPayload {
@@ -11,8 +15,8 @@ export class GameResourceStatusChangedEventPayload {
   @IsUUID()
   gamePoolId: string;
 
-  @ValidateNestedType(() => AWSResourceProviderSettings)
-  providerSettings: AWSResourceProviderSettings;
+  @ValidateNestedType(getResourceProviderSettingsType)
+  providerSettings: CloudResourceProviderSettings;
 
   @IsString()
   status: CloudResourceStatus;
@@ -32,7 +36,7 @@ export class GameResourceStatusChangedEvent extends LudeoEvent {
 
   constructor(
     payload: GameResourceStatusChangedEventPayload,
-    context: CloudResourceContext,
+    context: CloudResourceContext
   ) {
     super(GameResourceStatusChangedEvent.EVENT_NAME);
     this.payload = payload;

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

@@ -3,10 +3,10 @@ import { LudeoEvent } from "../../infra/ludeo-event";
 import { ValidateNestedType } from "../../decorators/validate-nested-type.decorator";
 import { CloudResourceContext } from "../contexts";
 import {
-  AWSProviderSettings,
   CloudProvider,
   CloudProviderSettings,
   GameResourceSettings,
+  getProviderSettingsType,
 } from "../types";
 import { IsUUIDOrEmpty } from "../../decorators/is-uuid-or-empty.decorator";
 
@@ -36,7 +36,7 @@ export class LoadLudeoResourcePayload {
   @ValidateNestedType(() => GameResourceSettings)
   gameResourceSettings: GameResourceSettings;
 
-  @ValidateNestedType(() => AWSProviderSettings)
+  @ValidateNestedType(getProviderSettingsType)
   providerSettings: CloudProviderSettings;
 
   @IsEnum(CloudProvider)

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

@@ -4,9 +4,9 @@ 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 {
@@ -22,7 +22,7 @@ export class MachineAllocatedResponsePayload {
   @IsUUID()
   gamePoolId: string;
 
-  @ValidateNestedType(() => AWSProviderSettings)
+  @ValidateNestedType(getProviderSettingsType)
   providerSettings: CloudProviderSettings;
 
   @IsEnum(CloudProvider)

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

@@ -2,13 +2,13 @@ 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)
+  @ValidateNestedType(getProviderSettingsType)
   providerSettings: CloudProviderSettings;
 
   @IsEnum(CloudProvider)

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

@@ -4,9 +4,9 @@ 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 {
@@ -19,7 +19,7 @@ export class MachineResourceBatchCreationFailedResponsePayload {
   @IsEnum(CloudProvider)
   cloudProvider: CloudProvider;
 
-  @ValidateNestedType(() => AWSProviderSettings)
+  @ValidateNestedType(getProviderSettingsType)
   cloudProviderSettings: CloudProviderSettings;
 
   @IsString()

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

@@ -4,9 +4,9 @@ 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 {
@@ -19,7 +19,7 @@ export class MachineResourceBatchTerminationFailedResponsePayload {
   @IsEnum(CloudProvider)
   cloudProvider: CloudProvider;
 
-  @ValidateNestedType(() => AWSProviderSettings)
+  @ValidateNestedType(getProviderSettingsType)
   cloudProviderSettings: CloudProviderSettings;
 
   @IsString()

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

@@ -19,10 +19,12 @@ import {
   CloudResourceProviderSettings,
   CloudProvider,
   getProviderSettingsType,
+  getResourceProviderSettingsType,
 } from "../types";
 
 export class TerminateGameResourceRequestPayload<
-  T extends CloudProviderSettings = CloudProviderSettings
+  T extends CloudProviderSettings = CloudProviderSettings,
+  K extends CloudResourceProviderSettings = CloudResourceProviderSettings
 > {
   @IsUUID()
   gameResourceId: string;
@@ -40,8 +42,8 @@ export class TerminateGameResourceRequestPayload<
   @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,6 +7,7 @@ import {
   AWSProviderSettings,
   CloudProvider,
   CloudProviderSettings,
+  getProviderSettingsType,
 } from "../types";
 
 export class TerminateMachineResourceBatchRequestPayload {
@@ -19,7 +20,7 @@ export class TerminateMachineResourceBatchRequestPayload {
   @IsEnum(CloudProvider)
   cloudProvider: CloudProvider;
 
-  @ValidateNestedType(() => AWSProviderSettings)
+  @ValidateNestedType(getProviderSettingsType)
   cloudProviderSettings: CloudProviderSettings;
 }
 

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

@@ -7,6 +7,7 @@ import {
   AWSProviderSettings,
   CloudProvider,
   CloudProviderSettings,
+  getProviderSettingsType,
 } from "../types";
 
 export class TerminateMachineResourceRequestPayload {
@@ -19,7 +20,7 @@ export class TerminateMachineResourceRequestPayload {
   @IsEnum(CloudProvider)
   cloudProvider: CloudProvider;
 
-  @ValidateNestedType(() => AWSProviderSettings)
+  @ValidateNestedType(getProviderSettingsType)
   cloudProviderSettings: CloudProviderSettings;
 }
 

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

@@ -2,11 +2,11 @@ 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,
   CloudResourceStatus,
   GameResourceSettings,
+  getProviderSettingsType,
 } from "../types";
 import { ValidateNestedType } from "../../decorators/validate-nested-type.decorator";
 
@@ -36,7 +36,7 @@ export class UpdateLudeoResourceStatusRequestPayload {
   @IsEnum(CloudProvider)
   cloudProvider: CloudProvider;
 
-  @ValidateNestedType(() => AWSProviderSettings)
+  @ValidateNestedType(getProviderSettingsType)
   providerSettings: CloudProviderSettings;
 
   @ValidateNestedType(() => GameResourceSettings)

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

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

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

@@ -8,12 +8,9 @@ export type CloudResourceProviderSettings =
 
 export const getResourceProviderSettingsType = ({
   object,
+  property,
 }: TypeHelpOptions) => {
-  console.log("---object1", object);
-
-  const { payload } = object;
-  const { providerSettings } = payload;
-
+  const providerSettings = object[property];
   if ("streamSessionId" in providerSettings) {
     return AWSResourceProviderSettings;
   }

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)