fix(jans-pycloudlib): avoid overwritten data by using merge strategy …

…for AWS wrappers (#3832)
JanssenProject · Feb 10, 2023 · cf0d4e3 · cf0d4e3
1 parent 1593997
commit cf0d4e3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/jans-pycloudlib/jans/pycloudlib/config/aws_config.py b/jans-pycloudlib/jans/pycloudlib/config/aws_config.py
@@ -178,12 +178,17 @@ def set_all(self, data: dict[str, _t.Any]) -> bool:
         """
         self._prepare_secret()
 
+        # fetch existing data (if any) as we will merge them;
+        # note that existing value will be overwritten
+        payload = self.get_all()
+
+        for k, v in data.items():
+            # ensure value that has bytes is converted to text
+            payload[k] = safe_value(v)
+
         resp = self.client.update_secret(
             SecretId=self.basepath,
-            SecretString=_dump_value(
-                # ensure key-value that has bytes is converted to text
-                {k: safe_value(v) for k, v in data.items()}
-            ),
+            SecretString=_dump_value(payload),
         )
         return bool(resp)
 

diff --git a/jans-pycloudlib/jans/pycloudlib/secret/aws_secret.py b/jans-pycloudlib/jans/pycloudlib/secret/aws_secret.py
@@ -179,12 +179,17 @@ def set_all(self, data: dict[str, _t.Any]) -> bool:
         """
         self._prepare_secret()
 
+        # fetch existing data (if any) as we will merge them;
+        # note that existing value will be overwritten
+        payload = self.get_all()
+
+        for k, v in data.items():
+            # ensure value that has bytes is converted to text
+            payload[k] = safe_value(v)
+
         resp = self.client.update_secret(
             SecretId=self.basepath,
-            SecretBinary=_dump_value(
-                # ensure key-value that has bytes is converted to text
-                {k: safe_value(v) for k, v in data.items()}
-            ),
+            SecretBinary=_dump_value(payload),
         )
         return bool(resp)