Helm chart and Application versions bump

Update to the latest ZOO-Project-DRU version

Add parameter to pass the ZOO_REDIS_HOST value to the websocketd deployment

Add /jobs/{jobId}/results/{outputId} endpoint to retrieve a unique job output

Also update the tmpUrl configuration parameter in security_service.py

Author: gfenoy

zoo-project-dru/Chart.yaml

@@ -23,13 +23,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.8.3
+version: 0.8.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.2.35"
+appVersion: "0.2.36"
 
 keywords:
   - workflows
@@ -76,22 +76,13 @@ annotations:
       description: "Update to the latest ZOO-Project-DRU version"
       links:
         - name: GitHub Commit
-          url: https://github.com/ZOO-Project/ZOO-Project/commit/0b815fb32ee04eb6bd98164a040cc2733a2b5230
+          url: https://github.com/ZOO-Project/ZOO-Project/commit/e1a799659515b81812c676f3b245532cdfa7bf24
     - kind: fixed
-      description: "Fix issue #24: service selector mismatch in webui service causes 503 errors"
-      links:
-        - name: GitHub Issue
-          url: https://github.com/ZOO-Project/charts/issues/24
-    - kind: added
-      description: "Add eoapi proxy when the eoapi.enabled is set to true"
-    - kind: added
-      description: "Add the values.schema.json file to validate user values"
-    - kind: added
-      description: "Add options onlyImplicitFlow to the IAM configuration to restrict OpenAPI authentication method"
+      description: "Add parameter to pass the ZOO_REDIS_HOST value to the websocketd deployment"
     - kind: added
-      description: "Add globalNamespace option in oas.cfg configuration file"
+      description: "Add /jobs/{jobId}/results/{outputId} endpoint to retrieve a unique job output"
     - kind: changed
-      description: "Update DRU Helm chart documentation"
+      description: "Also update the tmpUrl configuration parameter in security_service.py"
 
   artifacthub.io/license: Apache-2.0
 

zoo-project-dru/README.md

@@ -24,7 +24,7 @@ To install the chart with the release name `my-zoo-project-dru`:
 
 ````bash
 helm repo add zoo-project https://zoo-project.github.io/charts/
-helm install my-zoo-project-dru zoo-project/zoo-project-dru --version 0.8.3
+helm install my-zoo-project-dru zoo-project/zoo-project-dru --version 0.8.4
 ````
 
 ## Parameters

zoo-project-dru/files/zoo-project/oas.cfg

@@ -24,12 +24,12 @@ rootHost={{ $hosturl }}
 rootPath=ogc-api
 links=/,/api,/conformance,/processes,/jobs
 {{- if .Values.documentation.enabled }}
-paths={{ print "/root,/conformance," $customPaths "/api,/processes,/processes/water-bodies,/processes/{processID},/processes/{processID}/package,/processes/water-bodies/execution,/processes/{processID}/execution,/jobs,/jobs/{jobID},/jobs/{jobID}/results" $eoapiPaths }}
+paths={{ print "/root,/conformance," $customPaths "/api,/processes,/processes/water-bodies,/processes/{processID},/processes/{processID}/package,/processes/water-bodies/execution,/processes/{processID}/execution,/jobs,/jobs/{jobID},/jobs/{jobID}/results,/jobs/{jobID}/results/{outputID}" $eoapiPaths }}
 {{ else }}
-paths={{ print "/root,/conformance," $customPaths "/api,/processes,/processes/{processID},/processes/{processID}/package,/processes/{processID}/execution,/jobs,/jobs/{jobID},/jobs/{jobID}/results" $eoapiPaths }}
+paths={{ print "/root,/conformance," $customPaths "/api,/processes,/processes/{processID},/processes/{processID}/package,/processes/{processID}/execution,/jobs,/jobs/{jobID},/jobs/{jobID}/results,/jobs/{jobID}/results/{outputID}" $eoapiPaths }}
 {{- end }}
-parameters={{ print "processID,jobID,resultID" $eoapiParams }}
-header_parameters={{ print "oas-header1,oas-header2,oas-header3,oas-header4,oas-header5,limitParam,skipParam,processIdParam,statusParam,minDurationParam,maxDurationParam,typeParam,datetimeParam,wParam" $eoapiHeaderParams }}
+parameters={{ print "outputID,processID,jobID,resultID" $eoapiParams }}
+header_parameters={{ print "oas-header1,oas-header2,oas-header3,oas-header4,oas-header5,limitParam,skipParam,outputIdParam,processIdParam,statusParam,minDurationParam,maxDurationParam,typeParam,datetimeParam,wParam" $eoapiHeaderParams }}
 version=3.0.3
 license_name=OGC license
 license_url=https://raw.githubusercontent.com/opengeospatial/ogcapi-processes/master/LICENSE
@@ -725,6 +725,58 @@ schema_1=https://schemas.opengis.net/ogcapi/processes/part1/1.0/openapi/response
 parameters_1=/components/parameters/jobID
 {{ end }}
 
