fix(deadline): VersionQuery cross-stack issue (#306)

packages/aws-rfdk/lib/deadline/lib/render-queue.ts

@@ -52,13 +52,16 @@ import {
 import {
   Construct,
   IConstruct,
+  Stack,
 } from '@aws-cdk/core';
 
 import {
   ECSConnectOptions,
   InstanceConnectOptions,
   IRepository,
+  IVersion,
   RenderQueueProps,
+  VersionQuery,
 } from '.';
 
 import {
@@ -232,6 +235,11 @@ export class RenderQueue extends RenderQueueBase implements IGrantable {
    */
   private readonly taskDefinition: Ec2TaskDefinition;
 
+  /**
+   * The version of Deadline installed in the container images
+   */
+  private readonly version?: IVersion;
+
   constructor(scope: Construct, id: string, props: RenderQueueProps) {
     super(scope, id);
 
@@ -243,6 +251,8 @@ export class RenderQueue extends RenderQueueBase implements IGrantable {
       throw new Error(`renderQueueSize.desired cannot be greater than 1 - got ${props.renderQueueSize.desired}`);
     }
 
+    this.version = props?.version;
+
     let externalProtocol: ApplicationProtocol;
     if ( props.trafficEncryption?.externalTLS ) {
       externalProtocol = ApplicationProtocol.HTTPS;
@@ -444,6 +454,22 @@ export class RenderQueue extends RenderQueueBase implements IGrantable {
     tagConstruct(this);
   }
 
+  protected onValidate(): string[] {
+    const validationErrors = [];
+
+    // Using the output of VersionQuery across stacks can cause issues. CloudFormation stack outputs cannot change if
+    // a resource in another stack is referencing it.
+    if (this.version instanceof VersionQuery) {
+      const versionStack = Stack.of(this.version);
+      const thisStack = Stack.of(this);
+      if (versionStack != thisStack) {
+        validationErrors.push('A VersionQuery can not be supplied from a different stack');
+      }
+    }
+
+    return validationErrors;
+  }
+
   /**
    * @inheritdoc
    */

packages/aws-rfdk/lib/deadline/lib/repository.ts

@@ -64,6 +64,7 @@ import {
 
 import { DatabaseConnection } from './database-connection';
 import { IHost } from './host-ref';
+import { VersionQuery } from './version-query';
 import { IVersion } from './version-ref';
 
 /**
@@ -585,6 +586,22 @@ export class Repository extends Construct implements IRepository {
     tagConstruct(this);
   }
 
+  protected onValidate(): string[] {
+    const validationErrors = [];
+
+    // Using the output of VersionQuery across stacks can cause issues. CloudFormation stack outputs cannot change if
+    // a resource in another stack is referencing it.
+    if (this.version instanceof VersionQuery) {
+      const versionStack = Stack.of(this.version);
+      const thisStack = Stack.of(this);
+      if (versionStack != thisStack) {
+        validationErrors.push('A VersionQuery can not be supplied from a different stack');
+      }
+    }
+
+    return validationErrors;
+  }
+
   /**
    * @inheritdoc
    */

packages/aws-rfdk/lib/deadline/lib/thinkbox-docker-images.ts

@@ -20,6 +20,7 @@ import {
   Construct,
   CustomResource,
   Duration,
+  Stack,
   Token,
 } from '@aws-cdk/core';
 
@@ -28,6 +29,7 @@ import {
   RenderQueueImages,
   ThinkboxManagedDeadlineDockerRecipes,
   UsageBasedLicensingImages,
+  VersionQuery,
 } from '.';
 
 /**
@@ -225,6 +227,15 @@ AWS Thinkbox EULA.
       errors.push(ThinkboxDockerImages.AWS_THINKBOX_EULA_MESSAGE);
     }
 
+    // Using the output of VersionQuery across stacks can cause issues. CloudFormation stack outputs cannot change if
+    // a resource in another stack is referencing it.
+    if (this.version instanceof VersionQuery) {
+      const versionStack = Stack.of(this.version);
+      const thisStack = Stack.of(this);
+      if (versionStack != thisStack) {
+        errors.push('A VersionQuery can not be supplied from a different stack');
+      }
+    }
     return errors;
   }