From c11679005ca5ec1a5ae759778c86f7ca02457e06 Mon Sep 17 00:00:00 2001
From: Samantha Piatt <samantha.piatt@childrens.harvard.edu>
Date: Wed, 29 Nov 2023 13:36:32 -0500
Subject: [PATCH] Update serverless default settings and service catalog
 initialization.

---
 .../lib/steps/create-service-catalog-portfolio.js     | 11 +++++------
 main/config/settings/.defaults.yml                    |  2 ++
 main/solution/backend/config/settings/.defaults.yml   |  2 --
 .../post-deployment/config/settings/.defaults.yml     |  2 --
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/addons/addon-base-raas/packages/base-raas-post-deployment/lib/steps/create-service-catalog-portfolio.js b/addons/addon-base-raas/packages/base-raas-post-deployment/lib/steps/create-service-catalog-portfolio.js
index 20ff420579..816eb3be02 100644
--- a/addons/addon-base-raas/packages/base-raas-post-deployment/lib/steps/create-service-catalog-portfolio.js
+++ b/addons/addon-base-raas/packages/base-raas-post-deployment/lib/steps/create-service-catalog-portfolio.js
@@ -44,18 +44,17 @@ const productsToCreate = [
     displayName: 'SageMaker Notebook',
     description: `An Amazon SageMaker Jupyter Notebook that comes with: \n* TensorFlow \n* Apache MXNet \n* Scikit-learn
   `,
-  },
-  {
-    filename: 'emr-cluster',
-    displayName: 'EMR',
-    description: `An Amazon EMR research workspace that comes with: \n* Hail 0.2 \n* Jupyter Lab \n* Spark 2.4.4 \n* Hadoop 2.8.5
-`,
   },
   {
     filename: 'ec2-windows-instance',
     displayName: 'EC2 Windows',
     description: `* An EC2 Windows instance with RDP access \n* Secure compute in the cloud`,
   },
+  {
+    filename: 'ec2-rstudio-instance',
+    displayName: 'EC2 RStudio Server',
+    description: `An RStudio instance accessible over SSL which comes with: \n* RStudio Server version 1.4.1717 \n* Connect securely via load balancer using Amazon issued certificates in ACM \n* Fully loaded with commonly used R packages`
+  },
 ];
 
 const autoCreateVersion = 'v1';
diff --git a/main/config/settings/.defaults.yml b/main/config/settings/.defaults.yml
index b751d13b35..8131357e55 100644
--- a/main/config/settings/.defaults.yml
+++ b/main/config/settings/.defaults.yml
@@ -144,6 +144,8 @@ hostedZoneId: ''
 # Equivalent role for launching/terminating environments in each on-boarded account with cross account trust is
 # created by "addons/addon-base-raas/packages/base-raas-cfn-templates/src/templates/onboard-account.cfn.yml"
 envMgmtRoleName: ${self:custom.settings.namespace}-EnvMgmt
+# The below is used for local deployment as a lambda env variable
+envMgmtRoleArn: 'arn:aws:iam::${self:custom.settings.awsAccountInfo.awsAccountId}:role/${self:custom.settings.envMgmtRoleName}'
 
 # AWS Service Catalog launch-constraint role name pattern. When admins publish new products under AWS Service Catalog
 # portfolios, they are expected to specify a local role name as a launch constraint. The AWS Service Catalog will assume
diff --git a/main/solution/backend/config/settings/.defaults.yml b/main/solution/backend/config/settings/.defaults.yml
index 43c3bc9281..61426bcf28 100644
--- a/main/solution/backend/config/settings/.defaults.yml
+++ b/main/solution/backend/config/settings/.defaults.yml
@@ -321,5 +321,3 @@ dataSourceReachabilityHandlerRoleArn: 'arn:aws:iam::${self:custom.settings.awsAc
 
 # The stack name of the 'backend' serverless service
 backendStackName: ${self:custom.settings.namespace}-backend
-
-envMgmtRoleArn: ${self:custom.settings.backendStackName}.EnvMgmtRoleArn}
diff --git a/main/solution/post-deployment/config/settings/.defaults.yml b/main/solution/post-deployment/config/settings/.defaults.yml
index c1b0a89944..5de315af04 100644
--- a/main/solution/post-deployment/config/settings/.defaults.yml
+++ b/main/solution/post-deployment/config/settings/.defaults.yml
@@ -308,8 +308,6 @@ dbTableKeyPairs: ${self:custom.settings.dbPrefix}-DbKeyPairs
 
 # ================================ Env Settings ===========================================
 
-envMgmtRoleArn: ${cf:${self:custom.settings.backendStackName}.EnvMgmtRoleArn}
-
 # ================================ Data Egress Feature Settings ===========================================
 # NOTE: Following properties are ONLY allowed to change for the initial deployment. It's NOT recommended to change the following properties if you have enabled data egress feature.