fix(dryccpath): enforce replace mode for env variables

Author: duanhongyi

rootfs/api/models/build.py

@@ -120,13 +120,14 @@ def _get_or_create_config(self):
         """
         dryccfile to config
         """
-        config_values, config_values_ref, changed_fields = [], {}, set()
+        config_values, config_values_ref, changed_fields, replace_groups = [], {}, set(), set()
         for group, envs in self.dryccfile.get('config', {}).items():
             for key, value in envs.items():
+                replace_groups.add(group)
                 config_values.append({"name": key, "group": group, "value": value})
             changed_fields.update(["values", "values_refs"])
 
-        replace_values_ptypes = set()
+        replace_ptypes = set()
         for pipeline in self.dryccfile.get('pipeline', {}).values():
             if 'env' in pipeline or 'config' in pipeline:
                 for key, value in pipeline.get('env', {}).items():
@@ -136,15 +137,15 @@ def _get_or_create_config(self):
                         config_values_ref[pipeline['ptype']] = [config_ref]
                     else:
                         config_values_ref[pipeline['ptype']].append(config_ref)
-                replace_values_ptypes.add(pipeline['ptype'])
+                replace_ptypes.add(pipeline['ptype'])
                 changed_fields.update(["values", "values_refs"])
 
         old_config = self.app.release_set.filter(failed=False).latest().config
         if not changed_fields:
             return old_config
         config = Config(
             owner=self.owner, app=self.app, values=config_values, values_refs=config_values_ref)
-        config.merge_field("values", old_config, replace_values_ptypes)
-        config.merge_field("values_refs", old_config, replace_values_ptypes)
+        config.merge_field("values", old_config, replace_ptypes, replace_groups)
+        config.merge_field("values_refs", old_config, replace_ptypes)
         config.save(ignore_update_fields=changed_fields)
         return config

rootfs/api/models/config.py

@@ -139,12 +139,12 @@ def save(self, ignore_update_fields=None, *args, **kwargs):
             self._update_tags(previous_config={'tags': {}})
         return super(Config, self).save(*args, **kwargs)
 
-    def merge_field(self, field, old_config, replace_ptypes=[]):
+    def merge_field(self, field, old_config, *args, **kwargs):
         getattr(
             self,
             "_update_%s" % field,
             partial(self._update_field, field)
-        )(old_config, replace_ptypes)
+        )(old_config, *args, **kwargs)
 
     def _update_field(self, field, previous_config, replace_ptypes=[]):
         data = {
@@ -164,10 +164,10 @@ def _update_field(self, field, previous_config, replace_ptypes=[]):
                 data[key] = self._merge_data(field, data.get(key, {}), value)
         setattr(self, field, data)
 
-    def _update_values(self, previous_config, replace_ptypes=[]):
+    def _update_values(self, previous_config, replace_ptypes=[], replace_groups=[]):
         data = [
             item for item in getattr(previous_config, 'values', []).copy()
-            if item.get('ptype') not in replace_ptypes
+            if item.get('ptype') not in replace_ptypes and item.get('group') not in replace_groups
         ]
         new_data = getattr(self, 'values', []).copy()
         for new_item in new_data:

rootfs/api/tests/test_config.py

@@ -187,12 +187,12 @@ def test_config_merge_false_with_empty_values(self, mock_requests):
         # replace with empty config using merge='false'
         body = {'values': []}
         response = self.client.post(f"{url}?merge=false", body)
-        self.assertEqual(response.status_code, 201, response.data)
+        self.assertEqual(response.status_code, 409, response.data)
 
         # verify config is empty
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200, response.data)
-        self.assertEqual(len(response.data['values']), 0)
+        self.assertEqual(len(response.data['values']), 1)
 
     def test_config_merge_false_case_insensitive(self, mock_requests):
         """
@@ -970,9 +970,9 @@ def test_config_from_dryccfile(self, mock_requests):
         self.assertEqual(
             release.config.envs("web"),
             {
-                'GROUP': 'g1', 'DEBUG': 'tr', 'TEST1': 'g1', 'TEST2': 'tr', 'PENV1': 'web',
-                'PENV2': 'web', "WEBSITE": "www.drycc.cc",
-            }
+                'WEBSITE': 'www.drycc.cc', 'GROUP': 'g1', 'DEBUG': 'tr',
+                'PENV1': 'web', 'PENV2': 'web',  'TEST1': 'g1', 'TEST2': 'tr',
+            },
         )
 
         # test use old config and healthcheck
@@ -1001,5 +1001,5 @@ def test_config_from_dryccfile(self, mock_requests):
             self.assertEqual(response.status_code, 201, response.data)
         release = app.release_set.latest()
         self.assertEqual(release.failed, False)
-        self.assertEqual(release.config.envs("web"), {"WEBSITE": "www.drycc.cc"})
+        self.assertEqual(release.config.envs("web"), {'WEBSITE': 'www.drycc.cc'})
         self.assertEqual(release.config.values_refs, {})

rootfs/api/views.py

@@ -443,6 +443,11 @@ def create(self, request, **kwargs):
             return super().create(request, **kwargs)
         values = self.get_serializer().validate_values(request.data.get('values'))
         config = self.model(app=self.get_app(), owner=self.request.user, values=values)
+        old_config = config.previous()
+        if old_config and old_config.values:
+            replace_ptypes = {v['ptype'] for v in config.values if 'ptype' in v}
+            replace_groups = {v['group'] for v in config.values if 'group' in v}
+            config.merge_field("values", old_config, replace_ptypes, replace_groups)
         config.save(ignore_update_fields=["values"])
         self.post_save(config)
         return Response(status=status.HTTP_201_CREATED)