CH-109 base libraries update

Author: filippomc

applications/samples/api/config.json

@@ -1 +1 @@
-{}
+{"packageName": "samples"}

applications/samples/backend/requirements.txt

@@ -8,4 +8,4 @@ werkzeug == 0.16.1; python_version=="3.5" or python_version=="3.4"
 swagger-ui-bundle >= 0.0.2
 python_dateutil >= 2.6.0
 setuptools >= 21.0.0
-Flask == 1.1.2
+Flask == 2.1.1

applications/samples/backend/samples/models/base_model_.py

@@ -11,11 +11,11 @@
 class Model(object):
     # openapiTypes: The key is attribute name and the
     # value is attribute type.
-    openapi_types = {}
+    openapi_types: typing.Dict[str, type] = {}
 
     # attributeMap: The key is attribute name and the
     # value is json key in definition.
-    attribute_map = {}
+    attribute_map: typing.Dict[str, str] = {}
 
     @classmethod
     def from_dict(cls: typing.Type[T], dikt) -> T:

applications/samples/backend/samples/models/sample_resource.py

@@ -56,6 +56,7 @@ def from_dict(cls, dikt) -> 'SampleResource':
     def a(self):
         """Gets the a of this SampleResource.
 
+          # noqa: E501
 
         :return: The a of this SampleResource.
         :rtype: float
@@ -66,6 +67,7 @@ def a(self):
     def a(self, a):
         """Sets the a of this SampleResource.
 
+          # noqa: E501
 
         :param a: The a of this SampleResource.
         :type a: float
@@ -79,6 +81,7 @@ def a(self, a):
     def b(self):
         """Gets the b of this SampleResource.
 
+          # noqa: E501
 
         :return: The b of this SampleResource.
         :rtype: float
@@ -89,6 +92,7 @@ def b(self):
     def b(self, b):
         """Sets the b of this SampleResource.
 
+          # noqa: E501
 
         :param b: The b of this SampleResource.
         :type b: float
@@ -100,6 +104,7 @@ def b(self, b):
     def id(self):
         """Gets the id of this SampleResource.
 
+          # noqa: E501
 
         :return: The id of this SampleResource.
         :rtype: float
@@ -110,6 +115,7 @@ def id(self):
     def id(self, id):
         """Sets the id of this SampleResource.
 
+          # noqa: E501
 
         :param id: The id of this SampleResource.
         :type id: float

applications/samples/backend/samples/openapi/openapi.yaml

@@ -12,7 +12,8 @@ servers:
 tags:
 - name: auth
 - name: workflows
-- name: resource
+- description: ""
+  name: resource
 paths:
   /error:
     get:
@@ -90,8 +91,8 @@ paths:
               schema:
                 type: string
           description: Operation result
-      summary: Send a synchronous operation and get results using the event queue.
-        Just a sum, but in the cloud
+      summary: "Send a synchronous operation and get results using the event queue.\
+        \ Just a sum, but in the cloud"
       tags:
       - workflows
       x-openapi-router-controller: samples.controllers.workflows_controller
@@ -112,9 +113,9 @@ paths:
       - test
       x-openapi-router-controller: samples.controllers.test_controller
   /sampleresources:
-    description: The REST endpoint/path used to list and create zero or more `SampleResource`
-      entities.  This path contains a `GET` and `POST` operation to perform the list
-      and create tasks, respectively.
+    description: "The REST endpoint/path used to list and create zero or more `SampleResource`\
+      \ entities.  This path contains a `GET` and `POST` operation to perform the\
+      \ list and create tasks, respectively."
     get:
       description: Gets a list of all `SampleResource` entities.
       operationId: get_sample_resources
@@ -176,9 +177,9 @@ paths:
       tags:
       - resource
       x-openapi-router-controller: samples.controllers.resource_controller
-    description: The REST endpoint/path used to get, update, and delete single instances
-      of an `SampleResource`.  This path contains `GET`, `PUT`, and `DELETE` operations
-      used to perform the get, update, and delete tasks, respectively.
+    description: "The REST endpoint/path used to get, update, and delete single instances\
+      \ of an `SampleResource`.  This path contains `GET`, `PUT`, and `DELETE` operations\
+      \ used to perform the get, update, and delete tasks, respectively."
     get:
       description: Gets the details of a single instance of a `SampleResource`.
       operationId: get_sample_resource
@@ -229,7 +230,7 @@ paths:
         "202":
           description: Successful response.
         "400":
-          description: Parameter must be integer, payload must be of type SampleResource
+          description: "Parameter must be integer, payload must be of type SampleResource"
         "404":
           description: Resource not found
       summary: Update a SampleResource
@@ -250,7 +251,7 @@ paths:
                 type: string
           description: Check if token is valid
         "401":
-          description: invalid token, unauthorized
+          description: "invalid token, unauthorized"
       security:
       - bearerAuth: []
       summary: Check if the token is valid. Get a token by logging into the base url
@@ -270,7 +271,7 @@ paths:
                 type: string
           description: Check if token is valid
         "401":
-          description: invalid token, unauthorized
+          description: "invalid token, unauthorized"
       security:
       - cookieAuth: []
       summary: Check if the token is valid. Get a token by logging into the base url
