feat(deadline): allow minor version upgrades in Repository construct (#…

…896)
aws · Dec 14, 2022 · 9e0b7e0 · 9e0b7e0
1 parent f20549e
commit 9e0b7e0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/bin/app.ts b/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/bin/app.ts
@@ -41,10 +41,6 @@ import { ComputeTier } from '../lib/compute-tier';
     console.log('EC2 key pair name not specified. You will not have SSH access to the render farm.');
   }
 
-  if (config.deadlineClientLinuxAmiMap === {['region']: 'ami-id'}) {
-    throw new Error('Deadline Client Linux AMI map is required but was not specified.');
-  }
-
   if (!config.enableSecretsManagement && config.secretsManagementSecretArn) {
     console.warn('Deadline Secrets Management is disabled, so the admin credentials specified in the provided secret will not be used.');
   }

diff --git a/packages/aws-rfdk/lib/deadline/scripts/bash/installDeadlineRepository.sh b/packages/aws-rfdk/lib/deadline/scripts/bash/installDeadlineRepository.sh
@@ -88,8 +88,8 @@ if test -f "$REPOSITORY_FILE_PATH"; then
         SplitVersion=(${Version//./ })
         SplitRepoVersion=(${DEADLINE_REPOSITORY_VERSION//./ })
 
-        if [[ ${SplitVersion[0]} != ${SplitRepoVersion[0]} ]] || [[ ${SplitVersion[1]} != ${SplitRepoVersion[1]} ]]; then
-            echo "ERROR: Repository pre-exists but configured Repository Version (${Version}) has a different Major or Minor Version than the provided installer (${DEADLINE_REPOSITORY_VERSION})."
+        if [[ ${SplitVersion[0]} != ${SplitRepoVersion[0]} ]]; then
+            echo "ERROR: Repository pre-exists but configured Repository Version (${Version}) has a different Major Version than the provided installer (${DEADLINE_REPOSITORY_VERSION})."
             exit 1
         fi
     fi