chore(config): add merge params for create api

Author: duanhongyi

rootfs/api/tests/test_config.py

@@ -141,6 +141,78 @@ def test_config(self, mock_requests):
         self.assertEqual(response.status_code, 405, response.data)
         return config5
 
+    def test_config_merge_false(self, mock_requests):
+        """
+        Test that config can be created with merge='false' parameter
+        which replaces the entire config instead of merging
+        """
+        app_id = self.create_app()
+
+        # set initial config values
+        url = f"/v2/apps/{app_id}/config"
+        value1 = {"name": "DEBUG", "value": "true", "group": "global"}
+        value2 = {"name": "DATABASE_URL", "value": "postgres://localhost/db", "group": "global"}
+        body = {'values': [value1, value2]}
+        response = self.client.post(url, body)
+        self.assertEqual(response.status_code, 201, response.data)
+        self.assertEqual(len(response.data['values']), 2)
+
+        # replace entire config with merge='false'
+        value3 = {"name": "NEW_CONFIG", "value": "replacement_value", "group": "global"}
+        body = {'values': [value3]}
+        response = self.client.post(f"{url}?merge=false", body)
+        self.assertEqual(response.status_code, 201, response.data)
+
+        # verify only the new config exists
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200, response.data)
+        self.assertEqual(len(response.data['values']), 1)
+        self.assertEqual(response.data['values'][0]['name'], "NEW_CONFIG")
+        self.assertEqual(response.data['values'][0]['value'], "replacement_value")
+
+    def test_config_merge_false_with_empty_values(self, mock_requests):
+        """
+        Test that config can be created with merge='false' and empty values
+        """
+        app_id = self.create_app()
+
+        # set initial config values
+        url = f"/v2/apps/{app_id}/config"
+        value1 = {"name": "DEBUG", "value": "true", "group": "global"}
+        body = {'values': [value1]}
+        response = self.client.post(url, body)
+        self.assertEqual(response.status_code, 201, response.data)
+        self.assertEqual(len(response.data['values']), 1)
+
+        # 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)
+
+        # verify config is empty
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200, response.data)
+        self.assertEqual(len(response.data['values']), 0)
+
+    def test_config_merge_false_case_insensitive(self, mock_requests):
+        """
+        Test that merge parameter is case insensitive
+        """
+        app_id = self.create_app()
+
+        url = f"/v2/apps/{app_id}/config"
+        value1 = {"name": "DEBUG", "value": "true", "group": "global"}
+        body = {'values': [value1]}
+
+        # test with uppercase FALSE
+        response = self.client.post(f"{url}?merge=FALSE", body)
+        self.assertEqual(response.status_code, 201, response.data)
+
+        # verify config was replaced
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200, response.data)
+        self.assertEqual(len(response.data['values']), 1)
+
     def test_registry_set(self, mock_requests):
         app_id = self.create_app()
         # set an initial config value

rootfs/api/views.py

@@ -260,7 +260,7 @@ def get_queryset(self):
 
     def destroy(self, *args, **kwargs):
         key = self.get_object().key
-        response = super(TokenViewSet, self).destroy(self, *args, **kwargs)
+        response = super().destroy(self, *args, **kwargs)
         cache.delete(key)
         return response
 
@@ -294,7 +294,7 @@ def get_object(self, **kwargs):
 
     def create(self, request, **kwargs):
         request.data['app'] = self.get_app()
-        return super(AppFilterViewSet, self).create(request, **kwargs)
+        return super().create(request, **kwargs)
 
 
 class ReleasableViewSet(AppFilterViewSet):
@@ -327,7 +327,7 @@ def list(self, request, *args, **kwargs):
         which are owned by the user as well as any apps they have been given permission to
         interact with.
         """
-        queryset = super(AppViewSet, self).get_queryset(**kwargs) | \
+        queryset = super().get_queryset(**kwargs) | \
             get_objects_for_user(
                 self.request.user, f'api.{models.app.VIEW_APP_PERMISSION.codename}')
         instance = self.filter_queryset(queryset)
@@ -394,7 +394,7 @@ def post_save(self, build):
             if is_loopback(image):
                 raise DryccException("image must not use the loopback address")
         build.create_release(self.request.user)
-        super(BuildViewSet, self).post_save(build)
+        super().post_save(build)
 
 
 class LimitSpecViewSet(BaseDryccViewSet):
@@ -438,6 +438,15 @@ class ConfigViewSet(ReleasableViewSet):
     model = models.config.Config
     serializer_class = serializers.ConfigSerializer
 
+    def create(self, request, **kwargs):
+        if self.request.query_params.get('merge', 'true').lower() == 'true':
+            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)
+        config.save(ignore_update_fields=["values"])
+        self.post_save(config)
+        return Response(status=status.HTTP_201_CREATED)
+
     def delete(self, request, **kwargs):
         values_refs = self.get_serializer().validate_values_refs(request.data.get('values_refs'))
         if not values_refs or not values_refs.values():
@@ -691,7 +700,7 @@ def get_object(self, **kwargs):
 
     def get_queryset(self, **kwargs):
         ptypes = self.request.query_params.get('ptypes', '').strip()
-        queryset = super(ReleaseViewSet, self).get_queryset(**kwargs)
+        queryset = super().get_queryset(**kwargs)
         if ptypes:
             queryset = queryset.filter(Q(
                 deployed_ptypes__contains=[
@@ -829,7 +838,7 @@ def create(self, request, *args, **kwargs):
             return Response(message, status=status.HTTP_403_FORBIDDEN)
         request.data['app'] = app
         request.data['owner'] = self.user
-        super(BuildHookViewSet, self).create(request, *args, **kwargs)
+        super().create(request, *args, **kwargs)
         # return the application databag
         response = {
             'release': {
@@ -1067,7 +1076,7 @@ def get_object(self):
     def retrieve(self, request, *args, **kwargs):
         resource = self.get_object()
         resource.retrieve(request)
-        response =  super(AppSingleResourceViewSet, self).retrieve(request, *args, **kwargs)  # noqa
+        response =  super().retrieve(request, *args, **kwargs)  # noqa
         response.data["message"] = resource.message
         return response