R2023a release!

vramanatMW · vramanatMW · commit 78a0da2f4a05 · 2024-08-12T12:58:02.000Z
diff --git a/packer/v1/build-matlab-ami.pkr.hcl b/packer/v1/build-matlab-ami.pkr.hcl
@@ -18,15 +18,10 @@ variable "PRODUCTS" {
 
 }
 
-variable "BASE_AMI" {
+variable "BASE_AMI_NAME" {
   type        = string
-  default     = "ami-0f9c44e98edf38a2b"
-  description = "Default AMI ID refers to the Windows Server 2022 image provided by Microsoft."
-
-  validation {
-    condition     = can(regex("^ami-", var.BASE_AMI))
-    error_message = "The BASE_AMI must start with \"ami-\"."
-  }
+  default     = "Windows_Server-2022-English-Full-Base-*"
+  description = "Default AMI name refers to the Windows Server 2022 image provided by Microsoft."
 }
 
 variable "BUILD_SCRIPTS" {
@@ -133,6 +128,8 @@ variable "AMI_TAGS" {
     Build    = "MATLAB"
     Type     = "matlab-on-aws"
     Platform = "Windows"
+    Base_AMI_ID = "{{ .SourceAMI }}"
+    Base_AMI_Name = "{{ .SourceAMIName }}"
   }
   description = "The tags Packer adds to the resultant machine image."
 }
@@ -197,7 +194,15 @@ source "amazon-ebs" "AMI_Builder" {
     volume_type           = "gp2"
   }
   region                                    = "us-east-1"
-  source_ami                                = "${var.BASE_AMI}"
+  source_ami_filter {
+    filters = {
+      "virtualization-type" = "hvm"
+      "name" = "${var.BASE_AMI_NAME}"
+      "root-device-type" = "ebs"
+    } 
+    owners = ["801119661308"] # Owner ID associated with Windows Server AMIs
+    most_recent = true
+  }
   subnet_id                                 = "${var.SUBNET_ID}"
   run_tags                                  = "${var.INSTANCE_TAGS}"
   tags                                      = "${var.AMI_TAGS}"
@@ -282,6 +287,8 @@ build {
       release            = "MATLAB ${var.RELEASE}"
       specified_products = "${var.PRODUCTS}"
       build_scripts      = join(", ", "${var.BUILD_SCRIPTS}")
+      base_ami_id        = "{{ .SourceAMI }}"
+      base_ami_name      = "{{ .SourceAMIName }}"
     }
   }
 }
diff --git a/packer/v1/build/config/matlab/startup-accelerator/R2023a/msa.ini b/packer/v1/build/config/matlab/startup-accelerator/R2023a/msa.ini
diff --git a/packer/v1/build/config/matlab/startup-accelerator/R2023b/msa.ini b/packer/v1/build/config/matlab/startup-accelerator/R2023b/msa.ini
diff --git a/packer/v1/release-config/R2020b.pkrvars.hcl b/packer/v1/release-config/R2020b.pkrvars.hcl
@@ -4,7 +4,7 @@
 // For more information on these variables, see /packer/build-matlab-ami.pkr.hcl.
 RELEASE  = "R2020b"
 // Microsoft Windows Server 2019 Base (64-bit (x86))
