Merge branch 'develop' into dependabot/go_modules/addons/addon-raas-s…

…3-copy/packages/s3-synchronizer/golang.org/x/sys-0.1.0

README.md

@@ -61,6 +61,13 @@ Service Workbench documentation can be accessed in the PDF format or by visiting
 ### Implementation Guide
 For information on installing Service Workbench on AWS, please visit the [AWS Solutions Implementation Guide](https://docs.aws.amazon.com/solutions/latest/service-workbench-on-aws/solution-overview.html).
 
+- [Service Workbench Solution Overview](https://docs.aws.amazon.com/solutions/latest/service-workbench-on-aws/solution-overview.html)
+- [Service Workbench  Architecture Overview](https://docs.aws.amazon.com/solutions/latest/service-workbench-on-aws/architecture-overview.html)
+- [Service Workbench Plan Your Deployment](https://docs.aws.amazon.com/solutions/latest/service-workbench-on-aws/plan-your-deployment.html)
+- [Service Workbench Deploy The Solution](https://docs.aws.amazon.com/solutions/latest/service-workbench-on-aws/deploy-the-solution.html)
+- [Service Workbench Update The Solution](https://docs.aws.amazon.com/solutions/latest/service-workbench-on-aws/update-the-solution.html)
+- [Service Workbench Uninstall The Solution](https://docs.aws.amazon.com/solutions/latest/service-workbench-on-aws/uninstall-the-solution.html)
+
 ### Documentation PDFs
 
 You can view the online documentation if you do not have Service Workbench locally installed on your machine. Click the following links to access the documentation:

addons/addon-base-raas/packages/base-raas-cfn-templates/src/templates/service-catalog/sagemaker-notebook-instance.cfn.yml

@@ -269,7 +269,7 @@ Resources:
                 chmod a+x /usr/local/bin/autostop.py
                 IDLE_TIME=`expr ${AutoStopIdleTimeInMinutes} \* 60`
                 echo "Starting the SageMaker autostop script in cron"
-                (crontab -l 2>/dev/null; echo "*/1 * * * * /bin/bash -c '/usr/bin/python3 /usr/local/bin/autostop.py --time $IDLE_TIME | tee -a /var/log/autostop.log'") | crontab -
+                (crontab -l 2>/dev/null; echo "*/1 * * * * /usr/bin/python /usr/local/bin/autostop.py --time $IDLE_TIME --ignore-connections >> /var/log/autostop.log") | crontab -
               fi
 
 Outputs:

docs/docs/installation_guide/installation/cloud9install.md

@@ -26,6 +26,8 @@ You can install Service Workbench by using AWS Cloud9. This section provides inf
 4. Choose **Next step**.
 5. For **Instance type**, choose **m5.large (8 GiB + 2 vCPU)**.
 6. For **Platform**, choose **Amazon Linux 2**.
+7. For **Network settings**, choose the VPC and a Public Subnet to deploy Cloud9. **Note** if you plan to use a private subnet you will not
+be able to use [AWS Managed Temporary Credentials](https://docs.aws.amazon.com/cloud9/latest/user-guide/security-iam.html#auth-and-access-control-temporary-managed-credentials) at this time and can impact installation. 
 7. Choose **Next step**.
 8. Review all the changes and choose **Create environment**.
 

main/end-to-end-tests/cypress.github.json

@@ -9,8 +9,8 @@
     "cognitoClientId": "6dmj4qhbihtkigcbsjo346hjmi",
     "workspaces": {
       "sagemaker": {
-        "workspaceTypeName": "SageMaker Notebook-v8",
-        "configuration": "sagemaker-e2e",
+        "workspaceTypeName": "SageMaker Notebook-v9",
+        "configuration": "e2etest-config-with-autostop",
         "projectId": "e2eTestProject"
       },
       "ec2": {

main/solution/post-deployment/config/environment-files/bootstrap.sh

@@ -8,9 +8,6 @@
 # CFN stack has been completed created.
 S3_MOUNTS="$1"
 
-# Exit if no S3 mounts were specified
-[ -z "$S3_MOUNTS" -o "$S3_MOUNTS" = "[]" ] && exit 0
-
 # Get directory in which this script is stored and define URL from which to download goofys
 FILES_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 GOOFYS_URL="https://github.com/kahing/goofys/releases/download/v0.24.0/goofys"