diff --git a/renku/ui/service/cache/projects.py b/renku/ui/service/cache/projects.py index e95d2bce88..2cb06085bf 100644 --- a/renku/ui/service/cache/projects.py +++ b/renku/ui/service/cache/projects.py @@ -16,7 +16,7 @@ """Renku service project cache management.""" from typing import cast -from marshmallow import EXCLUDE +from marshmallow import RAISE from renku.ui.service.cache.base import BaseCache from renku.ui.service.cache.models.project import Project @@ -34,7 +34,7 @@ def make_project(self, user, project_data, persist=True) -> Project: """Store user project metadata.""" project_data.update({"user_id": user.user_id}) - project_obj: Project = cast(Project, self.project_schema.load(project_data, unknown=EXCLUDE)) + project_obj: Project = cast(Project, self.project_schema.load(project_data, unknown=RAISE)) if persist: project_obj.save() diff --git a/renku/ui/service/cache/serializers/project.py b/renku/ui/service/cache/serializers/project.py index d9e484ebc6..e186e66d7a 100644 --- a/renku/ui/service/cache/serializers/project.py +++ b/renku/ui/service/cache/serializers/project.py @@ -31,7 +31,7 @@ class ProjectSchema(CreationSchema, AccessSchema, MandatoryUserSchema): project_id = fields.String(load_default=lambda: uuid.uuid4().hex) - clone_depth = fields.Integer() + clone_depth = fields.Integer(allow_none=True) git_url = fields.String() name = fields.String(required=True) diff --git a/renku/ui/service/config.py b/renku/ui/service/config.py index d66d8a4236..e7085d44e0 100644 --- a/renku/ui/service/config.py +++ b/renku/ui/service/config.py @@ -36,7 +36,7 @@ OPENAPI_VERSION = "3.0.3" API_VERSION = "v1" -PROJECT_CLONE_NO_DEPTH = -1 +PROJECT_CLONE_NO_DEPTH = None PROJECT_CLONE_DEPTH_DEFAULT = int(os.getenv("PROJECT_CLONE_DEPTH_DEFAULT", 1)) TEMPLATE_CLONE_DEPTH_DEFAULT = int(os.getenv("TEMPLATE_CLONE_DEPTH_DEFAULT", 0)) diff --git a/renku/ui/service/controllers/templates_create_project.py b/renku/ui/service/controllers/templates_create_project.py index 0b988f47d1..74048896f8 100644 --- a/renku/ui/service/controllers/templates_create_project.py +++ b/renku/ui/service/controllers/templates_create_project.py @@ -98,12 +98,8 @@ def setup_new_project(self): "name": self.ctx["project_name"], "slug": self.ctx["project_name_stripped"], "description": self.ctx["project_description"], - "fullname": self.ctx["fullname"], - "email": self.ctx["email"], "owner": self.ctx["project_namespace"], - "token": self.ctx["token"], "initialized": True, - "image": self.ctx["image"], } project = self.cache.make_project(self.user, new_project_data) diff --git a/renku/ui/service/gateways/repository_cache.py b/renku/ui/service/gateways/repository_cache.py index 158d1d9f98..a163f81a39 100644 --- a/renku/ui/service/gateways/repository_cache.py +++ b/renku/ui/service/gateways/repository_cache.py @@ -142,7 +142,7 @@ def _clone_project( "owner": parsed_git_url.owner, "name": parsed_git_url.name, "slug": normalize_to_ascii(parsed_git_url.name), - "depth": PROJECT_CLONE_DEPTH_DEFAULT if shallow else None, + "clone_depth": PROJECT_CLONE_DEPTH_DEFAULT if shallow else None, "branch": branch, "git_url": git_url, "user_id": user.user_id, diff --git a/tests/service/cache/test_cache.py b/tests/service/cache/test_cache.py index 34bb84b455..6c75c6e083 100644 --- a/tests/service/cache/test_cache.py +++ b/tests/service/cache/test_cache.py @@ -253,11 +253,8 @@ def test_service_cache_make_project(svc_client_cache): project_data = { "name": "renku-project-template", "slug": "renku-project-template.git", - "depth": 1, + "clone_depth": 1, "git_url": "https://github.com/SwissDataScienceCenter/renku-project-template.git", - "email": "contact@renkulab.io", - "fullname": "renku the frog", - "token": "None", "owner": "SwissDataScienceCenter", } project = cache.make_project(user, project_data) diff --git a/tests/service/fixtures/service_projects.py b/tests/service/fixtures/service_projects.py index 95811242ef..8109e52bed 100644 --- a/tests/service/fixtures/service_projects.py +++ b/tests/service/fixtures/service_projects.py @@ -36,10 +36,7 @@ def project_metadata(project) -> Generator[Tuple["RenkuProject", Dict[str, Any]] "project_id": uuid.uuid4().hex, "name": name, "slug": normalize_to_ascii(name), - "fullname": "full project name", - "email": "my@email.com", "owner": "me", - "token": "awesome token", "git_url": "https://example.com/a/b.git", "initialized": True, "branch": "", diff --git a/tests/service/jobs/test_jobs.py b/tests/service/jobs/test_jobs.py index b3618e1fac..f19c46ff52 100644 --- a/tests/service/jobs/test_jobs.py +++ b/tests/service/jobs/test_jobs.py @@ -108,10 +108,7 @@ def test_job_constructor_lock(svc_client_with_user, service_job): "project_id": uuid.uuid4().hex, "name": "my-project", "slug": "my-project", - "fullname": "full project name", - "email": "my@email.com", "owner": "me", - "token": "awesome token", "git_url": "git@gitlab.com", "initialized": True, } diff --git a/tests/service/views/test_dataset_views.py b/tests/service/views/test_dataset_views.py index 943da0c73e..5dbfc5a71c 100644 --- a/tests/service/views/test_dataset_views.py +++ b/tests/service/views/test_dataset_views.py @@ -1012,10 +1012,7 @@ def test_cached_import_dataset_job(doi, svc_client_cache, project): "project_id": uuid.uuid4().hex, "name": name, "slug": normalize_to_ascii(name), - "fullname": "full project name", - "email": "my@email.com", "owner": "me", - "token": "awesome token", "git_url": "https://example.com/a/b.git", "initialized": True, }