@@ -306,18 +307,22 @@ components:
       title: inline_response_202
       type: object
     SampleResource:
+      description: ""
       example:
         a: 0.8008281904610115
         b: 6.027456183070403
         id: 1.4658129805029452
       properties:
         a:
+          description: ""
           title: a
           type: number
         b:
+          description: ""
           title: b
           type: number
         id:
+          description: ""
           title: id
           type: number
       required:

applications/samples/backend/test-requirements.txt

@@ -1,4 +1,4 @@
-pytest~=4.6.7 # needed for python 2.7+3.4
+pytest~=7.1.0
 pytest-cov>=2.8.1
-pytest-randomly==1.2.3 # needed for python 2.7+3.4
-Flask-Testing==0.8.0
+pytest-randomly>=1.2.3
+Flask-Testing==0.8.1

applications/samples/frontend/src/rest/common.ts

@@ -83,24 +83,34 @@ export const setOAuthToObject = async function (object: any, name: string, scope
     }
 }
 
+function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: any, key: string = ""): void {
+    if (typeof parameter === "object") {
+        if (Array.isArray(parameter)) {
+            (parameter as any[]).forEach(item => setFlattenedQueryParams(urlSearchParams, item, key));
+        } 
+        else {
+            Object.keys(parameter).forEach(currentKey => 
+                setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`)
+            );
+        }
+    } 
+    else {
+        if (urlSearchParams.has(key)) {
+            urlSearchParams.append(key, parameter);
+        } 
+        else {
+            urlSearchParams.set(key, parameter);
+        }
+    }
+}
+
 /**
  *
  * @export
  */
 export const setSearchParams = function (url: URL, ...objects: any[]) {
     const searchParams = new URLSearchParams(url.search);
-    for (const object of objects) {
-        for (const key in object) {
-            if (Array.isArray(object[key])) {
-                searchParams.delete(key);
-                for (const item of object[key]) {
-                    searchParams.append(key, item);
-                }
-            } else {
-                searchParams.set(key, object[key]);
-            }
-        }
-    }
+    setFlattenedQueryParams(searchParams, objects);
     url.search = searchParams.toString();
 }
 

deployment/codefresh-test.yaml

@@ -445,9 +445,7 @@ steps:
     - kubectl config use-context ${{CLUSTER_NAME}}
     - kubectl config set-context --current --namespace=test-${{NAMESPACE_BASENAME}}
     - kubectl rollout status deployment/accounts
-    - kubectl rollout status deployment/argo-server-gk
     - kubectl rollout status deployment/samples
-    - kubectl rollout status deployment/samples-gk
     - kubectl rollout status deployment/common
     - kubectl rollout status deployment/workflows
     - sleep 60

libraries/client/cloudharness_cli/requirements.txt

@@ -1,6 +1,6 @@
-certifi >= 14.5.14
-frozendict ~= 2.3.4
-python-dateutil ~= 2.7.0
-setuptools >= 21.0.0
-typing_extensions ~= 4.3.0
-urllib3 ~= 1.26.7
+certifi
+frozendict
+python-dateutil
+setuptools
+typing_extensions
+urllib3

libraries/cloudharness-common/requirements.txt

@@ -1,22 +1,39 @@
-asn1crypto==0.24.0
-certifi==2019.3.9
-chardet==3.0.4
-idna==2.8
-pyjwt==2.6.0
-pyOpenSSL<22.1.0
-PySocks==1.6.8
-requests>=2.27.0
-ruamel.yaml==0.17.21
-six==1.16.0
-urllib3>=1.26
-pykafka==2.8.0
-pyaml
-kafka-python
-kubernetes
-sentry-sdk[flask]==0.14.4
-python-keycloak==2.6.0
 argo-workflows==5.0.0
-cryptography<3.4
-hypothesis==6.54.2
-jsonschema<4.0.0
-httpx==0.23.0
+blinker==1.7.0
+cachetools==5.3.2
+certifi==2023.11.17
+cffi==1.16.0
+charset-normalizer==3.3.2
+click==8.1.7
+cryptography==41.0.7
+deprecation==2.1.0
+ecdsa==0.18.0
+idna==3.6
+importlib-metadata==7.0.1
+itsdangerous==2.1.2
+Jinja2==3.1.3
+kafka-python==2.0.2
+kubernetes==29.0.0
+MarkupSafe==2.1.3
+oauthlib==3.2.2
+oyaml==1.0
+packaging==23.2
+pyaml==23.12.0
+pyasn1==0.5.1
+pyasn1-modules==0.3.0
+pycparser==2.21
+pyhumps==3.8.0
+PyJWT==2.8.0
+python-dateutil==2.8.2
+python-jose==3.3.0
+python-keycloak==3.7.0
+PyYAML==6.0.1
+requests==2.31.0
+requests-oauthlib==1.3.1
+requests-toolbelt==1.0.0
+rsa==4.9
+sentry-sdk==1.39.2
+six==1.16.0
+urllib3==2.1.0
+Werkzeug==3.0.1
+zipp==3.17.0