Merge pull request #511 from awslabs/release/3.2.0

Release/3.2.0

.github/workflows/main.yml

@@ -15,15 +15,16 @@ jobs:
   seedfarmer-cli:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        python-version: [3.9,3.10.13]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
     defaults:
       run:
         working-directory: .
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install Requirements
@@ -33,7 +34,7 @@ jobs:
           pip install -r requirements-dev.txt
           pip install -e .
       - name: Mypy Check
-        run: mypy --ignore-missing-imports ./seedfarmer
+        run: mypy ./seedfarmer
       - name: Flake8 Check
         run: flake8 ./seedfarmer
       - name: Black Check

.gitignore

@@ -115,7 +115,7 @@ web_modules/
 
 # dotenv environment variables file
 .env
-.env.test
+.env.*
 
 # parcel-bundler cache (https://parceljs.org/)
 .cache
@@ -385,4 +385,8 @@ archive/
 _build/
 
 # Pytest Setup
-/module/
+/module/
+
+# Testing
+seedfarmer.yaml
+tmp-metadata

CHANGELOG.md

@@ -3,7 +3,6 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Changelog](http://keepachangelog.com/).
 
-
 ## Unreleased
 
 ### New
@@ -13,6 +12,24 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Ch
 ### Fixes
 
 
+## v3.2.0 (2024-02-26)
+
+### New
+- support list of env files using `--env-file`
+
+### Changes
+- adding `AwsCodeSeederDeployed` and `SeedFarmerDeployed` to all module metadata output for reference (versions used to deploy successfully)
+- adding `AWS_CODESEEDER_VERSION` and `SEEDFARMER_VERSION` to all module environment parameters for reference (versions currently in use)
+- added `--update-seedkit` support to `apply` 
+  - SeedFarmer will no longer try to update the seedkit on every request
+  - Users can override this with the `--update-seedkit` flag in case AWS CodeSeeder has updated the SeedKit
+- added `--update-project_policy` support to `apply` 
+  - SeedFarmer will apply a changeset to the project policy when this flag is set
+
+### Fixes
+- adding in workaround for manifests whose char length is greater than SSM limit of 8192 k
+
+
 ## v3.1.2 (2024-01-24)
 
 ### New

VERSION

@@ -1 +1 @@
-3.1.2
+3.2.0

docs/source/manifests.md

@@ -364,6 +364,8 @@ In this example, the `glue-db-suffix` parameter will be exposed to the CodeBuild
 ### Environment Variables
 `SeedFarmer` supports using [Dotenv](https://github.com/theskumar/python-dotenv) for dynamic replacement.  When a file named `.env` is placed at the projecr root (where `seedfarmer.yaml` resides), any value in a manifest with a key of `envVariable` will be matched and replaced with the corresponding environment variable.  You can pass in overriding `.env` files by using the `--env-file` on CLI command invocation.
 
+`SeedFarmer` also supports passing multiple `.env`, by using `--env-file` multiple times. For example: `seedfarmer apply --env-file .env.shared --env-file .env.secret`. If the same value is present in multiple `.env` files, subsequent files will override the value from the previous one. In the aforementioned example, values from `.env.secret` will override values from `.env.shared`.
+
 ```yaml
 name: opensearch
 path: modules/core/opensearch/

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.black]
 line-length = 120
-target-version = ["py36", "py37", "py38"]
+target-version = ["py37", "py38", "py39", "py310", "py311"]
 exclude = '''
 /(
     \.eggs
@@ -27,9 +27,16 @@ use_parentheses = true
 ensure_newline_before_comments = true
 line_length = 120
 src_paths = ["seedfarmer"]
-py_version = 36
+py_version = 37
 skip_gitignore = false
 
+[tool.mypy]
+python_version = "3.7"
+strict = true
+ignore_missing_imports = true
+disallow_untyped_decorators = false
+exclude = "codeseeder.out/|examples/|modules/|test/|seedfarmer.gitmodules/"
+
 [tool.pytest.ini_options]
 markers = [
     "first: marks the first test to run",
@@ -77,7 +84,15 @@ markers = [
     "commands_bootstrap: marks all `commands_bootstrap` tests",
 ]
 log_cli_level = "INFO"
-addopts = "-v --cov=. --cov-report=term --cov-report=html --cov-config=coverage.ini --cov-fail-under=80"
+addopts = "-v --cov=. --cov-report=term --cov-report=html"
 pythonpath = [
   "."
 ]
+
+[tool.pytest.coverage.run]
+omit = [
+  "test/*"
+]
+
+[tool.coverage.report]
+fail_under = 80.0

requirements-dev.in

@@ -1,12 +1,12 @@
-awscli~=1.29.0
-black~=22.3.0
+awscli~=1.31.13
+black~=23.3.0
 certifi~=2023.7.22
 check-manifest~=0.48
-flake8~=4.0.1
+flake8~=5.0.4
 isort~=5.10.1
 mypy~=0.961
 myst-parser~=0.18.0
-pip-tools~=7.1.0
+pip-tools~=6.14.0
 pydot~=1.4.2
 pyroma~=4.0
 pytest~=7.2.0