Delete Python SAM implementation

fourTheorem · Mar 1, 2021 · 03dbb40 · 03dbb40
1 parent 2039682
commit 03dbb40
Show file tree

Hide file tree

Showing 29 changed files with 52 additions and 1,189 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,27 +1,15 @@
 version: 2.1
 
 orbs:
-  python: circleci/[email protected]
-  coveralls: coveralls/[email protected]
-
-jobs:
-  build-and-test:
-    docker:
-      - image: circleci/python:3.8-node
-    steps:
-      - checkout
-      - setup_remote_docker:
-          version: 19.03.13
-      - run:
-          name: Install Dependencies
-          command: make deps
-      - run:
-          name: Test
-          command: make test lint
-      - coveralls/upload:
-          path_to_lcov: ./.coverage
+  node: circleci/[email protected]
 
 workflows:
-  main:
+  matrix-tests:
+    app-dir: serverless-plugin
     jobs:
-      - build-and-test
+      - node/test:
+          version: '12'
+      - node/test:
+          version: '14'
+      - node/test:
+          version: '10'
diff --git a/.flake8 b/.flake8
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,18 +1,3 @@
 # Contributing
 
 
-## Troubleshooting Tests
-
-1. "I get errors while running the unit tests, like `botocore.exceptions.NoCredentialsError: Unable to locate credentials`. It seems like boto3 is attempting to access real resources instead of the moto mocks!"
-
-This typically happens when a test imports a module that imports `boto3` before the mocks have been set up. The solution is to import such modules within the test function itself. For example:
-
-```py
-@mock_cloudwatch
-def test_update_alarms(lambda_functions):
-    os.environ["SNS_ALARMS_TOPIC"] = "TestAlarmsTopic"
-    from alarms import update_alarms  # <- This import occurs within a function decorated by a moto mock
-```
-
-This issue is detailed further in the [moto README](https://github.com/spulec/moto#what-about-those-pesky-imports)
-
diff --git a/LICENSE b/LICENSE
@@ -177,7 +177,7 @@
 
    slic-watch Automatic CloudWatch metrics, alarms and dashboards for AWS applications
 
-   Copyright 2020 fourTheorem Ltd.
+   Copyright 2020-2021 fourTheorem Ltd.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
@@ -2,120 +2,5 @@
 
 [![CircleCI Build Status](https://circleci.com/gh/fourTheorem/slic-watch.svg?style=shield)](https://app.circleci.com/pipelines/github/fourTheorem/slic-watch)
 [![Coverage Status](https://coveralls.io/repos/github/fourTheorem/slic-watch/badge.svg?branch=master)](https://coveralls.io/github/fourTheorem/slic-watch?branch=master)
-This project contains source code and supporting files for a serverless application that you can deploy with the SAM CLI. It includes the following files and folders.
 
-- hello_world - Code for the application's Lambda function.
-- events - Invocation events that you can use to invoke the function.
-- tests - Unit tests for the application code. 
-- template.yaml - A template that defines the application's AWS resources.
-
-The application uses several AWS resources, including Lambda functions and an API Gateway API. These resources are defined in the `template.yaml` file in this project. You can update the template to add AWS resources through the same deployment process that updates your application code.
-
-If you prefer to use an integrated development environment (IDE) to build and test your application, you can use the AWS Toolkit.  
-The AWS Toolkit is an open source plug-in for popular IDEs that uses the SAM CLI to build and deploy serverless applications on AWS. The AWS Toolkit also adds a simplified step-through debugging experience for Lambda function code. See the following links to get started.
-
-* [PyCharm](https://docs.aws.amazon.com/toolkit-for-jetbrains/latest/userguide/welcome.html)
-* [IntelliJ](https://docs.aws.amazon.com/toolkit-for-jetbrains/latest/userguide/welcome.html)
-* [VS Code](https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/welcome.html)
-* [Visual Studio](https://docs.aws.amazon.com/toolkit-for-visual-studio/latest/user-guide/welcome.html)
-
-## Deploy the sample application
-
-The Serverless Application Model Command Line Interface (SAM CLI) is an extension of the AWS CLI that adds functionality for building and testing Lambda applications. It uses Docker to run your functions in an Amazon Linux environment that matches Lambda. It can also emulate your application's build environment and API.
-
-To use the SAM CLI, you need the following tools.
-
-* SAM CLI - [Install the SAM CLI](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html)
-* [Python 3 installed](https://www.python.org/downloads/)
-* Docker - [Install Docker community edition](https://hub.docker.com/search/?type=edition&offering=community)
-
-To build and deploy your application for the first time, run the following in your shell:
-
-```bash
-sam build --use-container
-sam deploy --guided
-```
-
-The first command will build the source of your application. The second command will package and deploy your application to AWS, with a series of prompts:
-
-* **Stack Name**: The name of the stack to deploy to CloudFormation. This should be unique to your account and region, and a good starting point would be something matching your project name.
-* **AWS Region**: The AWS region you want to deploy your app to.
-* **Confirm changes before deploy**: If set to yes, any change sets will be shown to you before execution for manual review. If set to no, the AWS SAM CLI will automatically deploy application changes.
-* **Allow SAM CLI IAM role creation**: Many AWS SAM templates, including this example, create AWS IAM roles required for the AWS Lambda function(s) included to access AWS services. By default, these are scoped down to minimum required permissions. To deploy an AWS CloudFormation stack which creates or modified IAM roles, the `CAPABILITY_IAM` value for `capabilities` must be provided. If permission isn't provided through this prompt, to deploy this example you must explicitly pass `--capabilities CAPABILITY_IAM` to the `sam deploy` command.
-* **Save arguments to samconfig.toml**: If set to yes, your choices will be saved to a configuration file inside the project, so that in the future you can just re-run `sam deploy` without parameters to deploy changes to your application.
-
-You can find your API Gateway Endpoint URL in the output values displayed after deployment.
-
-## Use the SAM CLI to build and test locally
-
-Build your application with the `sam build --use-container` command.
-
-```bash
-slic-watch$ sam build --use-container
-```
-
-The SAM CLI installs dependencies defined in `hello_world/requirements.txt`, creates a deployment package, and saves it in the `.aws-sam/build` folder.
-
-Test a single function by invoking it directly with a test event. An event is a JSON document that represents the input that the function receives from the event source. Test events are included in the `events` folder in this project.
-
-Run functions locally and invoke them with the `sam local invoke` command.
-
-```bash
-slic-watch$ sam local invoke HelloWorldFunction --event events/event.json
-```
-
-The SAM CLI can also emulate your application's API. Use the `sam local start-api` to run the API locally on port 3000.
-
-```bash
-slic-watch$ sam local start-api
-slic-watch$ curl http://localhost:3000/
-```
-
-The SAM CLI reads the application template to determine the API's routes and the functions that they invoke. The `Events` property on each function's definition includes the route and method for each path.
-
-```yaml
-      Events:
-        HelloWorld:
-          Type: Api
-          Properties:
-            Path: /hello
-            Method: get
-```
-
-## Add a resource to your application
-The application template uses AWS Serverless Application Model (AWS SAM) to define application resources. AWS SAM is an extension of AWS CloudFormation with a simpler syntax for configuring common serverless application resources such as functions, triggers, and APIs. For resources not included in [the SAM specification](https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md), you can use standard [AWS CloudFormation](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html) resource types.
-
-## Fetch, tail, and filter Lambda function logs
-
-To simplify troubleshooting, SAM CLI has a command called `sam logs`. `sam logs` lets you fetch logs generated by your deployed Lambda function from the command line. In addition to printing the logs on the terminal, this command has several nifty features to help you quickly find the bug.
-
-`NOTE`: This command works for all AWS Lambda functions; not just the ones you deploy using SAM.
-
-```bash
-slic-watch$ sam logs -n HelloWorldFunction --stack-name slic-watch --tail
-```
-
-You can find more information and examples about filtering Lambda function logs in the [SAM CLI Documentation](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-logging.html).
-
-## Unit tests
-
-Tests are defined in the `tests` folder in this project. Use PIP to install the [pytest](https://docs.pytest.org/en/latest/) and run unit tests.
-
-```bash
-slic-watch$ pip install pytest pytest-mock --user
-slic-watch$ python -m pytest tests/ -v
-```
-
-## Cleanup
-
-To delete the sample application that you created, use the AWS CLI. Assuming you used your project name for the stack name, you can run the following:
-
-```bash
-aws cloudformation delete-stack --stack-name slic-watch
-```
-
-## Resources
-
-See the [AWS SAM developer guide](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/what-is-sam.html) for an introduction to SAM specification, the SAM CLI, and serverless application concepts.
-
-Next, you can use AWS Serverless Application Repository to deploy ready to use Apps that go beyond hello world samples and learn how authors developed their applications: [AWS Serverless Application Repository main page](https://aws.amazon.com/serverless/serverlessrepo/)
+See [serverless-plugin README](./serverless-plugin/README.md)
diff --git a/pytest.ini b/pytest.ini
diff --git a/samconfig.toml b/samconfig.toml
diff --git a/serverless-plugin/alarms.js b/serverless-plugin/alarms.js
@@ -9,10 +9,51 @@ const DURATION_PERCENT_TIMEOUT_THRESHOLD = 0
 const DEFAULT_SLS_LAMBDA_TIMEOUT = 3
 
 module.exports = function alarms(serverless, config) {
+
   return {
     addAlarms,
   }
 
+  /**
+   * Add all required AWS Lambda alarms to the provided CloudFormation template
+   * based on the Function resources found within
+   *
+   * @param cfTemplate A CloudFormation template object
+   */
+  function addAlarms(cfTemplate) {
+    const lambdaResources = filterObject(
+      cfTemplate.Resources,
+      (resource) => resource.Type == 'AWS::Lambda::Function'
+    )
+
+    const alarmResources = []
+    for (const [funcResourceName, funcResource] of Object.entries(
+      lambdaResources
+    )) {
+      const errAlarm = createLambdaErrorsAlarm(funcResourceName, funcResource)
+      cfTemplate.Resources[errAlarm.resourceName] = errAlarm.resource
+      const throttlesAlarm = createLambdaThrottlesAlarm(
+        funcResourceName,
+        funcResource
+      )
+      cfTemplate.Resources[throttlesAlarm.resourceName] =
+        throttlesAlarm.resource
+      const durationAlarm = createLambdaDurationAlarm(
+        funcResourceName,
+        funcResource
+      )
+      cfTemplate.Resources[durationAlarm.resourceName] = durationAlarm.resource
+
+      if (config.invocationsThreshold) {
+        const invocationsAlarm = createLambdaInvocationsAlarm(
+          funcResourceName,
+          funcResource
+        )
+        cfTemplate.Resources[invocationsAlarm.resourceName] = invocationsAlarm.resource
+      }
+    }
+  }
+
   function createLambdaAlarm(
     alarmName,
     alarmDescription,
@@ -152,37 +193,4 @@ module.exports = function alarms(serverless, config) {
     }
   }
 
-  function addAlarms(cfTemplate) {
-    const lambdaResources = filterObject(
-      cfTemplate.Resources,
-      (resource) => resource.Type == 'AWS::Lambda::Function'
-    )
-
-    const alarmResources = []
-    for (const [funcResourceName, funcResource] of Object.entries(
-      lambdaResources
-    )) {
-      const errAlarm = createLambdaErrorsAlarm(funcResourceName, funcResource)
-      cfTemplate.Resources[errAlarm.resourceName] = errAlarm.resource
-      const throttlesAlarm = createLambdaThrottlesAlarm(
-        funcResourceName,
-        funcResource
-      )
-      cfTemplate.Resources[throttlesAlarm.resourceName] =
-        throttlesAlarm.resource
-      const durationAlarm = createLambdaDurationAlarm(
-        funcResourceName,
-        funcResource
-      )
-      cfTemplate.Resources[durationAlarm.resourceName] = durationAlarm.resource
-
-      if (config.invocationsThreshold) {
-        const invocationsAlarm = createLambdaInvocationsAlarm(
-          funcResourceName,
-          funcResource
-        )
-        cfTemplate.Resources[invocationsAlarm.resourceName] = invocationsAlarm.resource
-      }
-    }
-  }
 }