Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/3.2.0 #511

Merged
merged 32 commits into from
Feb 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
3a05cfe
Merge pull request #490 from awslabs/stable
dgraeber Jan 24, 2024
d805363
Development version
dgraeber Jan 24, 2024
2f421a8
Merge pull request #491 from awslabs/development/3.2.0.dev0
dgraeber Jan 24, 2024
f6cbed7
Bump cryptography from 41.0.6 to 42.0.2
dependabot[bot] Feb 17, 2024
6b3ad40
adapt gitingore for running unit tests
LeonLuttenberger Feb 21, 2024
d044ac0
adding force update of seedkit
dgraeber Feb 21, 2024
ffc47fb
Merge pull request #498 from awslabs/dependabot/pip/cryptography-42.0.2
dgraeber Feb 21, 2024
ea3d55e
Bump cryptography from 42.0.2 to 42.0.4
dependabot[bot] Feb 21, 2024
791df9c
Merge pull request #502 from awslabs/dependabot/pip/cryptography-42.0.4
dgraeber Feb 22, 2024
2717d3d
adding version info to module deployments
dgraeber Feb 22, 2024
ace9537
add ability to specify list of env files
LeonLuttenberger Feb 22, 2024
86cf2c2
update changelog
LeonLuttenberger Feb 22, 2024
f67ce19
add unit tests
LeonLuttenberger Feb 22, 2024
235065c
fix formatting
LeonLuttenberger Feb 22, 2024
c974e52
Merge pull request #501 from dgraeber/feature/force-update-seedkit
dgraeber Feb 22, 2024
b828bc4
Merge branch 'main' into feature/record-lib-versions
dgraeber Feb 22, 2024
b4a8a0d
Merge branch 'main' into feat/list-of-env-params
LeonLuttenberger Feb 22, 2024
11b7e1e
add debug logging for the final resolution of env parameters
LeonLuttenberger Feb 22, 2024
a2b2c5d
fix formatting
LeonLuttenberger Feb 22, 2024
dbc0058
check for environment variable values in unit tests
LeonLuttenberger Feb 22, 2024
636ebbb
add reverse order for env file resolution
LeonLuttenberger Feb 22, 2024
d2d597f
update docs/source/manifests.md
LeonLuttenberger Feb 22, 2024
4f28d89
Merge pull request #505 from dgraeber/feature/record-lib-versions
dgraeber Feb 22, 2024
52661f6
Merge pull request #506 from LeonLuttenberger/feat/list-of-env-params
dgraeber Feb 22, 2024
04693a3
refactor: Move coverage and mypy settings into the `pyproject.toml` f…
LeonLuttenberger Feb 22, 2024
295f27d
detect large manifests and reduce size
dgraeber Feb 23, 2024
5a16893
Merge pull request #508 from dgraeber/fix/ssm-limits
dgraeber Feb 26, 2024
718ddb6
adding force updat logic of project policies
dgraeber Feb 26, 2024
514d1c7
make sure the params array is initialized prior ot referencing on des…
dgraeber Feb 26, 2024
5770680
formatting
dgraeber Feb 26, 2024
c275168
Merge pull request #510 from dgraeber/feature/force-policy-deploy
dgraeber Feb 26, 2024
811cefb
prepping release
dgraeber Feb 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ web_modules/

# dotenv environment variables file
.env
.env.test
.env.*

# parcel-bundler cache (https://parceljs.org/)
.cache
Expand Down Expand Up @@ -385,4 +385,8 @@ archive/
_build/

# Pytest Setup
/module/
/module/

# Testing
seedfarmer.yaml
tmp-metadata
19 changes: 18 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.2
3.2.0
3 changes: 0 additions & 3 deletions coverage.ini

This file was deleted.

2 changes: 2 additions & 0 deletions docs/source/manifests.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
21 changes: 18 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.black]
line-length = 120
target-version = ["py36", "py37", "py38"]
target-version = ["py37", "py38", "py39", "py310", "py311"]
exclude = '''
/(
\.eggs
Expand All @@ -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",
Expand Down Expand Up @@ -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
8 changes: 4 additions & 4 deletions requirements-dev.in
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading