Merge branch 'main' into person/hzhristova/improve-errors-messages-vi…

…sibility
vmware · Apr 27, 2023 · 9927c11 · 9927c11
2 parents f4d0205 + a4d6b7f
commit 9927c11
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 8 deletions.
diff --git a/.../control-service/projects/helm_charts/pipelines-control-service/templates/deployment.yaml b/.../control-service/projects/helm_charts/pipelines-control-service/templates/deployment.yaml
@@ -281,7 +281,7 @@ spec:
             {{- end }}
             {{- if .Values.deploymentSupportedPythonVersions }}
             - name: DATAJOBS_DEPLOYMENT_SUPPORTED_PYTHON_VERSIONS
-              value: {{ toJson .Values.deploymentSupportedPythonVersions }}
+              value: {{ .Values.deploymentSupportedPythonVersions | toJson | quote }}
             {{- end }}
 
 

diff --git a/projects/control-service/projects/model/apidefs/build.gradle b/projects/control-service/projects/model/apidefs/build.gradle
@@ -47,10 +47,33 @@ subprojects {
     }
 
     task buildPython(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask) {
-        generatorName = "python"
+        generatorName = "python-nextgen"
         inputSpec = "$projectDir/api.yaml"
         outputDir = "$projectDir/build/python"
         configFile = "$projectDir/config-python.json"
+        doLast {
+
+            fileTree("$projectDir/build/python/taurus_datajob_api/api") {
+            }.each { File propFile ->
+                if(propFile.getName().endsWith("data_jobs_sources_api.py")) {
+                    // Everything in this section can be removed when the ticket(https://github.com/OpenAPITools/openapi-generator/issues/15327) is closed
+                    String content = propFile.getText()
+                    content = content
+                            .replace(
+                                    'def sources_upload(self, team_name : Annotated[StrictStr, Field(..., description="Team Name")], job_name : Annotated[StrictStr, Field(..., description="Data Job Name.")], body : StrictStr, reason : Annotated[Optional[StrictStr], Field(description="The reason for executing the request")] = None, **kwargs) -> DataJobVersion:  # noqa: E501',
+                                    'def sources_upload(self, team_name : Annotated[StrictStr, Field(..., description="Team Name")], job_name : Annotated[StrictStr, Field(..., description="Data Job Name.")], body : bytes, reason : Annotated[Optional[StrictStr], Field(description="The reason for executing the request")] = None, **kwargs) -> DataJobVersion:  # noqa: E501').
+                            replace('def sources_upload_with_http_info(self, team_name : Annotated[StrictStr, Field(..., description="Team Name")], job_name : Annotated[StrictStr, Field(..., description="Data Job Name.")], body : StrictStr, reason : Annotated[Optional[StrictStr], Field(description="The reason for executing the request")] = None, **kwargs):  # noqa: E501',
+                                    'def sources_upload_with_http_info(self, team_name : Annotated[StrictStr, Field(..., description="Team Name")], job_name : Annotated[StrictStr, Field(..., description="Data Job Name.")], body : bytes, reason : Annotated[Optional[StrictStr], Field(description="The reason for executing the request")] = None, **kwargs):  # noqa: E501')
+                    propFile.setText(content)
+                }else if(propFile.getName().endsWith("data_jobs_properties_api.py")) {
+                    // Everything in this section can be removed when the ticket(https://github.com/OpenAPITools/openapi-generator/issues/15328) is closed
+                    String content = propFile.getText()
+                    content = content.
+                            replace("if _params['request_body']:", "if _params['request_body'] is not None:")
+                    propFile.setText(content)
+                }
+            }
+        }
     }
     cleanUpUnwantedGeneratedFiles.dependsOn 'openApiGenerate'
     compileJava.dependsOn 'openApiGenerate' //generate Java from openapi specs

diff --git a/projects/control-service/projects/model/apidefs/datajob-api/config-python.json b/projects/control-service/projects/model/apidefs/datajob-api/config-python.json
@@ -1,6 +1,5 @@
 {
   "packageName": "taurus_datajob_api",
   "projectName": "vdk-control-service-api",
-  "verbose": true,
-  "packageVersion": "1.0.8"
+  "packageVersion": "1.0.9"
 }
diff --git a/projects/vdk-control-cli/requirements.txt b/projects/vdk-control-cli/requirements.txt
@@ -27,4 +27,4 @@ tabulate
 urllib3>=1.26.5
 vdk-control-api-auth
 
-vdk-control-service-api==1.0.6
+vdk-control-service-api==1.0.9
diff --git a/projects/vdk-control-cli/setup.cfg b/projects/vdk-control-cli/setup.cfg
@@ -51,7 +51,7 @@ install_requires =
     requests>=2.25
     setuptools>=47.0
     pluggy
-    vdk-control-service-api==1.0.6
+    vdk-control-service-api==1.0.9
     tabulate
     requests_oauthlib>=1.0
     urllib3>=1.26.5

diff --git a/projects/vdk-control-cli/tests/vdk/internal/control/command_groups/job/test_deploy.py b/projects/vdk-control-cli/tests/vdk/internal/control/command_groups/job/test_deploy.py
@@ -108,7 +108,7 @@ def test_deploy_reason(httpserver: PluginHTTPServer, tmpdir: LocalPath):
         uri="/data-jobs/for-team/test-team/jobs/test-job/sources",
         method="POST",
         headers={"Content-Type": "application/octet-stream"},
-        query_string="reason=Example+reason",
+        query_string="reason=Example%20reason",
     ).respond_with_json(job_version.to_dict())
 
     test_job_path = find_test_resource("test-job")

diff --git a/projects/vdk-control-cli/tests/vdk/internal/control/command_groups/job/test_execute.py b/projects/vdk-control-cli/tests/vdk/internal/control/command_groups/job/test_execute.py
@@ -163,6 +163,12 @@ def test_execute_with_exception(httpserver: PluginHTTPServer, tmpdir: LocalPath)
     assert "what" in result.output and "why" in result.output
 
 
+def _create_json_serializable_version(execution):
+    execution = execution.to_dict()
+    execution["start_time"] = execution["start_time"].isoformat()
+    return execution
+
+
 def test_execute_no_execution_id(httpserver: PluginHTTPServer, tmpdir: LocalPath):
     rest_api_url = httpserver.url_for("")
     team_name = "test-team"
@@ -187,7 +193,11 @@ def test_execute_no_execution_id(httpserver: PluginHTTPServer, tmpdir: LocalPath
         uri=f"/data-jobs/for-team/{team_name}/jobs/{job_name}/executions",
         method="GET",
     ).respond_with_json(
-        [older_execution.to_dict(), execution.to_dict(), older_execution.to_dict()]
+        [
+            _create_json_serializable_version(older_execution),
+            _create_json_serializable_version(execution),
+            _create_json_serializable_version(older_execution),
+        ]
     )
 
     httpserver.expect_request(