-BASE_AMI = "ami-035d8ae8de3734e5a"
+BASE_AMI_NAME = "Windows_Server-2019-English-Full-Base-*"
 STARTUP_SCRIPTS = [
   "env.ps1",
   "00_Confirm-InstanceProfile.ps1",
diff --git a/packer/v1/release-config/R2021a.pkrvars.hcl b/packer/v1/release-config/R2021a.pkrvars.hcl
@@ -4,7 +4,7 @@
 // For more information on these variables, see /packer/build-matlab-ami.pkr.hcl.
 RELEASE  = "R2021a"
 // Microsoft Windows Server 2019 Base (64-bit (x86))
-BASE_AMI = "ami-035d8ae8de3734e5a"
+BASE_AMI_NAME = "Windows_Server-2019-English-Full-Base-*"
 STARTUP_SCRIPTS = [
   "env.ps1",
   "00_Confirm-InstanceProfile.ps1",
diff --git a/packer/v1/release-config/R2021b.pkrvars.hcl b/packer/v1/release-config/R2021b.pkrvars.hcl
@@ -4,7 +4,7 @@
 // For more information on these variables, see /packer/build-matlab-ami.pkr.hcl.
 RELEASE  = "R2021b"
 // Microsoft Windows Server 2019 Base (64-bit (x86))
-BASE_AMI = "ami-035d8ae8de3734e5a"
+BASE_AMI_NAME = "Windows_Server-2019-English-Full-Base-*"
 STARTUP_SCRIPTS = [
   "env.ps1",
   "00_Confirm-InstanceProfile.ps1",
diff --git a/packer/v1/release-config/R2022a.pkrvars.hcl b/packer/v1/release-config/R2022a.pkrvars.hcl
@@ -4,7 +4,7 @@
 // For more information on these variables, see /packer/build-matlab-ami.pkr.hcl.
 RELEASE  = "R2022a"
 // Microsoft Windows Server 2019 Base (64-bit (x86))
-BASE_AMI = "ami-035d8ae8de3734e5a"
+BASE_AMI_NAME = "Windows_Server-2019-English-Full-Base-*"
 STARTUP_SCRIPTS = [
   "env.ps1",
   "00_Confirm-InstanceProfile.ps1",
diff --git a/packer/v1/release-config/R2022b.pkrvars.hcl b/packer/v1/release-config/R2022b.pkrvars.hcl
@@ -4,7 +4,7 @@
 // For more information on these variables, see /packer/build-matlab-ami.pkr.hcl.
 RELEASE  = "R2022b"
 // Microsoft Windows Server 2019 Base (64-bit (x86))
-BASE_AMI = "ami-035d8ae8de3734e5a"
+BASE_AMI_NAME = "Windows_Server-2019-English-Full-Base-*"
 STARTUP_SCRIPTS = [
   "env.ps1",
   "00_Confirm-InstanceProfile.ps1",
diff --git a/packer/v1/release-config/R2023a.pkrvars.hcl b/packer/v1/release-config/R2023a.pkrvars.hcl
@@ -4,30 +4,35 @@
 // For more information on these variables, see /packer/build-matlab-ami.pkr.hcl.
 RELEASE  = "R2023a"
 // Microsoft Windows Server 2022 Base (64-bit (x86))
-BASE_AMI = "ami-0f9c44e98edf38a2b"
+BASE_AMI_NAME = "Windows_Server-2022-English-Full-Base-*"
 STARTUP_SCRIPTS = [
   "env.ps1",
   "00_Confirm-InstanceProfile.ps1",
   "10_Initialize-EBSVolume.ps1",
   "20_Set-AdminPassword.ps1",
   "30_Initialize-CloudWatchLogging.ps1",
   "40_Set-DDUX.ps1",
+  "50_Setup-MATLABProxy.ps1",
   "60_Set-MATLABLicense.ps1",
   "70_Invoke-MATLABStartupAccelerator.ps1",
   "80_Invoke-MSHStartupAccelerator.ps1",
   "99_Invoke-OptionalUserCommand.ps1"
 ]
 RUNTIME_SCRIPTS = [
-  "Install-NVIDIAGridDriver.ps1"
+  "Install-NVIDIAGridDriver.ps1",
+  "Start-MATLABProxy.ps1",
+  "generate-certificate.py"
 ]
 BUILD_SCRIPTS = [
   "Install-StartupScripts.ps1",
   "Install-NVIDIADrivers.ps1",
   "Install-Dependencies.ps1",
+  "Install-MATLABProxy.ps1",
   "Install-MATLAB.ps1",
   "Remove-IE.ps1"
 ]
 PRODUCTS                    = "5G_Toolbox AUTOSAR_Blockset Aerospace_Blockset Aerospace_Toolbox Antenna_Toolbox Audio_Toolbox Automated_Driving_Toolbox Bioinformatics_Toolbox Bluetooth_Toolbox C2000_Microcontroller_Blockset Communications_Toolbox Computer_Vision_Toolbox Control_System_Toolbox Curve_Fitting_Toolbox DDS_Blockset DSP_HDL_Toolbox DSP_System_Toolbox Data_Acquisition_Toolbox Database_Toolbox Datafeed_Toolbox Deep_Learning_HDL_Toolbox Deep_Learning_Toolbox Econometrics_Toolbox Embedded_Coder Filter_Design_HDL_Coder Financial_Instruments_Toolbox Financial_Toolbox Fixed-Point_Designer Fuzzy_Logic_Toolbox GPU_Coder Global_Optimization_Toolbox HDL_Coder HDL_Verifier Image_Acquisition_Toolbox Image_Processing_Toolbox Industrial_Communication_Toolbox Instrument_Control_Toolbox LTE_Toolbox Lidar_Toolbox MATLAB MATLAB_Coder MATLAB_Compiler MATLAB_Compiler_SDK MATLAB_Production_Server MATLAB_Report_Generator MATLAB_Test MATLAB_Web_App_Server Mapping_Toolbox Medical_Imaging_Toolbox Mixed-Signal_Blockset Model_Predictive_Control_Toolbox Model-Based_Calibration_Toolbox Motor_Control_Blockset Navigation_Toolbox Optimization_Toolbox Parallel_Computing_Toolbox Partial_Differential_Equation_Toolbox Phased_Array_System_Toolbox Powertrain_Blockset Predictive_Maintenance_Toolbox RF_Blockset RF_PCB_Toolbox RF_Toolbox ROS_Toolbox Radar_Toolbox Reinforcement_Learning_Toolbox Requirements_Toolbox Risk_Management_Toolbox Robotics_System_Toolbox Robust_Control_Toolbox Satellite_Communications_Toolbox Sensor_Fusion_and_Tracking_Toolbox SerDes_Toolbox Signal_Integrity_Toolbox Signal_Processing_Toolbox SimBiology SimEvents Simscape Simscape_Battery Simscape_Driveline Simscape_Electrical Simscape_Fluids Simscape_Multibody Simulink Simulink_3D_Animation Simulink_Check Simulink_Coder Simulink_Compiler Simulink_Control_Design Simulink_Coverage Simulink_Design_Optimization Simulink_Design_Verifier Simulink_Desktop_Real-Time Simulink_PLC_Coder Simulink_Real-Time Simulink_Report_Generator Simulink_Test SoC_Blockset Spreadsheet_Link Stateflow Statistics_and_Machine_Learning_Toolbox Symbolic_Math_Toolbox System_Composer System_Identification_Toolbox Text_Analytics_Toolbox UAV_Toolbox Vehicle_Dynamics_Blockset Vehicle_Network_Toolbox Vision_HDL_Toolbox WLAN_Toolbox Wavelet_Toolbox Wireless_HDL_Toolbox Wireless_Testbench"
 DCV_INSTALLER_URL           = "https://d1uj6qtbmh3dt5.cloudfront.net/2023.0/Servers/nice-dcv-server-x64-Release-2023.0-15487.msi"
 NVIDIA_DRIVER_INSTALLER_URL = "https://uk.download.nvidia.com/tesla/518.03/518.03-data-center-tesla-desktop-winserver-2016-2019-2022-dch-international.exe"
 PYTHON_INSTALLER_URL        = "https://www.python.org/ftp/python/3.10.5/python-3.10.5-amd64.exe"
+MATLAB_PROXY_VERSION        = "0.10.0"
diff --git a/packer/v1/release-config/R2023b.pkrvars.hcl b/packer/v1/release-config/R2023b.pkrvars.hcl
@@ -4,7 +4,7 @@
 // For more information on these variables, see /packer/build-matlab-ami.pkr.hcl.
 RELEASE  = "R2023b"
 // Microsoft Windows Server 2022 Base (64-bit (x86))
-BASE_AMI = "ami-0f9c44e98edf38a2b"
+BASE_AMI_NAME = "Windows_Server-2022-English-Full-Base-*"
 STARTUP_SCRIPTS = [
   "env.ps1",
   "00_Confirm-InstanceProfile.ps1",
diff --git a/packer/v1/release-config/R2024a.pkrvars.hcl b/packer/v1/release-config/R2024a.pkrvars.hcl
@@ -4,7 +4,7 @@
 // For more information on these variables, see /packer/build-matlab-ami.pkr.hcl.
 RELEASE  = "R2024a"
 // Microsoft Windows Server 2022 Base (64-bit (x86))
-BASE_AMI = "ami-0f9c44e98edf38a2b"
+BASE_AMI_NAME = "Windows_Server-2022-English-Full-Base-*"
 STARTUP_SCRIPTS = [
   "env.ps1",
   "00_Confirm-InstanceProfile.ps1",
diff --git a/packer/v1/runtime/Install-NVIDIAGridDriver.ps1 b/packer/v1/runtime/Install-NVIDIAGridDriver.ps1
@@ -31,7 +31,8 @@ function Install-NVidiaGridDrivers {
     Start-Transcript -Path 'C:\Windows\NVIDIADrivers\grid-drivers-installation.log'
 
     # Invoke instance meta-data service to retrieve the instance type of the running VM
-    $InstanceType = $(Invoke-WebRequest -UseBasicParsing -Uri http://169.254.169.254/latest/meta-data/instance-type).Content
+    $Token = $(Invoke-RestMethod -Headers @{"X-aws-ec2-metadata-token-ttl-seconds" = "120"} -Method PUT -Uri http://169.254.169.254/latest/api/token)
+    $InstanceType = $(Invoke-RestMethod -Headers @{"X-aws-ec2-metadata-token" = $token} -Method GET -Uri http://169.254.169.254/latest/meta-data/instance-type)
 
     # Extract class from the instance type
     $InstanceClass = $InstanceType.Split('.')[0]
diff --git a/packer/v1/startup/00_Confirm-InstanceProfile.ps1 b/packer/v1/startup/00_Confirm-InstanceProfile.ps1
@@ -20,7 +20,8 @@ function Confirm-InstanceProfile {
     $Response = $null
     while ($StatusCode -ne 200) {
         try {
-            $Response = Invoke-WebRequest -UseBasicParsing -Uri http://169.254.169.254/latest/meta-data/iam/info
+            $Token = Invoke-RestMethod -Headers @{"X-aws-ec2-metadata-token-ttl-seconds" = "120"} -Method PUT -Uri http://169.254.169.254/latest/api/token
+            $Response = Invoke-WebRequest -UseBasicParsing -Uri http://169.254.169.254/latest/meta-data/iam/info -Headers @{ "X-aws-ec2-metadata-token" = $Token }
             $StatusCode = $Response.StatusCode
             Start-Sleep -Milliseconds 100
         }
diff --git a/packer/v1/startup/40_Set-DDUX.ps1 b/packer/v1/startup/40_Set-DDUX.ps1
@@ -20,8 +20,10 @@ function Set-DDUX {
     [Environment]::SetEnvironmentVariable('MW_CONTEXT_TAGS', 'MATLAB:AWS:V1', [System.EnvironmentVariableTarget]::Machine)
     [Environment]::SetEnvironmentVariable('MW_DDUX_FORCE_ENABLE', $true, [System.EnvironmentVariableTarget]::Machine)
 
-    $ResponseInstanceId = Invoke-WebRequest -Uri http://169.254.169.254/latest/meta-data/instance-id
-    $ResponseRegion = Invoke-WebRequest -Uri http://169.254.169.254/latest/meta-data/placement/region
+    $Token = Invoke-RestMethod -Headers @{"X-aws-ec2-metadata-token-ttl-seconds" = "120"} -Method PUT -Uri http://169.254.169.254/latest/api/token
+    $ResponseInstanceId = Invoke-RestMethod -Headers @{"X-aws-ec2-metadata-token" = $token} -Method GET -Uri http://169.254.169.254/latest/meta-data/instance-id
+    $ResponseRegion = Invoke-RestMethod -Headers @{"X-aws-ec2-metadata-token" = $token} -Method GET -Uri http://169.254.169.254/latest/meta-data/placement/region
+    
     $MWAppTagGroup = aws ec2 describe-tags --filters "Name=resource-id,Values=$ResponseInstanceId" 'Name=key,Values=mw-app' --region "$ResponseRegion"
     $MWAppTag = (Write-Output $MWAppTagGroup | ConvertFrom-Json).Tags.Value
 
diff --git a/releases/R2023a/README.md b/releases/R2023a/README.md
@@ -2,7 +2,8 @@
 
 ## Step 1. Launch the Template
 
-Click the **Launch Stack** button to deploy a standalone MATLAB&reg; desktop client on AWS&reg;. This will open the CloudFormation Create Stack screen in your web browser.
+Click the **Launch Stack** button to deploy a standalone MATLAB&reg; desktop client on AWS&reg;. This 
+opens the CloudFormation Create Stack screen in your web browser.
 
 | Region | Launch Link |
 | --------------- | ----------- |
@@ -46,14 +47,16 @@ After you click the Launch Stack button above, the “Create stack” page will
 | **VPC to deploy this stack to** | ID of an existing VPC in which to deploy this stack |
 | **Subnet** | ID of an existing subnet |
 | **RDP Key Pair** | Name of an existing EC2 KeyPair to allow RDP access to all the instances. See https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html for details on creating these. |
+| **Enable browser access for MATLAB** | Option that enables access to MATLAB on your cloud MATLAB instance within a browser. Opening MATLAB in a browser opens a separate MATLAB session to your Remote Desktop Protocol (RDP) session or NICE DCV session. |
 | **Allow RDP and SSH connections from** | IP address range that will be allowed to connect to this instance from outside of the VPC. This field should be formatted as \<ip_address>/\<mask>. E.g. 10.0.0.1/32. This is the public IP address which can be found by searching for 'what is my ip address' on the web. The mask determines the number of IP addresses to include. A mask of 32 is a single IP address. This calculator can be used to build a specific range: https://www.ipaddressguide.com/cidr. You may need to contact your IT administrator to determine which address is appropriate. |
-| **Remote password** | Password for the user Administrator |
+| **Remote password** | Password for the user Administrator. You also need to enter this as an authentication token to access MATLAB on your cloud instance within a browser. |
 | **Confirm remote password** | Confirm Password |
 | **License Manager for MATLAB connection string** | Optional License Manager for MATLAB, specified as a string in the form \<port>@\<hostname>. If not specified, use online licensing. If specified, the network license manager (NLM) must be accessible from the specified VPC and subnets. To use the private hostname of the NLM hub instead of the public hostname, specify the security group ID of the NLM hub in the AdditionalSecurityGroup parameter. For more information, see https://github.com/mathworks-ref-arch/license-manager-for-matlab-on-aws. |
 | **Configure cloudwatch logging for the MATLAB instance** | Flag indicating whether cloudwatch logging for the MATLAB instance is enabled. |
 | **Additional security group to place instances in** | ID of an additional (optional) Security Group for the instances to be placed in. Often the License Manager for MATLAB's Security Group. |
 | **Use Elastic IP address that persists across machine reboots** | Flag indicating whether you want to keep the same public IP address for the instance. |
 | **AutoShutdown** | Choose whether you want to enable autoshutdown for your instance after a certain number of hours |
+| **Custom AMI ID (Optional)** | ID of a custom Amazon Machine Image (AMI) in the target region (optional). If the build has been customized then the resulting machine image may no longer be compatible with the provided CloudFormation template. Compatability can in some cases be restored by making corresponding modifications to the CloudFormation template. The ID should start with 'ami-'. |
 | **Optional user inline command** | Provide an optional inline PowerShell command to run on machine launch. For example, to set an environment variable CLOUD=AWS, use this command excluding the angle brackets: \<[System.Environment]::SetEnvironmentVariable("CLOUD","AWS", "Machine");>. You can use either double quotes or two single quotes. To run an external script, use this command excluding the angle brackets: \<Invoke-WebRequest "https://www.example.com/script.ps1" -OutFile script.ps1; .\script.ps1>. Find the logs at '$Env:ProgramData\MathWorks\startup.log'. |
 
 
@@ -63,14 +66,21 @@ After you click the Launch Stack button above, the “Create stack” page will
 
 ## Step 3. Connect to the Virtual Machine in the Cloud
 
+To connect to the Virtual Machine (VM) using Remote Desktop Client, follow these steps:
 1. Expand the **Outputs** section in the *Stack Detail* page.
 1. Look for the key named `RDPSSHConnection` and copy the corresponding public DNS name listed under value. *For example*: ec2-11-222-33-44.compute-1.amazonaws.com
 1. Launch any remote desktop client, paste the public DNS name in the appropriate field, and connect. On the Windows Remote Desktop Client you need to paste the public DNS name in the **Computer** field and click **Connect**.
 1. In the login screen that's displayed, use the username `Administrator` and the password you specified while setting up the stack in [Step 2](#step-2-configure-the-stack).
 1. You can also connect using SSH from the terminal using the format: `ssh Administrator@<DNS name>`. *For example*: ssh Administrator@ec2-11-222-33-44.compute-1.amazonaws.com
 
+If you choose to enable browser access for MATLAB, then:
+1. Expand the **Outputs** section in the *Stack Details* page.
+1. Look for the key named `BrowserConnection` and click on it
+1. On the login screen, use the password you specified while deploying the stack in [Step 2](#step-2-configure-the-stack) as the 'auth token' to authenticate.
+1. Browser access for MATLAB is enabled using `matlab-proxy`, a MathWorks&reg; developed Python&reg; package. For more information on `matlab-proxy`, refer to [matlab-proxy GitHub repository](https://github.com/mathworks/matlab-proxy).
+
 ## Step 4. Start MATLAB
-Double-click the MATLAB icon on the virtual machine desktop to start MATLAB. The first time you start MATLAB, you need to enter your MathWorks&reg; Account credentials to license MATLAB. For other ways to license MATLAB, see [MATLAB Licensing in the Cloud](https://www.mathworks.com/help/install/license/licensing-for-mathworks-products-running-on-the-cloud.html). 
+Double-click the MATLAB icon on the virtual machine desktop to start MATLAB. The first time you start MATLAB, you need to enter your MathWorks Account credentials to license MATLAB. For other ways to license MATLAB, see [MATLAB Licensing in the Cloud](https://www.mathworks.com/help/install/license/licensing-for-mathworks-products-running-on-the-cloud.html). 
 
 >**Note**: It may take up to a minute for MATLAB to start the first time.
 
@@ -96,6 +106,6 @@ This CloudFormation template uses nested stacks to reference templates used by m
 
 ----
 
-Copyright 2020-2023 The MathWorks, Inc.
+Copyright 2020-2024 The MathWorks, Inc.
 
 ----
diff --git a/releases/R2023a/aws-matlab-template.json b/releases/R2023a/aws-matlab-template.json