+[/jobs/{jobID}/results/{outputID}]
+rel=http://www.opengis.net/def/rel/ogc/1.0/results
+type=application/json
+title=Get Result
+
+[jobs/{jobID}/results/{outputID}]
+{{ if .Values.zoo.promoteHead }}
+length=2
+{{ end }}
+method=get
+operationId=get_jobs__jobID__results__outputID_
+{{- if .Values.iam.enabled }}
+secured={{ .Values.iam.name }}
+ecode=401,403,404,500
+{{- else }}
+ecode=404,500
+{{- end }}
+title=The result of a job execution.
+abstract=The result of a job execution.
+{{- if .Values.documentation.enabled }}
+abstract_file=/var/www/job-results.md
+{{- end }}
+tags=Execute process - monitor job - access the result
+aschema=https://schemas.opengis.net/ogcapi/processes/part1/1.0/openapi/responses/Results.yaml
+parameters=/components/parameters/jobID,/components/parameters/outputID
+ep=,/components/parameters/oas-header2
+{{ if .Values.zoo.promoteHead }}
+method_1=head
+{{- if .Values.iam.enabled }}
+secured_1={{ .Values.iam.name }}
+ecode_1=401,403,404,500
+{{- else }}
+ecode_1=404,500
+{{- end }}
+title_1=The result of a job execution.
+abstract_1=The result of a job execution.
+{{- if .Values.documentation.enabled }}
+abstract_file=/var/www/job-results.md
+{{- end }}
+tags_1=Execute process - monitor job - access the result
+aschema_1=https://schemas.opengis.net/ogcapi/processes/part1/1.0/openapi/responses/Results.yaml
+parameters_1=/components/parameters/jobID,/components/parameters/outputID
+{{ end }}
+
+[{outputID}]
+type=string
+title=The id of an output
+abstract=The id of an output
+in=path
+required=true
+example=stac
+
 [{processID}]
 type=string
 title=The id of a process
@@ -750,6 +802,9 @@ required=true
 [statusParam]
 schema=https://schemas.opengis.net/ogcapi/processes/part1/1.0/openapi/parameters/status.yaml
 
+[outputIdParam]
+schema=https://github.com/opengeospatial/ogcapi-processes/blob/master/openapi/parameters/processes-core/outputID.yaml
+
 [processIdParam]
 schema=https://schemas.opengis.net/ogcapi/processes/part1/1.0/openapi/parameters/processIdQueryParam.yaml
 

zoo-project-dru/files/zoo-project/security_service.py

@@ -67,6 +67,7 @@ def securityIn(conf, inputs, outputs):
             # conf["lenv"]["cwd"]=rPath
             conf["zooServicesNamespace"] = {"namespace": conf["renv"][i], "cwd": rPath}
             conf["main"]["tmpPath"] = rPath + "/temp"
+            conf["main"]["tmpUrl"]=conf["main"]["tmpUrl"].replace("/temp", "/"+conf["renv"][i]+"/temp")
         if i.count("QUERY_STRING") and conf["renv"][i].count("/package"):
             if conf["renv"]["HTTP_ACCEPT"] == "application/cwl+json":
                 zoo.info("Conversion to cwl+json should happen in securityOut")
@@ -117,6 +118,7 @@ def securityIn(conf, inputs, outputs):
         conf["lenv"]["fpm_cwd"] = rPath
         conf["auth_env"] = {"user": "anonymous","cwd": rPath}
         conf["main"]["tmpPath"]=rPath+"/temp"
+        conf["main"]["tmpUrl"]=conf["main"]["tmpUrl"].replace("/temp", "/"+conf["lenv"]["fpm_user"]+"/temp")
         conf["zooServicesNamespace"] = {"namespace": "anonymous","cwd": rPath}
 
     if not (os.path.isdir(rPath)):

zoo-project-dru/templates/dp-websocketd.yaml

@@ -50,6 +50,8 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.websocketd.image.repository }}:{{ .Values.websocketd.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.websocketd.pullPolicy }}
+          command: ["/websocketd/websocketd"]
+          args: ["--port=8888", "--passenv=ZOO_REDIS_HOST", "/shell.py"]
           env:
             - name: ZOO_REDIS_HOST
               value: {{ include "zoo-project-dru.redis.servicename" . }}

zoo-project-dru/values.yaml

@@ -170,7 +170,7 @@ zoofpm:
   image:
     repository: zooproject/zoo-project
     pullPolicy: IfNotPresent
-    tag: dru-0b815fb32ee04eb6bd98164a040cc2733a2b5230
+    tag: dru-e1a799659515b81812c676f3b245532cdfa7bf24
   autoscaling:
     enabled: false
   replicaCount: 1
@@ -182,7 +182,7 @@ zookernel:
   image:
     repository: zooproject/zoo-project
     pullPolicy: IfNotPresent
-    tag: dru-0b815fb32ee04eb6bd98164a040cc2733a2b5230
+    tag: dru-e1a799659515b81812c676f3b245532cdfa7bf24
   extraMountPoints: []
 
 notifications: