fix(deadline): use new repository installer log path for Deadline 10.…

…2.* (#895)
aws · Dec 2, 2022 · c6db7c0 · c6db7c0
1 parent 19603ed
commit c6db7c0
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 24 deletions.
diff --git a/packages/aws-rfdk/lib/deadline/lib/repository.ts b/packages/aws-rfdk/lib/deadline/lib/repository.ts
@@ -955,7 +955,7 @@ export class Repository extends Construct implements IRepository {
       '/var/log/cloud-init-output.log');
     cloudWatchConfigurationBuilder.addLogsCollectList(logGroup.logGroupName,
       'deadlineRepositoryInstallationLogs',
-      '/tmp/bitrock_installer.log');
+      this.version.isLessThan(Version.MINIMUM_VERSION_USING_NEW_INSTALLBUILDER_LOG) ? '/tmp/bitrock_installer.log' : '/tmp/installbuilder_installer.log');
 
     new CloudWatchAgent(this, 'RepositoryInstallerLogsConfig', {
       cloudWatchConfig: cloudWatchConfigurationBuilder.generateCloudWatchConfiguration(),

diff --git a/packages/aws-rfdk/lib/deadline/lib/version.ts b/packages/aws-rfdk/lib/deadline/lib/version.ts
@@ -22,6 +22,11 @@ export class Version implements IPatchVersion {
    */
   public static readonly MINIMUM_SECRETS_MANAGEMENT_VERSION = new Version([10, 1, 19, 0]);
 
+  /**
+   * The minimum Deadline version which uses Install Builder instead of Bitrock Installer.
+   */
+  public static readonly MINIMUM_VERSION_USING_NEW_INSTALLBUILDER_LOG = new Version([10, 2, 0, 0]);
+
   /**
    * This method parses the input string and returns the version object.
    *

diff --git a/packages/aws-rfdk/lib/deadline/test/repository.test.ts b/packages/aws-rfdk/lib/deadline/test/repository.test.ts
@@ -72,6 +72,7 @@ let app: App;
 let stack: Stack;
 let vpc: IVpc;
 let version: IVersion;
+let installers: PlatformInstallers;
 
 function escapeTokenRegex(s: string): string {
   // A CDK Token looks like: ${Token[TOKEN.12]}
@@ -80,6 +81,18 @@ function escapeTokenRegex(s: string): string {
   return s.replace(/[.${}[\]]/g, '\\$&');
 }
 
+function create_version(version_array: number[]): IVersion {
+  class MockVersion extends Version implements IVersion {
+    readonly linuxInstallers: PlatformInstallers = installers;
+
+    public linuxFullVersionString() {
+      return this.toString();
+    }
+  }
+
+  return new MockVersion(version_array);
+}
+
 beforeEach(() => {
   app = new App();
   stack = new Stack(app, 'Stack');
@@ -99,26 +112,18 @@ beforeEach(() => {
       },
     ],
   });
-
-  class MockVersion extends Version implements IVersion {
-    readonly linuxInstallers: PlatformInstallers = {
-      patchVersion: 0,
-      repository: {
-        objectKey: 'testInstaller',
-        s3Bucket: new Bucket(stack, 'LinuxInstallerBucket'),
-      },
-      client: {
-        objectKey: 'testClientInstaller',
-        s3Bucket: new Bucket(stack, 'LinuxClientInstallerBucket'),
-      },
-    };
-
-    public linuxFullVersionString() {
-      return this.toString();
-    }
-  }
-
-  version = new MockVersion([10,1,19,4]);
+  installers = {
+    patchVersion: 0,
+    repository: {
+      objectKey: 'testInstaller',
+      s3Bucket: new Bucket(stack, 'LinuxInstallerBucket'),
+    },
+    client: {
+      objectKey: 'testClientInstaller',
+      s3Bucket: new Bucket(stack, 'LinuxClientInstallerBucket'),
+    },
+  };
+  version = create_version([10,1,19,4]);
 });
 
 test('can create two repositories', () => {
@@ -403,11 +408,17 @@ test('default repository installer log group created correctly', () => {
   });
 });
 
-test('repository installer logs all required files', () => {
+test.each([
+  [[10,1,19,4]],
+  [[10,2,0,9]],
+])('repository installer logs all required files', (version_array: number[]) => {
+  // GIVEN
+  const repository_version = create_version(version_array);
+
   // WHEN
   new Repository(stack, 'repositoryInstaller', {
     vpc,
-    version,
+    version: repository_version,
   });
 
   // THEN
@@ -424,7 +435,9 @@ test('repository installer logs all required files', () => {
           {}, // log group name. checked in another test.
           '\",\"log_stream_name\":\"cloud-init-output-{instance_id}\",\"file_path\":\"/var/log/cloud-init-output.log\",\"timezone\":\"Local\"},{\"log_group_name\":\"',
           {}, // log group name again.
-          '\",\"log_stream_name\":\"deadlineRepositoryInstallationLogs-{instance_id}\",\"file_path\":\"/tmp/bitrock_installer.log\",\"timezone\":\"Local\"}]}},\"log_stream_name\":\"DefaultLogStream-{instance_id}\",\"force_flush_interval\":15}}',
+          '\",\"log_stream_name\":\"deadlineRepositoryInstallationLogs-{instance_id}\",\"file_path\":\"/tmp/'+
+          (repository_version.isLessThan(Version.MINIMUM_VERSION_USING_NEW_INSTALLBUILDER_LOG) ? 'bitrock' : 'installbuilder') +
+          '_installer.log\",\"timezone\":\"Local\"}]}},\"log_stream_name\":\"DefaultLogStream-{instance_id}\",\"force_flush_interval\":15}}',
         ],
       ],
     },