move login lambda to subdir

also:

- fix website title by actually passing it into the site builder lambda
- simplify ./deploy script by sharing code
- make all buckets explicit in ./generate_random_albums script

app.yml

@@ -53,11 +53,10 @@ Resources:
     Properties:
       Handler: index.handler
       Runtime: nodejs4.3
-      CodeUri: dist/lambda.zip
+      CodeUri: dist/lambda-login.zip
       Role: !GetAtt LambdaRole.Arn
       Environment:
         Variables:
-          WEBSITE_TITLE: !Ref websiteTitle
           WEBSITE_DOMAIN: !Ref website
           SESSION_DURATION: !Ref sessionDuration
           REDIRECT_ON_SUCCESS: !Ref redirectOnSuccess
@@ -157,6 +156,7 @@ Resources:
       CodeUri: dist/lambda-site-builder.zip
       Environment:
         Variables:
+          WEBSITE_TITLE: !Ref websiteTitle
           CLOUDFRONT_DISTRIBUTION_DOMAIN:
             !GetAtt ProtectedPicturesDistribution.DomainName
           ORIGINAL_BUCKET: !Sub

deploy

@@ -13,21 +13,13 @@ fi
 output_template_file=$(mktemp)
 stackName="ProtectedPictures"
 
-# build Lambda code for Linux
-docker build -t "cloudformation-lambda-cookies" .
-docker run "cloudformation-lambda-cookies" > dist/lambda.zip
-
-(
-  cd resize
-  docker build -t "cloudformation-lambda-resize" .
-  docker run "cloudformation-lambda-resize" > ../dist/lambda-resize.zip
-)
-
-(
-  cd site-builder
-  docker build -t "cloudformation-lambda-site-builder" .
-  docker run "cloudformation-lambda-site-builder" > ../dist/lambda-site-builder.zip
-)
+for function in login resize site-builder; do
+  (
+    cd $function
+    docker build -t "cloudformation-lambda-$function" .
+    docker run "cloudformation-lambda-$function" > ../dist/lambda-$function.zip
+  )
+done
 
 # create the target S3 bucket if needed
 aws s3 ls ${s3Bucket} > /dev/null

generate_random_albums

@@ -2,16 +2,18 @@
 
 if [ -z "$2" ]; then
   echo "Usage:"
-  echo "  generate_random_albums <root bucket> <number of albums>"
+  echo "  generate_random_albums <web bucket> <original bucket> <resized bucket> <number of albums>"
   echo "Removes all bucket contents, downloads 6 pictures for each album from unsplash.com, giving each album a random name, uploads them to the original bucket."
   exit 1
 else
-  rootBucket=$1
-  numberOfAlbums=$2
+  webBucket=$1
+  originalBucket=$2
+  resizedBucket=$3
+  numberOfAlbums=$4
 fi
 
-echo "Removing all files in bucket"
-for bucket in "$rootBucket" "$rootBucket-original" "$rootBucket-resized"; do
+echo "Removing all files in web, original & resized buckets"
+for bucket in "$webBucket" "$originalBucket" "$resizedBucket"; do
   aws s3 rm --recursive "s3://$bucket" >> /dev/null 2>&1
 done
 
@@ -27,6 +29,6 @@ for (( albumIndex = 0; albumIndex < ${numberOfAlbums}; albumIndex++ )); do
       curl -sL https://source.unsplash.com/random -o "$pic"
     done
     prevMD5+=("$(md5sum $pic | awk '{print $1}')")
-    aws s3 cp "$pic" "s3://$rootBucket-original/pics/original/Album $albumNumber/0$picIndex.jpg" >> /dev/null 2>&1
+    aws s3 cp "$pic" "s3://$originalBucket/pics/original/Album $albumNumber/0$picIndex.jpg" >> /dev/null 2>&1
   done
 done