Release/3.2.1

CHANGELOG.md

@@ -12,6 +12,18 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Ch
 ### Fixes
 
 
+## v3.2.1 (2024-02-27)
+
+
+## Unreleased
+
+### New
+
+### Changes
+
+### Fixes
+- ordering of metadata when using helper commands was backwards in `metadata_support.py`
+
 ## v3.2.0 (2024-02-26)
 
 ### New
@@ -23,7 +35,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

VERSION

@@ -1 +1 @@
-3.2.0
+3.2.1

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)