Dynamic services to use storage

.travis.yml

@@ -49,8 +49,9 @@ matrix:
         # wait for postgresql to shutdown
         - while sudo lsof -Pi :5432 -sTCP:LISTEN -t; do sleep 1; done
 
-      install:
+      install:        
         - pip install --upgrade pip wheel setuptools && pip3 --version
+        - pip3 install pytest-travis-fold
         - pip3 install packages/s3wrapper[test]
         - pip3 install packages/simcore-sdk[test]
         - pushd services/director; pip3 install -r requirements/ci.txt; popd

Makefile

@@ -42,8 +42,6 @@ PY_FILES = $(strip $(shell find services packages -iname '*.py' -not -path "*egg
 
 TEMPCOMPOSE := $(shell mktemp)
 
-export PYTHONPATH=${CURDIR}/packages/s3wrapper/src:${CURDIR}/packages/simcore-sdk/src
-
 all:
 	@echo 'run `make build-devel` to build your dev environment'
 	@echo 'run `make up-devel` to start your dev environment.'

api/specs/director/v0/openapi.yaml

@@ -49,13 +49,13 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '../../shared/schemas/health_check.yaml#/HealthCheckEnveloped'
+                $ref: '../../shared/schemas/health_check.yaml#/components/schemas/HealthCheckEnveloped'
         default:
           description: Unexpected error
           content:
             application/json:
               schema:
-                $ref: '../../shared/schemas/error.yaml#/ErrorEnveloped'
+                $ref: '../../shared/schemas/error.yaml#/components/schemas/ErrorEnveloped'
 
   /services:
     get:
@@ -72,19 +72,19 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '../../shared/schemas/services.yaml#/ServicesEnveloped'
+                $ref: '../../shared/schemas/services.yaml#/components/schemas/ServicesEnveloped'                
         "401":
           description: Unauthorized access
           content:
             application/json:
               schema:
-                $ref: '../../shared/schemas/error.yaml#/ErrorEnveloped'
+                $ref: '../../shared/schemas/error.yaml#/components/schemas/ErrorEnveloped'
         default:
           description: Unexpected error
           content:
             application/json:
               schema:
-                $ref: '../../shared/schemas/error.yaml#/ErrorEnveloped'
+                $ref: '../../shared/schemas/error.yaml#/components/schemas/ErrorEnveloped'
 
   /services/{service_key}/{service_version}:
     get:
@@ -102,25 +102,25 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '../../shared/schemas/services.yaml#/ServicesEnveloped'
+                $ref: '../../shared/schemas/services.yaml#/components/schemas/ServicesEnveloped'                
         "401":
           description: Unauthorized access
           content:
             application/json:
               schema:
-                $ref: '../../shared/schemas/error.yaml#/ErrorEnveloped'
+                $ref: '../../shared/schemas/error.yaml#/components/schemas/ErrorEnveloped'
         "404":
           description: Service not found
           content:
             application/json:
               schema:
-                $ref: '../../shared/schemas/error.yaml#/ErrorEnveloped'
+                $ref: '../../shared/schemas/error.yaml#/components/schemas/ErrorEnveloped'
         default:
           description: Unexpected error
           content:
             application/json:
               schema:
-                $ref: '../../shared/schemas/error.yaml#/ErrorEnveloped'
+                $ref: '../../shared/schemas/error.yaml#/components/schemas/ErrorEnveloped'
 
   /running_interactive_services:
     post:
@@ -129,7 +129,8 @@ paths:
       summary: Starts an interactive service in the oSparc platform and returns its entrypoint
       description: Starts an interactive service in the oSparc platform and returns its entrypoint
       operationId: running_interactive_services_post
-      parameters:
+      parameters:         
+        - $ref: '#/components/parameters/UserId'
         - $ref: '#/components/parameters/ServiceKey'
         - $ref: '#/components/parameters/ServiceVersion'
         - $ref: '#/components/parameters/AssignmentUuid'
@@ -139,37 +140,37 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '../../shared/schemas/running_service.yaml#/RunningServiceEnveloped'
+                $ref: '../../shared/schemas/running_service.yaml#/components/schemas/RunningServiceEnveloped'
         "400":
           description: Malformed function call, missing field
           content:
             application/json:
               schema:
-                $ref: '../../shared/schemas/error.yaml#/ErrorEnveloped'
+                $ref: '../../shared/schemas/error.yaml#/components/schemas/ErrorEnveloped'
         "401":
           description: Unauthorized access
           content:
             application/json:
               schema:
-                $ref: '../../shared/schemas/error.yaml#/ErrorEnveloped'
+                $ref: '../../shared/schemas/error.yaml#/components/schemas/ErrorEnveloped'
         "404":
           description: Service not found
           content:
             application/json:
               schema:
-                $ref: '../../shared/schemas/error.yaml#/ErrorEnveloped'
+                $ref: '../../shared/schemas/error.yaml#/components/schemas/ErrorEnveloped'
         "409":
           description: A service with the same uuid already exists
           content:
             application/json:
               schema:
-                $ref: '../../shared/schemas/error.yaml#/ErrorEnveloped'
+                $ref: '../../shared/schemas/error.yaml#/components/schemas/ErrorEnveloped'
         default:
           description: Unexpected error
           content:
             application/json:
               schema:
-                $ref: '../../shared/schemas/error.yaml#/ErrorEnveloped'
+                $ref: '../../shared/schemas/error.yaml#/components/schemas/ErrorEnveloped'
 
   /running_interactive_services/{service_uuid}:
     get:
@@ -186,25 +187,25 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '../../shared/schemas/response204.yaml#/Response204Enveloped'
+                $ref: '../../shared/schemas/response204.yaml#/components/schemas/Response204Enveloped'
         "400":
           description: Malformed function call, missing field
           content:
             application/json:
               schema:
-                $ref: '../../shared/schemas/error.yaml#/ErrorEnveloped'
+                $ref: '../../shared/schemas/error.yaml#/components/schemas/ErrorEnveloped'
         "404":
           description: Service not found
           content:
             application/json:
               schema:
-                $ref: '../../shared/schemas/error.yaml#/ErrorEnveloped'
+                $ref: '../../shared/schemas/error.yaml#/components/schemas/ErrorEnveloped'
         default:
           description: Unexpected error
           content:
             application/json:
               schema:
-                $ref: '../../shared/schemas/error.yaml#/ErrorEnveloped'
+                $ref: '../../shared/schemas/error.yaml#/components/schemas/ErrorEnveloped'
     delete:
       tags:
         - users
@@ -219,28 +220,37 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '../../shared/schemas/response204.yaml#/Response204Enveloped'
+                $ref: '../../shared/schemas/response204.yaml#/components/schemas/Response204Enveloped'
         "400":
           description: Malformed function call, missing field
           content:
             application/json:
               schema:
-                $ref: '../../shared/schemas/error.yaml#/ErrorEnveloped'
+                $ref: '../../shared/schemas/error.yaml#/components/schemas/ErrorEnveloped'
         "404":
           description: Service not found
           content:
             application/json:
               schema:
-                $ref: '../../shared/schemas/error.yaml#/ErrorEnveloped'
+                $ref: '../../shared/schemas/error.yaml#/components/schemas/ErrorEnveloped'
         default:
           description: Unexpected error
           content:
             application/json:
               schema:
-                $ref: '../../shared/schemas/error.yaml#/ErrorEnveloped'
+                $ref: '../../shared/schemas/error.yaml#/components/schemas/ErrorEnveloped'
 
 components:
   parameters:
+    UserId:
+      in: query
+      name: user_id
+      description: The ID of the user that starts the service
+      required: true
+      schema:
+        type: string
+        example: asdfgj233
+
     AssignmentUuid:
       in: query
       name: service_uuid

api/specs/shared/schemas/error.yaml

@@ -1,34 +1,35 @@
-ErrorEnveloped:
-  type: object
-  required:
-    - error
-  properties:
-    data:
+components:
+  schemas:
+    ErrorEnveloped:
       type: object
-      nullable: true
-      default: null
-    error:
-      $ref: '#/ErrorType'
-
-ErrorType:
-  type: object
-  required:
-    - status
-    - message
-  properties:
-    message:
-      description: Error message
-      type: string
-      example: Unexpected error
-    errors:
-      type: array
-      items:
-        properties:
-          code:
-            type: string
-            description: Server Exception
-            example: ServiceUUIDNotFoundError
-    status:
-      description: Error code
-      type: integer
-      example: 404
+      required:
+        - error
+      properties:
+        data:      
+          nullable: true
+          default: null
+        error:
+          $ref: '#/components/schemas/ErrorType'
+
+    ErrorType:
+      type: object
+      required:
+        - status
+        - message
+      properties:
+        message:
+          description: Error message
+          type: string
+          example: Unexpected error
+        errors:
+          type: array
+          items:
+            properties:
+              code:
+                type: string
+                description: Server Exception
+                example: ServiceUUIDNotFoundError
+        status:
+          description: Error code
+          type: integer
+          example: 404

api/specs/shared/schemas/health_check.yaml

@@ -1,28 +1,28 @@
-HealthCheckEnveloped:
-  type: object
-  required:
-    - data
-    - error
-  properties:
-    data:
-      $ref: '#/HealthCheckType'
-    error:
+components:
+  schemas:
+    HealthCheckEnveloped:
       type: object
-      nullable: true
-      default: null
-
-HealthCheckType:
-  type: object
-  properties:
-    name:
-      type: string
-      example: director service
-    status:
-      type: string
-      example: SERVICE_RUNNING
-    api_version:
-      type: string
-      example: 1.0.0-dev
-    version:
-      type: string
-      example: 1dfcfdc
+      required:
+        - data
+      properties:
+        data:
+          $ref: '#/components/schemas/HealthCheckType'
+        error:
+          nullable: true
+          default: null
+
+    HealthCheckType:
+      type: object
+      properties:
+        name:
+          type: string
+          example: director service
+        status:
+          type: string
+          example: SERVICE_RUNNING
+        api_version:
+          type: string
+          example: 1.0.0-dev
+        version:
+          type: string
+          example: 1dfcfdc

api/specs/shared/schemas/response204.yaml

@@ -1,14 +1,11 @@
-Response204Enveloped:
-  type: object
-  required:
-    - data
-    - error
-  properties:
-    data:
+components:
+  schemas:
+    Response204Enveloped:
       type: object
-      nullable: true
-      default: null
-    error:
-      type: object
-      nullable: true
-      default: null
+      properties:
+        data:
+          nullable: true
+          default: null
+        error:
+          nullable: true
+          default: null