Merge pull request #376 from james-jory/patching-june-22

Dependencies updates/patching

aws/cloudformation-templates/base/_template.yaml

@@ -179,6 +179,8 @@ Resources:
     Properties:
       TemplateURL: !Sub https://s3.amazonaws.com/${ResourceBucket}/${ResourceBucketRelativePath}cloudformation-templates/base/notebook.yaml
       Parameters:
+        ResourceBucket: !Ref ResourceBucket
+        ResourceBucketRelativePath: !Ref ResourceBucketRelativePath
         VpcId: !GetAtt VPC.Outputs.VpcId
         Subnets: !GetAtt VPC.Outputs.Subnets
         Subnet1: !GetAtt VPC.Outputs.Subnet1

aws/cloudformation-templates/base/notebook.yaml

@@ -5,6 +5,14 @@ Description: >
     This template deploys the Retail Demo Store SageMaker Notebook Instances.
 
 Parameters:
+  ResourceBucket:
+    Type: String
+    Description: S3Bucket Bucket where the Resources are stored (cloudformation, images, lambda code)
+
+  ResourceBucketRelativePath:
+    Type: String
+    Description: S3Bucket Path where the Resources are stored (cloudformation, images, lambda code) (i.e. path/path2), can be empty if resources are at the root of the bucket. MUST contain trailing /
+
   GitHubUser:
     Type: String
     Description: Your GitHub username.
@@ -130,6 +138,11 @@ Resources:
                 Action:
                   - sagemaker:ListTags
                 Resource: !Sub 'arn:aws:sagemaker:${AWS::Region}:${AWS::AccountId}:notebook-instance/*'
+              -
+                Effect: "Allow"
+                Action:
+                  - cloudformation:DescribeStacks
+                Resource: !Sub 'arn:aws:cloudformation:${AWS::Region}:${AWS::AccountId}:stack/${AWS::StackName}*'
         -
           PolicyName: "0-StartHere"
           PolicyDocument:
@@ -171,6 +184,12 @@ Resources:
                 Resource:
                   - !Sub arn:aws:s3:::${StackBucketName}/*
                   - !Sub arn:aws:s3:::${StackBucketName}
+              -
+                Effect: "Allow"
+                Action:
+                  - s3:GetObject
+                Resource:
+                  - !Sub arn:aws:s3:::${ResourceBucket}/${ResourceBucketRelativePath}csvs/*
               -
                 Effect: "Allow"
                 Action:

generators/requirements.txt

@@ -1,16 +1,15 @@
-# Note that dependency versions must be compatible with SageMaker notebook python environment (3.6)
 certifi==2020.4.5.1
 chardet==3.0.4
 Faker==4.1.0
 idna==2.9
-numpy==1.19.5
+numpy==1.23.0
 python-dateutil==2.8.1
 pytz==2020.1
 PyYAML==5.4
-requests==2.25.1
-scipy==1.5.4
+requests==2.28.0
+scipy==1.8.1
 six==1.15.0
 text-unidecode==1.3
 urllib3==1.26.5
 zope.interface==5.1.0
-pandas==1.1.5
+pandas==1.4.3

src/aws-lambda/mparticle-personalize/package.json

@@ -5,6 +5,6 @@
   "main": "mparticle-personalize.js",
   "dependencies": {
     "mparticle": "*",
-    "axios": "^0.21.1"
+    "axios": "^0.27.2"
   }
 }