chore(dryccfile): override all config when using dryccfile

Author: duanhongyi

rootfs/api/models/build.py

@@ -120,32 +120,23 @@ def _get_or_create_config(self):
         """
         dryccfile to config
         """
-        config_values, config_values_ref, changed_fields, replace_groups = [], {}, set(), set()
+        if not self.dryccfile:
+            return self.app.release_set.filter(failed=False).latest().config
+        # create config from dryccfile
+        values, values_ref = [], {}
         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_ptypes = set()
+                values.append({"name": key, "group": group, "value": value})
         for pipeline in self.dryccfile.get('pipeline', {}).values():
             if 'env' in pipeline or 'config' in pipeline:
                 for key, value in pipeline.get('env', {}).items():
-                    config_values.append({"name": key, "ptype": pipeline['ptype'], "value": value})
+                    values.append({"name": key, "ptype": pipeline['ptype'], "value": value})
                 for config_ref in pipeline.get('config', []):
-                    if pipeline['ptype'] not in config_values_ref:
-                        config_values_ref[pipeline['ptype']] = [config_ref]
+                    if pipeline['ptype'] not in values_ref:
+                        values_ref[pipeline['ptype']] = [config_ref]
                     else:
-                        config_values_ref[pipeline['ptype']].append(config_ref)
-                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
+                        values_ref[pipeline['ptype']].append(config_ref)
         config = Config(
-            owner=self.owner, app=self.app, values=config_values, values_refs=config_values_ref)
-        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)
+            owner=self.owner, app=self.app, values=values, values_refs=values_ref)
+        config.save(ignore_update_fields=["values", "values_refs"])
         return config

rootfs/api/tests/test_config.py

@@ -1001,8 +1001,8 @@ def test_config_from_dryccfile(self, mock_requests):
         self.assertEqual(
             release.config.envs("web"),
             {
-                'WEBSITE': 'www.drycc.cc', 'GROUP': 'g1', 'DEBUG': 'tr',
-                'PENV1': 'web', 'PENV2': 'web',  'TEST1': 'g1', 'TEST2': 'tr',
+                'GROUP': 'g1', 'DEBUG': 'tr', 'TEST1': 'g1',
+                'TEST2': 'tr', 'PENV1': 'web', 'PENV2': 'web'
             },
         )
 
@@ -1018,8 +1018,8 @@ 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.values, release.previous().config.values)
-        self.assertEqual(release.config.values_refs, release.previous().config.values_refs)
+        self.assertEqual(release.config.values, [])
+        self.assertEqual(release.config.values_refs, {})
         # set empty
         new_build_body = copy.deepcopy(build_body)
         new_build_body['dryccfile']['config'] = {}
@@ -1032,5 +1032,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"), {})
         self.assertEqual(release.config.values_refs, {})