Merge branch 'v1.10.0-patch' into api-v1.11.0

api/chalicelib/utils/helper.py

@@ -318,4 +318,6 @@ def get_domain():
 def obfuscate(text, keep_last: int = 4):
     if text is None or not isinstance(text, str):
         return text
+    if len(text) <= keep_last:
+        return "*" * len(text)
     return "*" * (len(text) - keep_last) + text[-keep_last:]

ee/api/chalicelib/core/unlock.py

@@ -4,6 +4,7 @@ from os import environ
 import requests
 from decouple import config
 
+from chalicelib.utils import helper
 from chalicelib.utils.TimeUTC import TimeUTC
 
 
@@ -22,7 +23,7 @@ def check():
         environ["expiration"] = "-1"
         environ["numberOfSeats"] = "0"
         return
-    print(f"validating: {license}")
+    print(f"validating: {helper.obfuscate(license)}")
     r = requests.post('https://api.openreplay.com/os/license', json={"mid": __get_mid(), "license": get_license()})
     if r.status_code != 200 or "errors" in r.json() or not r.json()["data"].get("valid"):
         print("license validation failed")

ee/api/routers/crons/core_dynamic_crons.py

@@ -26,7 +26,7 @@ def unlock_cron() -> None:
 
 
 cron_jobs = [
-    {"func": unlock_cron, "trigger": "cron", "hour": "*"},
+    {"func": unlock_cron, "trigger": CronTrigger(day="*")},
 ]
 
 SINGLE_CRONS = [{"func": telemetry_cron, "trigger": CronTrigger(day_of_week="*"),

scripts/helmcharts/build_deploy.sh

@@ -10,6 +10,7 @@ docker rmi alpine || true
 
 # Signing image
 # cosign sign --key awskms:///alias/openreplay-container-sign image_url:tag
+export COSIGN_YES=true # Skip confirmation
 export SIGN_IMAGE=1
 export PUSH_IMAGE=1
 export AWS_DEFAULT_REGION="eu-central-1"

scripts/helmcharts/openreplay/charts/chalice/values.yaml

@@ -121,11 +121,11 @@ affinity: {}
 healthCheck:
   livenessProbe:
     httpGet:
-      path: /
+      path: /signup
       port: 8000
-    initialDelaySeconds: 100
-    periodSeconds: 15
-    timeoutSeconds: 10
+    initialDelaySeconds: 120
+    periodSeconds: 30
+    timeoutSeconds: 15
 
 
 pvc: