release/v3.1.0

Author: CrypticCabub

.env.example

@@ -0,0 +1,12 @@
+# Copy this file and rename to ".env" to save your local configuration outside of version control.
+# You should then be able to use the npm scripts that require these values.
+
+# Valid values: Disabled or Enabled
+# the default is Enabled, but anyone using cdk deploy probably wants this disabled by default
+RETAIN_DATA_AND_LOGS=Disabled
+
+# template default is No
+ENABLE_DEBUG_LOGGING=Yes
+
+# spoke template
+HUB_ACCOUNT=123456789012

.github/PULL_REQUEST_TEMPLATE.md .github/pull_request_template.md.github/PULL_REQUEST_TEMPLATE.md renamed to .github/pull_request_template.md

@@ -0,0 +1,11 @@
+[settings]
+# this is the black profile as shown here https://pycqa.github.io/isort/docs/configuration/profiles.html
+# I coudn't get pre-commit and tox to behave the same with only passing --profile. Now they both use this config
+multi_line_output=3
+include_trailing_comma=True
+force_grid_wrap=0
+use_parentheses=True
+ensure_newline_before_comments=True
+line_length=88
+split_on_trailing_comma=True
+lines_between_sections=1

.gitignore

@@ -0,0 +1,110 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+exclude: |
+  (?x)^(
+    ^.*\.svg$
+    # projen-generated files
+    # `git ls-files | git check-attr linguist-generated --stdin | grep "linguist-generated: set"`
+    | .*tsconfig\.json$
+    | .*jest\.config\.json$
+    | .*\.gitattributes$
+    | .*\.gitignore$
+    | ^LICENSE$
+    | .*cdk\.json$
+    | .*package-lock\.json$
+    | .*package\.json$
+    | ^solution-manifest\.yaml$
+    | .*pyproject.toml$
+    | .*__snapshots__.*$
+    | .*\.projen/.*$
+  )$
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.6.0
+    hooks:
+      - id: check-executables-have-shebangs
+        name: Check executables have shebangs
+      - id: fix-byte-order-marker
+        name: Fix byte order marker
+      - id: check-case-conflict
+        name: Check case conflict
+      - id: check-json
+        name: Check json
+      - id: check-yaml
+        name: Check yaml
+        args: [--allow-multiple-documents, --unsafe]
+      - id: check-toml
+        name: Check toml
+      - id: check-merge-conflict
+        name: Check for merge conflicts
+      - id: check-added-large-files
+        name: Check for added large files
+        exclude: |
+          (?x)^(
+            ^.*/package-lock.json |
+          )$
+      - id: end-of-file-fixer
+        name: Fix end of the files
+      - id: trailing-whitespace
+        name: Trim trailing whitespace
+      - id: mixed-line-ending
+        name: Mixed line ending
+      - id: detect-private-key
+        name: Detect private keys
+      - id: detect-aws-credentials
+        name: Detect AWS Credentials
+  - repo: https://github.com/Lucas-C/pre-commit-hooks
+    rev: v1.5.5
+    hooks:
+      - id: insert-license
+        name: Insert license header (typescript and javascript)
+        files: \.tsx$|\.ts$|\.js$|\.jsx$
+        args:
+          - --license-filepath
+          - ./license_header.txt
+          - --comment-style
+          - // # defaults to Python's # syntax, requires changing for typescript syntax.
+          - --detect-license-in-X-top-lines=3
+      - id: insert-license
+        name: Insert license header (python)
+        files: \.py$
+        args:
+          - --license-filepath
+          - ./license_header.txt
+          - --comment-style
+          - "#"
+          - --detect-license-in-X-top-lines=3
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 24.3.0
+    hooks:
+      - id: black
+  - repo: https://github.com/pycqa/isort
+    rev: 5.12.0
+    hooks:
+      - id: isort
+        args: ["--profile", "black"]
+        # tox and pre-commit behave differently when the profile flag is passed,
+        # so .isort.cfg in the root folder overrides the profile
+        # keeping the profile flag as a reminder to try to make it work with profile only
+  - repo: https://github.com/pycqa/flake8
+    rev: 6.1.0
+    hooks:
+      - id: flake8
+        args: ["--extend-ignore=E501,E203"] # line length and whitespace, handled by black
+  - repo: https://github.com/koalaman/shellcheck-precommit
+    rev: v0.10.0
+    hooks:
+      - id: shellcheck
+        name: ShellChecker
+        args: ["-x", "--severity=warning"]
+        types: [shell]
+        exclude: ^.nightswatch/.*$
+  # Local
+  - repo: local
+    hooks:
+      - id: detect-empty-files
+        name: Detect Empty Files
+        entry: scripts/detect-empty-files.sh
+        language: system
+        exclude: ^.*__init__\.py$ # __init__.py empty on purpose

.isort.cfg

