Merge pull request #33 from hayd/mv

Rename directories and SAR application name
denoland · Jan 15, 2020 · 03631b8 · 03631b8
2 parents 9e26b02 + c304f96
commit 03631b8
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -44,7 +44,7 @@ jobs:
         sudo apt -qq update &> /dev/null
         sudo apt -qq install -y awscli python3-setuptools &> /dev/null
         aws s3 cp --quiet deno-lambda-layer.zip s3://$DENO_LAMBDA_BUCKET/deno-lambda-layer_$DENO_LAMBDA_VERSION.zip --acl public-read
-        cd layer
+        cd sar
         sed -i -e s/DENO_LAMBDA_BUCKET/$DENO_LAMBDA_BUCKET/g template.yml
         sed -i -e s/DENO_LAMBDA_VERSION/$DENO_LAMBDA_VERSION/g template.yml
         pip3 -q install -U --force pip

diff --git a/CONSOLE.md → QUICK-START.md b/CONSOLE.md → QUICK-START.md
@@ -1,4 +1,4 @@
-## Console Quick Start
+## Quick Start in the AWS console
 
 From the [AWS console](https://console.aws.amazon.com/lambda/):
 

diff --git a/README.md b/README.md
@@ -53,13 +53,13 @@ APIGateway use `APIGatewayProxyEvent` and `APIGatewayProxyResult`, SQS use `SQSE
 ## Examples
 
 - Hello example ([`deno-lambda-example.zip`](https://github.com/hayd/deno-lambda/releases/))
-- Web example (behind API Gateway) using dynamodb, see `/example` directory.
+- Web example (behind API Gateway) using dynamodb, see `/example-serverless` directory.
 
 ## Deployment
 
 ### Serverless
 
-See /example.
+See /example-serverless.
 
 ### SAM
 
@@ -71,7 +71,7 @@ Deploy the layer via the
 [SAR application](https://serverlessrepo.aws.amazon.com/applications/arn:aws:serverlessrepo:us-east-1:390065572566:applications~Deno)
 or upload the
 [deno-lambda-layer.zip](https://github.com/hayd/deno-lambda/releases)
-manually (see `CONSOLE.md`). Reference the layer by ARN in your Lambda function.
+manually (see `QUICK-START.md`). Reference the layer by ARN in your Lambda function.
 
 ## Warning
 

diff --git a/example/README.md → example-serverless/README.md b/example/README.md → example-serverless/README.md
@@ -1,4 +1,4 @@
-# Serverless example
+# Serverless
 
 Deploy in a single step using [`serverless deploy`](https://serverless.com/framework/docs/providers/aws/guide/deploying/).
 
@@ -11,9 +11,14 @@ The application defines in `serverless.yml`:
 Note: The `serverless-scriptable-plugin` is used to compile `api/candidate.ts` prior to deployment
 so that there is no init-time download/compilation step.
 
+### Requirements
+
 ```sh
+# Install the serverless cli
+npm install -g serverless
+
 # Install serverless-scriptable-plugin:
-npm install --save-dev serverless-scriptable-plugin
+npm install -g serverless-scriptable-plugin
 ```
 
 ---

diff --git a/example/api/candidate.ts → example-serverless/api/candidate.ts b/example/api/candidate.ts → example-serverless/api/candidate.ts
diff --git a/example/client.ts → example-serverless/client.ts b/example/client.ts → example-serverless/client.ts
diff --git a/example/deps.ts → example-serverless/deps.ts b/example/deps.ts → example-serverless/deps.ts
diff --git a/example/serverless.yml → example-serverless/serverless.yml b/example/serverless.yml → example-serverless/serverless.yml
@@ -64,8 +64,8 @@ resources:
       Type: AWS::Serverless::Application
       Properties:
         Location:
-          ApplicationId: arn:aws:serverlessrepo:us-east-1:390065572566:applications/Deno
-          SemanticVersion: 0.7.0
+          ApplicationId: arn:aws:serverlessrepo:us-east-1:390065572566:applications/deno
+          SemanticVersion: 0.0.9
 
     candidatesTable:
       Type: AWS::DynamoDB::Table

diff --git a/example/test.ts → example-serverless/test.ts b/example/test.ts → example-serverless/test.ts
diff --git a/example/test_util.ts → example-serverless/test_util.ts b/example/test_util.ts → example-serverless/test_util.ts
diff --git a/layer/README.md → sar/README.md b/layer/README.md → sar/README.md
diff --git a/layer/template.yml → sar/template.yml b/layer/template.yml → sar/template.yml
@@ -7,8 +7,8 @@ Resources:
   DenoLambdaLayer:
     Type: AWS::Lambda::LayerVersion
     Properties:
-      LayerName: Deno
-      Description: A deno runtime for AWS Lambda - deno-lambda DENO_LAMBDA_VERSION
+      LayerName: deno
+      Description: deno-lambda DENO_LAMBDA_VERSION
       Content:
         S3Bucket: DENO_LAMBDA_BUCKET
         S3Key: deno-lambda-layer_DENO_LAMBDA_VERSION.zip
@@ -19,7 +19,7 @@ Outputs:
 
 Metadata:
   AWS::ServerlessRepo::Application:
-    Name: Deno
+    Name: deno
     Description: |
       A deno runtime for AWS Lambda
     Author: Andy Hayden
@@ -31,4 +31,4 @@ Metadata:
     - typescript
     HomePageUrl: https://github.com/hayd/deno-lambda
     SemanticVersion: DENO_LAMBDA_VERSION
-    SourceCodeUrl: https://github.com/hayd/deno-lambda
+    SourceCodeUrl: https://github.com/hayd/deno-lambda/releases/tag/DENO_LAMBDA_VERSION