fix(deadline): Fix Python bindings of ThinkboxDockerImages (#880)

aws · Oct 28, 2022 · b283e67 · b283e67
1 parent 2f754da
commit b283e67
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 30 deletions.
diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/python/README.md b/examples/deadline/All-In-AWS-Infrastructure-Basic/python/README.md
@@ -22,9 +22,9 @@ These instructions assume that your working directory is `examples/deadline/All-
     ```bash
     # Navigate to the root directory of the RFDK repository
     pushd ../../../..
-    # Enter the Docker container to run the build and pack scripts
-    ./scripts/rfdk_build_environment.sh
     ./build.sh
+    # Enter the Docker container to run the pack scripts
+    ./scripts/rfdk_build_environment.sh
     ./pack.sh
     # Exit the Docker container
     exit

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/lib/service_tier.py b/examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/lib/service_tier.py
@@ -189,7 +189,7 @@ def __init__(self, scope: Construct, stack_id: str, *, props: ServiceTierProps,
             vpc_subnets_alb=SubnetSelection(
                 subnet_group_name=subnets.RENDER_QUEUE_ALB.name
             ),
-            images=images,
+            images=images.for_render_queue(),
             repository=repository,
             hostname=RenderQueueHostNameProps(
                 hostname='renderqueue',
@@ -232,7 +232,7 @@ def __init__(self, scope: Construct, stack_id: str, *, props: ServiceTierProps,
                 vpc_subnets=SubnetSelection(
                     subnet_group_name=subnets.USAGE_BASED_LICENSING.name
                 ),
-                images=images,
+                images=images.for_usage_based_licensing(),
                 licenses=props.ubl_licenses,
                 render_queue=self.render_queue,
                 certificate_secret=ubl_cert_secret,

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/README.md b/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/README.md
@@ -144,10 +144,7 @@ These instructions assume that your working directory is `examples/deadline/All-
     ```bash
     # Navigate to the root directory of the RFDK repository (assumes you started in the example's directory)
     pushd ../../../..
-    # Enter the Docker container, run the build, and then exit
-    ./scripts/rfdk_build_environment.sh
     ./build.sh
-    exit
     # Navigate back to the example directory
     popd
     # Run the example's build

diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/package.json b/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/package.json
@@ -19,7 +19,7 @@
     "typescript": "~4.7.3"
   },
   "dependencies": {
-    "aws-cdk-lib": "^2.33.0",
+    "aws-cdk-lib": "2.33.0",
     "aws-rfdk": "1.0.0",
     "source-map-support": "^0.5.21"
   }

diff --git a/examples/deadline/All-In-AWS-Infrastructure-SEP/python/README.md b/examples/deadline/All-In-AWS-Infrastructure-SEP/python/README.md
@@ -24,9 +24,9 @@ These instructions assume that your working directory is `examples/deadline/All-
     ```bash
     # Navigate to the root directory of the RFDK repository
     pushd ../../../..
-    # Enter the Docker container to run the build and pack scripts
-    ./scripts/rfdk_build_environment.sh
     ./build.sh
+    # Enter the Docker container to run thepack scripts
+    ./scripts/rfdk_build_environment.sh
     ./pack.sh
     # Exit the Docker container
     exit

diff --git a/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/README.md b/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/README.md
@@ -47,10 +47,7 @@ These instructions assume that your working directory is `examples/deadline/All-
     ```bash
     # Navigate to the root directory of the RFDK repository (assumes you started in the example's directory)
     pushd ../../../..
-    # Enter the Docker container, run the build, and then exit
-    ./scripts/rfdk_build_environment.sh
     ./build.sh
-    exit
     # Navigate back to the example directory
     popd
     # Run the example's build

diff --git a/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/package.json b/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/package.json
@@ -24,7 +24,7 @@
     "typescript": "~4.7.3"
   },
   "dependencies": {
-    "aws-cdk-lib": "^2.33.0",
+    "aws-cdk-lib": "2.33.0",
     "aws-rfdk": "1.0.0",
     "constructs": "^10.0.0",
     "source-map-support": "^0.5.21"

diff --git a/examples/deadline/EC2-Image-Builder/python/README.md b/examples/deadline/EC2-Image-Builder/python/README.md
@@ -24,9 +24,9 @@ These instructions assume that your working directory is `examples/deadline/EC2-
     ```bash
     # Navigate to the root directory of the RFDK repository
     pushd ../../../..
-    # Enter the Docker container to run the build and pack scripts
-    ./scripts/rfdk_build_environment.sh
     ./build.sh
+    # Enter the Docker container to run the pack scripts
+    ./scripts/rfdk_build_environment.sh
     ./pack.sh
     # Exit the Docker container
     exit

diff --git a/examples/deadline/EC2-Image-Builder/python/package/lib/base_farm_stack.py b/examples/deadline/EC2-Image-Builder/python/package/lib/base_farm_stack.py
@@ -80,7 +80,7 @@ def __init__(self, scope: Construct, stack_id: str, *, props: BaseFarmStackProps
             'RenderQueue',
             vpc=self.vpc,
             version=version,
-            images=images,
+            images=images.for_render_queue(),
             repository=repository,
             deletion_protection=False,
         )
diff --git a/examples/deadline/EC2-Image-Builder/ts/README.md b/examples/deadline/EC2-Image-Builder/ts/README.md
@@ -33,10 +33,7 @@ These instructions assume that your working directory is `examples/deadline/EC2-
     ```bash
     # Navigate to the root directory of the RFDK repository (assumes you started in the example's directory)
     pushd ../../../..
-    # Enter the Docker container, run the build, and then exit
-    ./scripts/rfdk_build_environment.sh
     ./build.sh
-    exit
     # Navigate back to the example directory
     popd
     # Run the example's build

diff --git a/examples/deadline/EC2-Image-Builder/ts/package.json b/examples/deadline/EC2-Image-Builder/ts/package.json
@@ -20,7 +20,7 @@
     "typescript": "~4.7.3"
   },
   "dependencies": {
-    "aws-cdk-lib": "^2.33.0",
+    "aws-cdk-lib": "2.33.0",
     "aws-rfdk": "1.0.0",
     "constructs": "^10.0.0",
     "source-map-support": "^0.5.21"

diff --git a/examples/deadline/Local-Zone/python/README.md b/examples/deadline/Local-Zone/python/README.md
@@ -24,9 +24,9 @@ These instructions assume that your working directory is `examples/deadline/Loca
     ```bash
     # Navigate to the root directory of the RFDK repository
     pushd ../../../..
+    ./build.sh
     # Enter the Docker container to run the build and pack scripts
     ./scripts/rfdk_build_environment.sh
-    ./build.sh
     ./pack.sh
     # Exit the Docker container
     exit

diff --git a/examples/deadline/Local-Zone/python/package/lib/service_tier.py b/examples/deadline/Local-Zone/python/package/lib/service_tier.py
@@ -137,7 +137,7 @@ def __init__(self, scope: Construct, stack_id: str, *, props: ServiceTierProps,
             self,
             'RenderQueue',
             vpc=props.vpc,
-            images=images,
+            images=images.for_render_queue(),
             repository=repository,
             hostname=RenderQueueHostNameProps(
                 hostname='renderqueue',

diff --git a/examples/deadline/Local-Zone/ts/README.md b/examples/deadline/Local-Zone/ts/README.md
@@ -57,10 +57,7 @@ These instructions assume that your working directory is `examples/deadline/Loca
     ```bash
     # Navigate to the root directory of the RFDK repository (assumes you started in the example's directory)
     pushd ../../../..
-    # Enter the Docker container, run the build, and then exit
-    ./scripts/rfdk_build_environment.sh
     ./build.sh
-    exit
     # Navigate back to the example directory
     popd
     # Run the example's build

diff --git a/examples/deadline/Local-Zone/ts/package.json b/examples/deadline/Local-Zone/ts/package.json
@@ -19,7 +19,7 @@
     "typescript": "~4.7.3"
   },
   "dependencies": {
-    "aws-cdk-lib": "^2.33.0",
+    "aws-cdk-lib": "2.33.0",
     "aws-rfdk": "1.0.0",
     "constructs": "^10.0.0",
     "source-map-support": "^0.5.21"

diff --git a/packages/aws-rfdk/lib/deadline/README.md b/packages/aws-rfdk/lib/deadline/README.md
@@ -209,7 +209,7 @@ const repository = new Repository(stack, 'Repository', { /* ...*/});
 
 const renderQueue = new RenderQueue(stack, 'RenderQueue', {
   vpc: vpc,
-  images: images,
+  images: images.forRenderQueue(),
   version: version,
   repository: repository,
 });

diff --git a/packages/aws-rfdk/lib/deadline/lib/thinkbox-docker-images.ts b/packages/aws-rfdk/lib/deadline/lib/thinkbox-docker-images.ts
@@ -256,14 +256,18 @@ USER_ACCEPTS_AWS_CUSTOMER_AGREEMENT_AND_IP_LICENSE to signify your acceptance of
    * Returns container images for use with the {@link RenderQueue} construct
    */
   public forRenderQueue(): RenderQueueImages {
-    return this;
+    return {
+      remoteConnectionServer: this.remoteConnectionServer,
+    };
   }
 
   /**
    * Returns container images for use with the {@link UsageBasedLicensing} construct
    */
   public forUsageBasedLicensing(): UsageBasedLicensingImages {
-    return this;
+    return {
+      licenseForwarder: this.licenseForwarder,
+    };
   }
 
   /**