@@ -16,7 +16,7 @@ import {
 import { PythonProject } from "projen/lib/python";
 
 function main() {
-  new InstanceScheduler({ version: "3.0.12", cdkVersion: "2.206.0" }).synth();
+  new InstanceScheduler({ version: "3.1.0", cdkVersion: "2.232.2" }).synth();
 }
 
 interface InstanceSchedulerProps {
@@ -70,7 +70,6 @@ class InstanceScheduler extends AwsCdkTypeScriptApp {
   ];
 
   private static readonly devDeps: string[] = [
-    "@cdklabs/cdk-ssm-documents",
     "@types/uuid",
     "@typescript-eslint/eslint-plugin",
     "eslint",
@@ -102,6 +101,7 @@ class InstanceScheduler extends AwsCdkTypeScriptApp {
     "internal/scripts/cfn-guard",
     "build",
     "git-info",
+    ".env",
     this.testReportDir,
     this.coverageReportDir,
   ];
@@ -174,6 +174,12 @@ class InstanceScheduler extends AwsCdkTypeScriptApp {
 
     this.addScripts({
       "update-deps": "chmod +x ./update-all-dependencies.sh && exec ./update-all-dependencies.sh",
+      "deploy:hub":
+        "source .env && npx cdk deploy instance-scheduler-on-aws --require-approval=never --parameters RetainDataAndLogs=$RETAIN_DATA_AND_LOGS --parameters Trace=$ENABLE_DEBUG_LOGGING",
+      "destroy:hub": "source .env && npx cdk destroy instance-scheduler-on-aws -f",
+      "deploy:spoke":
+        "source .env && npx cdk deploy instance-scheduler-on-aws-remote --require-approval=never --parameters InstanceSchedulerAccount=$HUB_ACCOUNT",
+      "destroy:spoke": "source .env && npx cdk destroy instance-scheduler-on-aws-remote -f",
     });
 
     new YamlFile(this, "solution-manifest.yaml", {
@@ -199,7 +205,7 @@ class InstanceScheduler extends AwsCdkTypeScriptApp {
       "pytest@^7.4.3",
       "pytest-cov@^4.1.0",
       "tox@^4.11.4",
-      "urllib3@2.6.0"
+      "urllib3@^2"
     ];
 
     const commonPythonProjectOptions: CommonPythonProjectOptions = {
@@ -334,7 +340,7 @@ class InstanceScheduler extends AwsCdkTypeScriptApp {
       },
     });
 
-    this.addTask("e2e-tests", { exec: `jest --config ${e2eConfigFile}`, receiveArgs: true });
+    this.addTask("e2e-tests", { exec: `node --experimental-vm-modules node_modules/.bin/jest --config ${e2eConfigFile}`, receiveArgs: true });
   }
 
   private addTypescriptFiles(...files: string[]): void {
@@ -379,7 +385,7 @@ class InstanceSchedulerLambdaFunction extends PythonProject {
       outdir: "./source/app",
       poetry: true,
       description: "Instance Scheduler on AWS",
-      deps: ["python@^3.11"],
+      deps: ["python@^3.12"],
       pytest: false,
       ...options,
     });
@@ -391,24 +397,27 @@ class InstanceSchedulerLambdaFunction extends PythonProject {
       "ec2",
       "ecs",
       "lambda",
+      "events",
       "logs",
       "rds",
       "resourcegroupstaggingapi",
       "sns",
       "ssm",
       "sts",
+      "sqs",
+      "events",
     ];
 
-    const motoExtras = ["autoscaling", "dynamodb", "ec2", "logs", "rds", "resourcegroupstaggingapi", "ssm"];
+    const motoExtras = ["autoscaling", "dynamodb", "ec2", "logs", "rds", "resourcegroupstaggingapi", "ssm", "events"];
 
-    const boto3Version = "^1.34.1";
+    const boto3Version = "^1.40.4";
     const jmespathVersion = "1.0.1";
     const pythonDateutilVersion = "2.8.2";
     [
       `boto3@${boto3Version}`,
       `boto3-stubs-lite@{version = "${boto3Version}", extras = ${JSON.stringify(boto3StubsExtras)}}`,
       `botocore@${boto3Version}`,
-      "botocore-stubs@^1.31.66",
+      `botocore-stubs@${boto3Version}`,
       "freezegun@^1.3.1",
       `jmespath@${jmespathVersion}`,
       "pytest-mock@^3.12.0",
@@ -419,12 +428,11 @@ class InstanceSchedulerLambdaFunction extends PythonProject {
       "types-freezegun@^1.1.10",
       `types-jmespath@${jmespathVersion}`,
       `types-python-dateutil@${pythonDateutilVersion}`,
-      "types-requests@2.31.0.6", // held back, need to support urllib3@^1
+      "types-requests@^2",
       "tzdata@^2023.3",
-      `urllib3@^2.6.0`,
     ].forEach((spec: string) => this.addDevDependency(spec));
 
-    ["aws-lambda-powertools@^3.4.1", "packaging@^24.0"].forEach((spec: string) => this.addDependency(spec));
+    ["aws-lambda-powertools@^3.4.1", "packaging@^24.0", "pydantic", "urllib3@^2",].forEach((spec: string) => this.addDependency(spec));
 
     const pyproject = this.tryFindObjectFile("pyproject.toml");
     if (!pyproject) {
@@ -437,7 +445,7 @@ class InstanceSchedulerLambdaFunction extends PythonProject {
       throw new Error("Could not override install task");
     }
     installTask.reset();
-    installTask.exec("poetry lock --no-update && poetry install");
+    installTask.exec("poetry lock && poetry install");
   }
 }
 
@@ -482,7 +490,7 @@ class InstanceSchedulerCli extends PythonProject {
       throw new Error("Could not override install task");
     }
     installTask.reset();
-    installTask.exec("poetry lock --no-update && poetry install");
+    installTask.exec("poetry lock && poetry install");
   }
 }