Merge branch 'develop' into dvcorreia-patch-1

Author: filippomc

deployment/codefresh-test.yaml

@@ -13,25 +13,13 @@ steps:
     repo: '${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}'
     revision: '${{CF_BRANCH}}'
     git: github
-  post_main_clone:
-    title: Post main clone
-    type: parallel
-    stage: prepare
-    steps:
-    - title: Cloning cloud-harness repository...
-      type: git-clone
-      stage: prepare
-      repo: https://github.com/MetaCell/cloud-harness.git
-      revision: '${{CLOUDHARNESS_BRANCH}}'
-      working_directory: .
-      git: github
   prepare_deployment:
     title: Prepare helm chart
     image: python:3.9.10
     stage: prepare
     working_directory: .
     commands:
-    - bash cloud-harness/install.sh
+    - bash install.sh
     - harness-deployment . -n test-${{NAMESPACE_BASENAME}} -d ${{DOMAIN}} -r ${{REGISTRY}}
       -rs ${{REGISTRY_SECRET}} -e test --write-env -N -i samples
     - cat deployment/.env >> ${{CF_VOLUME_PATH}}/env_vars_to_export

docs/accounts.md

@@ -15,6 +15,7 @@ in the application's values.yaml.
 
 To assign paths and roles, set `uri_role_mapping` as you would do in the [gatekeeper configuration file resources](https://github.com/gogatekeeper/gatekeeper/blob/master/docs/content/configuration/_index.md).
 
+
 Example:
 
 ```yaml
@@ -27,7 +28,8 @@ harness:
     - administrator
 ```
 
-See the [Gogatekeeper official documentation](https://github.com/gogatekeeper/gatekeeper/blob/master/docs/content/userguide/_index.md) for more.
+
+See the [Gogatekeeper official documentation](https://gogatekeeper.github.io/gatekeeper/userguide) for more.
 
 
 ## Backend development

docs/dev.md

@@ -93,7 +93,6 @@ This file is part of the CloudHarness runtime.
 Other constants are located there as shown in the following code extract.
 
 ```python
-NODE_BUILD_IMAGE = 'node:8.16.1-alpine'
 APPLICATION_TEMPLATE_PATH = 'application-templates'
 # ...
 APPS_PATH = 'applications'

infrastructure/base-images/cloudharness-frontend-build/Dockerfile

@@ -1,3 +1,3 @@
-FROM node:15.5
+FROM node:20
 
 

install.sh

@@ -4,7 +4,8 @@ CURRENT_PATH=$(pwd)
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 cd $SCRIPT_DIR
-
+pip install --upgrade pip
+cat requirements.txt
 pip install -r requirements.txt
 
 cd $CURRENT_PATH

libraries/cloudharness-utils/cloudharness_utils/constants.py

@@ -1,9 +1,5 @@
 import os
 
-NODE_BUILD_IMAGE = 'node:8.16.1-alpine'
-
-
-
 APPLICATION_TEMPLATE_PATH = 'application-templates'
 DEFAULT_MERGE_PATH = ".overrides"
 

requirements.txt

@@ -1,4 +1,5 @@
 -e libraries/models
 -e libraries/cloudharness-utils
 -e tools/deployment-cli-tools
-
+colorama<0.5.0,>=0.4.3
+typer<0.12.0

test/test-e2e/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:lts-slim
+FROM node:20
 
 # Install latest chrome dev package and fonts to support major charsets (Chinese, Japanese, Arabic, Hebrew, Thai and a few others)
 # Note: this installs the necessary libs to make the bundled version of Chromium that Puppeteer

tools/deployment-cli-tools/ch_cli_tools/codefresh.py

@@ -261,10 +261,11 @@ def add_unit_test_step(app_config: ApplicationHarnessConfig):
                         image=image_tag_with_variables(app_name, tag, base_image_name),
                     )
 
-            codefresh_steps_from_base_path(join(root_path, BASE_IMAGES_PATH), CD_BUILD_STEP_BASE,
-                                           fixed_context=relpath(root_path, os.getcwd()), include=helm_values[KEY_TASK_IMAGES].keys())
-            codefresh_steps_from_base_path(join(root_path, STATIC_IMAGES_PATH), CD_BUILD_STEP_STATIC,
-                                            include=helm_values[KEY_TASK_IMAGES].keys())
+            if helm_values[KEY_TASK_IMAGES]:
+                codefresh_steps_from_base_path(join(root_path, BASE_IMAGES_PATH), CD_BUILD_STEP_BASE,
+                                               fixed_context=relpath(root_path, os.getcwd()), include=helm_values[KEY_TASK_IMAGES].keys())
+                codefresh_steps_from_base_path(join(root_path, STATIC_IMAGES_PATH), CD_BUILD_STEP_STATIC,
+                                                include=helm_values[KEY_TASK_IMAGES].keys())
 
             codefresh_steps_from_base_path(join(
                 root_path, APPS_PATH), CD_BUILD_STEP_PARALLEL)