From 2be0fc48461a154bcffbadd32ab7ee290ef3fc2e Mon Sep 17 00:00:00 2001 From: OrbiterBot Date: Mon, 26 Feb 2024 16:04:28 +0000 Subject: [PATCH 1/5] Development version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 944880fa..0e6a3148 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.2.0 +3.3.0.dev0 From 8ae8bc925a3c38da565b74f94e426c14cddf7a6c Mon Sep 17 00:00:00 2001 From: Derek Graeber Date: Mon, 26 Feb 2024 11:37:48 -0500 Subject: [PATCH 2/5] fix changelog typo --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2107a04..d3e33c5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,7 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Ch - 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` +- added `--update-project-policy` support to `apply` - SeedFarmer will apply a changeset to the project policy when this flag is set ### Fixes From 1d77edd390de77eaba88438202fdab04fe7bccbf Mon Sep 17 00:00:00 2001 From: Derek Graeber Date: Tue, 27 Feb 2024 19:25:03 -0500 Subject: [PATCH 3/5] correcting metadata support overrides --- CHANGELOG.md | 2 +- seedfarmer/mgmt/metadata_support.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3e33c5e..7f782002 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Ch ### Changes ### Fixes - +- ordering of metadata when using helper commands was backwards in `metadata_support.py` ## v3.2.0 (2024-02-26) diff --git a/seedfarmer/mgmt/metadata_support.py b/seedfarmer/mgmt/metadata_support.py index ca1dbeb2..36cea11d 100644 --- a/seedfarmer/mgmt/metadata_support.py +++ b/seedfarmer/mgmt/metadata_support.py @@ -119,10 +119,10 @@ def add_json_output(json_string: str) -> None: mms = ModuleMetadataSupport() json_new = json.loads(json_string) file_dict = _read_metadata_file(mms=mms) - json_new = {**json_new, **file_dict} if file_dict else json_new + json_new = {**file_dict, **json_new} if file_dict else json_new _logger.debug(f"Current Dict {json.dumps(json_new, indent=4)}") env_dict = _read_metadata_env_param(mms=mms) - json_new = {**json_new, **env_dict} if env_dict else json_new + json_new = {**env_dict,**json_new} if env_dict else json_new _logger.debug(f"Current Dict {json.dumps(json_new, indent=4)}") _write_metadata_file(mms=mms, data=json_new) @@ -132,10 +132,10 @@ def add_kv_output(key: str, value: str) -> None: data = {} data[key] = value file_dict = _read_metadata_file(mms=mms) - data = {**data, **file_dict} if file_dict else data + data = {**file_dict,**data} if file_dict else data _logger.debug(f"Current Dict {json.dumps(data, indent=4)}") env_dict = _read_metadata_env_param(mms=mms) - data = {**data, **env_dict} if env_dict else data + data = {**env_dict,**data} if env_dict else data _logger.debug(f"Current Dict {json.dumps(data, indent=4)}") _write_metadata_file(mms=mms, data=data) @@ -161,7 +161,7 @@ def convert_cdkexports( existing_metadata = _read_metadata_file(mms) try: - _write_metadata_file(mms=mms, data={**json.loads(data), **existing_metadata}) + _write_metadata_file(mms=mms, data={**existing_metadata,**json.loads(data)}) except json.decoder.JSONDecodeError: _logger.info("The CDK Export is not a string that can be converted to a JSON, ignoring this additional data") _logger.info("Offending metadata -- %s", data) From ad5c21e74619118924baec6a70ec80bc2780e70c Mon Sep 17 00:00:00 2001 From: Derek Graeber Date: Tue, 27 Feb 2024 19:32:54 -0500 Subject: [PATCH 4/5] formatting --- seedfarmer/mgmt/metadata_support.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/seedfarmer/mgmt/metadata_support.py b/seedfarmer/mgmt/metadata_support.py index 36cea11d..028f710d 100644 --- a/seedfarmer/mgmt/metadata_support.py +++ b/seedfarmer/mgmt/metadata_support.py @@ -122,7 +122,7 @@ def add_json_output(json_string: str) -> None: json_new = {**file_dict, **json_new} if file_dict else json_new _logger.debug(f"Current Dict {json.dumps(json_new, indent=4)}") env_dict = _read_metadata_env_param(mms=mms) - json_new = {**env_dict,**json_new} if env_dict else json_new + json_new = {**env_dict, **json_new} if env_dict else json_new _logger.debug(f"Current Dict {json.dumps(json_new, indent=4)}") _write_metadata_file(mms=mms, data=json_new) @@ -132,10 +132,10 @@ def add_kv_output(key: str, value: str) -> None: data = {} data[key] = value file_dict = _read_metadata_file(mms=mms) - data = {**file_dict,**data} if file_dict else data + data = {**file_dict, **data} if file_dict else data _logger.debug(f"Current Dict {json.dumps(data, indent=4)}") env_dict = _read_metadata_env_param(mms=mms) - data = {**env_dict,**data} if env_dict else data + data = {**env_dict, **data} if env_dict else data _logger.debug(f"Current Dict {json.dumps(data, indent=4)}") _write_metadata_file(mms=mms, data=data) @@ -161,7 +161,7 @@ def convert_cdkexports( existing_metadata = _read_metadata_file(mms) try: - _write_metadata_file(mms=mms, data={**existing_metadata,**json.loads(data)}) + _write_metadata_file(mms=mms, data={**existing_metadata, **json.loads(data)}) except json.decoder.JSONDecodeError: _logger.info("The CDK Export is not a string that can be converted to a JSON, ignoring this additional data") _logger.info("Offending metadata -- %s", data) From 2f5893e4cbf8b8b253e7e33602d34a07ef3eeb01 Mon Sep 17 00:00:00 2001 From: Derek Graeber Date: Tue, 27 Feb 2024 19:39:44 -0500 Subject: [PATCH 5/5] prepping release --- CHANGELOG.md | 12 ++++++++++++ VERSION | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f782002..7f7d5108 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,18 @@ 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 + +### Changes + +### Fixes + + +## v3.2.1 (2024-02-27) + + ## Unreleased ### New diff --git a/VERSION b/VERSION index 0e6a3148..e4604e3a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.3.0.dev0 +3.2.1