Merge branch 'feature/CH-226' of github.com:MetaCell/cloud-harness into feature/CH-216-dev-containers

Author: filippomc

application-templates/flask-server/backend/requirements.txt

@@ -1,7 +1,6 @@
-connexion[swagger-ui]==2.14.2
-Flask == 2.2.5
-swagger-ui-bundle==0.0.9
-python_dateutil >= 2.6.0
+connexion[swagger-ui,flask,gunicorn]>=3.0.0,<4.0.0
+swagger-ui-bundle>=1.1.0
+python_dateutil >= 2.9.0
 setuptools >= 21.0.0
-
+gunicorn
 

applications/accounts/Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/keycloak/keycloak:26.3.5
+FROM quay.io/keycloak/keycloak:26.4
 
 EXPOSE 9000
 EXPOSE 8080
@@ -12,7 +12,7 @@ USER keycloak
 COPY themes/custom /opt/keycloak/themes/custom
 
 # # keycloak kafka listener plugin
-COPY plugins/metacell-admin-event-listener-module-1.0.0.jar /opt/keycloak/providers/
+COPY plugins/* /opt/keycloak/providers/
 
 ENTRYPOINT [ "/opt/keycloak/bin/kc-entrypoint.sh" ]
 CMD [ "start", "--import-realm" ]

applications/accounts/deploy/values-local.yaml

@@ -0,0 +1,3 @@
+harness:
+  service:
+    port: 80

applications/common/api/openapi.yaml

@@ -10,46 +10,6 @@ servers:
         url: /api
         description: SwaggerHub API Auto Mocking
 paths:
-    '/sentry/getdsn/{appname}':
-        get:
-            tags:
-                - Sentry
-            responses:
-                '200':
-                    content:
-                        application/json:
-                            schema:
-                                type: object
-                    description: Sentry DSN for the given application
-                '400':
-                    content:
-                        application/json:
-                            schema:
-                                type: object
-                        text/html:
-                            schema:
-                                type: string
-                    description: Sentry not configured for the given application
-                '404':
-                    content:
-                        application/problem+json:
-                            schema:
-                                type: object
-                        text/html:
-                            schema:
-                                type: string
-                    description: Sentry not configured for the given application
-            operationId: getdsn
-            summary: Gets the Sentry DSN for a given application
-            description: Gets the Sentry DSN for a given application
-            x-openapi-router-controller: common.controllers.sentry_controller
-        parameters:
-            -
-                name: appname
-                schema:
-                    type: string
-                in: path
-                required: true
     /accounts/config:
         get:
             tags:

applications/common/server/.openapi-generator-ignore

@@ -27,4 +27,5 @@ Dockerfile
 */__main__.py
 */test/*
 test-requirements.txt
-.dockerignore
+.dockerignore
+*/requirements.txt

applications/common/server/Dockerfile

@@ -17,4 +17,3 @@ COPY . /usr/src/app
 ENV FLASK_ENV=production
 ENV APP_SETTINGS=common.config.ProductionConfig
 RUN pip3 install -e /usr/src/app
-ENTRYPOINT gunicorn --workers=$WORKERS --bind=0.0.0.0:$PORT $MODULE_NAME.__main__:app

applications/common/server/common/__main__.py

@@ -2,19 +2,9 @@
 
 from cloudharness.utils.server import init_flask, main
 from cloudharness import log
-from flask_cors import CORS
-from common.repository.db import open_db
-from common.controllers.sentry_controller import global_dsn
 
 
-def init_fn(app):
-    log.info("initializing database from app")
-    cors = CORS(app, resources={r"/api/*": {"origins": "*"}})
-    if not global_dsn:
-        open_db(app)
-
-
-app = init_flask(init_app_fn=init_fn)
+app = init_flask()
 
 if __name__ == '__main__':
     main()

applications/common/server/common/controllers/sentry_controller.py

@@ -1,7 +1,6 @@
 from connexion.apps.flask_app import FlaskJSONEncoder
-import six
 
-from common.models.base_model_ import Model
+from common.models.base_model import Model
 
 
 class JSONEncoder(FlaskJSONEncoder):
@@ -10,7 +9,7 @@ class JSONEncoder(FlaskJSONEncoder):
     def default(self, o):
         if isinstance(o, Model):
             dikt = {}
-            for attr, _ in six.iteritems(o.openapi_types):
+            for attr in o.openapi_types:
                 value = getattr(o, attr)
                 if value is None and not self.include_nulls:
                     continue

applications/common/server/common/encoder.py

@@ -1,7 +1,4 @@
-# coding: utf-8
-
 # flake8: noqa
-from __future__ import absolute_import
 # import models into model package
 from common.models.app_version import AppVersion
 from common.models.get_config200_response import GetConfig200Response