Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update serverless default settings and service catalog initialization #141

Merged
merged 1 commit into from
Nov 29, 2023
Merged

Update serverless default settings and service catalog initialization #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions ...ase-raas/packages/base-raas-post-deployment/lib/steps/create-service-catalog-portfolio.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 2 additions & 0 deletions main/config/settings/.defaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions main/solution/backend/config/settings/.defaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
2 changes: 0 additions & 2 deletions main/solution/post-deployment/config/settings/.defaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
Loading