@colisweb/rescript-toolkit 5.10.0 → 5.10.1

package/.secure_files/{ci-functions-v17.8.0 → ci-functions-v18.0.0}

@@ -250,11 +250,11 @@ entries:
   cronjob:
 EOT
 
-  # helm3 stable repo have changed and must be updated manually, in versions < v2.17.0
-  helm3 repo add colisweb s3://colisweb-helm-charts/colisweb  --force-update
-  helm3 repo add stable https://charts.helm.sh/stable --force-update
-  helm3 repo update
-  helm3 dependency update ${ROOT_PATH}/${CHART_PATH}
+  # helm stable repo have changed and must be updated manually, in versions < v2.17.0
+  helm repo add colisweb s3://colisweb-helm-charts/colisweb  --force-update
+  helm repo add stable https://charts.helm.sh/stable --force-update
+  helm repo update
+  helm dependency update ${ROOT_PATH}/${CHART_PATH}
 
   # Gather values/*.yaml files
   VALUES_PATH="${ROOT_PATH}/${CHART_NAME}/values"
@@ -262,7 +262,7 @@ EOT
   [ -d $VALUES_PATH ] && VALUES_FILES=$(find $VALUES_PATH -type f -maxdepth 1 -name "*.yaml" | sed 's/^/ -f /' | tr -d \\n | sed 's/%//')
 
   # Deploy
-  helm3 upgrade --install \
+  helm upgrade --install \
     --namespace ${ENVIRONMENT} \
     ${VALUES_FILES} \
     -f ${ROOT_PATH}/${CONFIG_PATH}/common.yaml \
@@ -272,7 +272,7 @@ EOT
     ${CHART_NAME} ${ROOT_PATH}/${CHART_PATH}
 
 
-  verify_deployments_v3 -t 10m $ENVIRONMENT $CHART_NAME
+  verify_deployments -t 10m $ENVIRONMENT $CHART_NAME
 
 }
 
@@ -596,7 +596,7 @@ mysql_on_k8() {
   local query=$7
 
   kubectl -n ${namespace} run ${service}-mysql-init \
-    --image widdpim/mysql-client \
+    --image arey/mysql-client \
     --restart=Never \
     --attach --rm \
     -- \
@@ -612,8 +612,6 @@ kube_init_database_once() {
   echo " Initializing Database '$db_database' for namespace $namespace"
   echo "======================="
 
-  set -x
-
   echo "Checking if Database '$db_database' exists"
   set +e
   psql_on_k8 $namespace once "$db_init_username:$db_init_password@$db_host:$db_port" -lqtA | cut -d\| -f1 | grep "^$db_database$"
@@ -676,14 +674,14 @@ kube_init_datadog_in_database() {
   extract_args 8 namespace db_host db_port db_init_username db_init_password db_datadog_username db_datadog_password db_datadog_schema $*
 
   echo "======================="
-  echo " Initializing Datadog Agent Requiement for namespace $namespace"
+  echo " Initializing Datadog Agent Requirement for namespace $namespace"
   echo "======================="
 
   echo "Checking if User  '$db_datadog_username' exists"
   local service="datadog"
   found_db_users=$(mysql_on_k8 $namespace $service $db_host $db_port $db_init_username $db_init_password 'SELECT user FROM mysql.user;')
   set +e
-  echo $found_db_users | grep "^$db_datadog_username$"
+  echo "$found_db_users" | grep "^$db_datadog_username$"
   return_code=$?
   set -e
 
@@ -843,8 +841,6 @@ kube_init_service_database() {
 
   local db_connection="$db_init_username:$db_init_password@$db_host:$db_port"
 
-  set -x
-
   echo "Checking if Database '$db_database' exists"
   set +e
   psql_on_k8 $namespace $service $db_connection -lqtA | cut -d\| -f1 | grep "^$db_database$"
@@ -873,6 +869,57 @@ kube_init_service_database() {
 
 #!/usr/bin/env bash
 
+# Allow to use JMX connection to retrieve data and metrics from the pods within kubernetes
+# You will need visualVM to use this tool https://visualvm.github.io/
+# ex: bind_jmx testing notification
+bind_jmx() {
+
+  local ENV=$1
+  local SERVICE_NAME=$2
+  local PORT=2242
+
+  start_ssh_bastion $ENV $PORT
+
+  echo "root" | ssh -f -N -oUserKnownHostsFile=/dev/null -oStrictHostKeyChecking=no -D 7777 root@127.0.0.1 -p 2242
+  local PODS=$(kubectl -n $ENV get pods -o wide | grep $SERVICE_NAME | grep -Eo '^[^ ]+')
+
+  echo "Choose one of the following pod to get metrics from..."
+  local POD_NAME=$(gum choose $PODS)
+  local POD_IP=$(
+    kubectl -n $ENV get pods -o jsonpath='{range .items[*]}{.metadata.name}{" "}{.status.podIP}{"\n"}{end}' |
+    grep $POD_NAME |
+    cut -d' ' -f2 |
+    head -1
+  )
+
+  jconsole -J-DsocksProxyHost=localhost \
+    -J-DsocksProxyPort=7777 \
+    service:jmx:rmi:///jndi/rmi://$POD_IP:7199/jmxrmi \
+    -J-DsocksNonProxyHosts= &
+
+  cat << EOF
+  Now start VisualVM
+  Preferences > Network > Manual Proxy Settings
+  SOCKS Proxy Line: Set 'localhost' and Port '7777'
+  File > Add JMX Connection
+  Set $POD_IP:7199, check 'do not require an SSL connection'
+  Remember to kill you bastion afterward using 'stop_ssh_bastion'
+EOF
+}
+#!/usr/bin/env bash
+
+k8_nodes_stats() {
+kubectl get nodes -o name  |
+  xargs kubectl describe |
+  grep "^Name\|workType\|cpu  \|memory  "  |
+  sed -r 's/[ :=]+/\t/g' |
+  sed 's/\tworkType\t//g' |
+  sed -r 's/^Name/---\nName/g' |
+  grep --color "Name\|web\|workers\|cpu\|memory\|---"
+}
+
+#!/usr/bin/env bash
+
 # Port forward on the first matching pod
 # Ex :
 # pod_forward testing notification-http
@@ -950,12 +997,58 @@ pick_pod() {
 
 #!/usr/bin/env bash
 
+bastion_config_for_redis_ca() {
+  ssh_config xufte6.0001.euw1.cache.amazonaws.com redis 2223 63789 tests testing recette-001 sandbox prod > $1
+}
+
+bastion_config_for_redis_toutatis() {
+  ssh_config xufte6.0001.euw1.cache.amazonaws.com toutatis 2223 63789 tests testing recette staging production > $1
+}
+
+ssh_config() {
+  host=$1
+  host_prefix=$2
+  port0=$3
+  forward0=$4
+  shift 4
+  instance_names=("$@") # /!\ indices start at 1 with zsh
+  ssh_header
+
+  environments=(tests testing recette staging production)
+
+  length=${#environments[@]}
+  for (( i=1; i<=${length}; i++ ));
+  do
+    bastion_block bastion_${environments[$i]} $(($port0 + $i)) $(($forward0 + $i)) ${host_prefix}-${instance_names[$i]}.$host
+  done
+}
+
+ssh_header() {
+  cat  <<EOF
+    UserKnownHostsFile /dev/null
+    StrictHostKeyChecking no
+    User root
+EOF
+}
+
+bastion_block() {
+  cat <<EOF
+    Host $1
+      HostName 127.0.0.1
+      Port $2
+      LocalForward $3 $4:6379
+EOF
+}
+
 redis_k8s() {
   MODE=$1
+  REDIS_INSTANCE=${2:-ca}
   case $MODE in
+	   "tests") SSH_LOCAL_PORT=2224;REDIS_LOCAL_PORT=63790;ENV="tests";;
 	   "testing") SSH_LOCAL_PORT=2225;REDIS_LOCAL_PORT=63791;ENV="testing";;
-	   "staging") SSH_LOCAL_PORT=2226;REDIS_LOCAL_PORT=63792;ENV="staging";;
-	   "production") SSH_LOCAL_PORT=2227;REDIS_LOCAL_PORT=63793;ENV="production";;
+	   "recette") SSH_LOCAL_PORT=2226;REDIS_LOCAL_PORT=63792;ENV="recette";;
+	   "staging") SSH_LOCAL_PORT=2227;REDIS_LOCAL_PORT=63793;ENV="staging";;
+	   "production") SSH_LOCAL_PORT=2228;REDIS_LOCAL_PORT=63794;ENV="production";;
 	   *) echo "Unsupported ENV : $MODE"; return 1 ;;
   esac
 
@@ -964,23 +1057,11 @@ redis_k8s() {
   lsof -ti  tcp:$REDIS_LOCAL_PORT | xargs kill
 
   bastion_config=$(mktemp)
-  cat > "$bastion_config" <<EOF
-	  UserKnownHostsFile /dev/null
-	  StrictHostKeyChecking no
-	  User root
-	  Host bastion_testing
-		HostName 127.0.0.1
-		Port 2225
-		LocalForward 63791 redis-testing.xufte6.0001.euw1.cache.amazonaws.com:6379
-	  Host bastion_staging
-		HostName 127.0.0.1
-		Port 2226
-		LocalForward 63792 redis-sandbox.xufte6.0001.euw1.cache.amazonaws.com:6379
-	  Host bastion_production
-		HostName 127.0.0.1
-		Port 2227
-    LocalForward 63793 redis-prod.xufte6.0001.euw1.cache.amazonaws.com:6379
-EOF
+  case $REDIS_INSTANCE in
+    "ca") bastion_config_for_redis_ca "$bastion_config";;
+    "toutatis") bastion_config_for_redis_toutatis "$bastion_config";;
+    *) echo "Unsupported redis instance (ca or toutatis available) : $REDIS_INSTANCE"; return 1;;
+  esac
 
   ssh -f -N \
   	-F "$bastion_config" \
@@ -1823,11 +1904,11 @@ datadog_schedule_downtime_single() {
       {
         "active": true,
           "downtime_type": 0,
-          "start": $START,
-          "end": $END,
-          "message": "CA Deployment - performance for $SERVICE may be lower for next $DOWNTIME_MINUTES min",
+          "start": '$START',
+          "end": '$END',
+          "message": "CA Deployment - performance for '$SERVICE' may be lower for next '$DOWNTIME_MINUTES' min",
           "monitor_tags": [
-            "service:$SERVICE",
+            "service:'$SERVICE'",
             "performance"
           ],
           "scope": [
@@ -1837,11 +1918,13 @@ datadog_schedule_downtime_single() {
       }
       '
 }
+
 #!/usr/bin/env bash
 
 docker_build_push() {
   read -r -a BUILD_ARGS <<< "$1"
   DOCKER_BUILD_ARGS="--build-arg VCS_REF=$(git rev-parse --short HEAD)"
+
   for ARG_NAME in "${BUILD_ARGS[@]}"
   do
      DOCKER_BUILD_ARGS="$DOCKER_BUILD_ARGS --build-arg $ARG_NAME=${!ARG_NAME}"
@@ -1850,13 +1933,17 @@ docker_build_push() {
   if ! image_exists $DOCKER_REGISTRY_ID $APPLICATION $CI_COMMIT_SHORT_SHA ; then
     docker pull $DOCKER_IMAGE || true
     SOURCE_URL=${CI_PROJECT_URL:8} # without "https://" protocol, like gitlab.com/colisweb-idl/colisweb/back/packing
-    docker build $DOCKER_BUILD_ARGS \
+
+    docker buildx create --use
+
+    docker buildx build $DOCKER_BUILD_ARGS \
       -t $DOCKER_IMAGE_SHA \
+      --platform "linux/arm64,linux/amd64" \
       --label org.opencontainers.image.revision=$(git rev-parse HEAD) \
       --label org.opencontainers.image.source=$SOURCE_URL \
-      --cache-from $DOCKER_IMAGE \
+      --provenance=false \
+      --push \
       $DOCKER_STAGE_PATH
-    docker push $DOCKER_IMAGE_SHA
   fi
 }
 
@@ -1992,7 +2079,7 @@ init_migrate_db() {
 
   unset KUBECONFIG
 
-  configure_kubectl_for_ci ${ENVIRONMENT}
+  configure_kubectl_for ${ENVIRONMENT}
 
   kube_init_service_database \
     --namespace ${ENVIRONMENT} \
@@ -2038,7 +2125,7 @@ flyway_migrate() {
   CONFIGMAP_NAME="$service-flyway-migration-sql"
   POD_NAME="$service-flyway-migration"
 
-  configure_kubectl_for_ci $environment
+  configure_kubectl_for $environment
 
   kubectl -n $namespace delete configmap $CONFIGMAP_NAME --ignore-not-found
   kubectl -n $namespace delete pod $POD_NAME --ignore-not-found
@@ -2091,7 +2178,7 @@ flyway_migrate() {
 
   flyway_sql_folder=$(pwd)/${MIGRATION_SQL_PATH}
 
-  configure_kubectl_for_ci "${ENVIRONMENT}"
+  configure_kubectl_for "${ENVIRONMENT}"
   POD_NAME="${APPLICATION}-flyway-repair"
   CONFIGMAP_NAME="${APPLICATION}-flyway-repair-sql"
 
@@ -2157,11 +2244,11 @@ git_reveal() {
 }
 #!/usr/bin/env bash
 
-helm_deploy_v3() {
+helm_deploy() {
   APPLICATION=$1
   ENVIRONMENT=$2
   VERSION=$3
-  deploy_chart_v3 \
+  deploy_chart \
     --path_configs deploy \
     --path_chart deploy/$APPLICATION \
     --application $APPLICATION \
@@ -2170,7 +2257,7 @@ helm_deploy_v3() {
     --helm_extra_args --set global.version=$VERSION
 }
 
-deploy_chart_v3() {
+deploy_chart() {
   set -e
   set -x
 
@@ -2217,15 +2304,15 @@ deploy_chart_v3() {
   unset KUBECONFIG
 
   # Configure Kubectl
-  configure_kubectl_for_ci ${environment}
+  configure_kubectl_for ${environment}
 
-  # Configure helm3
-  helm3 version --namespace ${namespace} || true
-  # helm3 stable repo have changed and must be updated manually, in versions < v2.17.0
-  helm3 repo add colisweb s3://colisweb-helm-charts/colisweb
-  helm3 repo add stable https://charts.helm.sh/stable
-  helm3 repo update
-  helm3 dependency update ${root_path}/${path_chart}
+  # Configure helm
+  helm version --namespace ${namespace} || true
+  # helm stable repo have changed and must be updated manually, in versions < v2.17.0
+  helm repo add colisweb s3://colisweb-helm-charts/colisweb
+  helm repo add stable https://charts.helm.sh/stable
+  helm repo update
+  helm dependency update ${root_path}/${path_chart}
 
   # Gather values/*.yaml files
   values_path="${root_path}/${path_chart}/values"
@@ -2233,7 +2320,7 @@ deploy_chart_v3() {
   [ -d $values_path ] && values_files=$(find $values_path -type f -maxdepth 1 -name "*.yaml" | sed 's/^/ -f /' | tr -d \\n | sed 's/%//')
 
   # Deploy
-  helm3 upgrade --install \
+  helm upgrade --install \
     --namespace ${namespace} \
     ${values_files} \
     -f ${root_path}/${path_configs}/common.yaml \
@@ -2255,7 +2342,7 @@ deploy_chart_v3() {
   set +x
 }
 
-verify_deployments_v3() {
+verify_deployments() {
   set -e
 
   # usage :
@@ -2275,7 +2362,7 @@ verify_deployments_v3() {
 
   # Get all Deployments names from the deployed chart
   DEPLOYMENTS=(
-    $(helm3 get manifest --namespace $NAMESPACE $RELEASE | yq -rs '.[] | select(.kind=="Deployment") | .metadata.name')
+    $(helm get manifest --namespace $NAMESPACE $RELEASE | yq --no-doc -r 'select(.kind=="Deployment").metadata.name')
   )
 
   echo "verifying on $NAMESPACE deployments ${DEPLOYMENTS[@]} with a timeout of $TIMEOUT"
@@ -2318,40 +2405,6 @@ check_config_file() {
     fi
 }
 
-#!/usr/bin/env bash
-
-configure_kubectl_for_ci() {
-  if [ -z ${GITLAB_PAT} ]; then
-    echo "Cannot configure kubectl: no GITLAB_PAT configured"
-    exit 1
-  fi
-
-  infra_env="$1"
-  valid_envs="[testing][staging][production][performance][tests][recette]"
-  echo "$valid_envs" | grep -q "\[$infra_env\]"
-
-  if [ $? -ne 0 ]; then
-    echo "Cannot configure kubectl for invalid env : $infra_env"
-    echo "choose one of $valid_envs"
-    exit 1
-  fi
-
-  mkdir -p ~/.kube
-  curl -fsS \
-  --header "PRIVATE-TOKEN: $GITLAB_PAT" \
-  "https://gitlab.com/api/v4/projects/8141053/jobs/artifacts/$infra_env/raw/$infra_env.kubeconfig?job=4_kubernetes_config_output" \
-  > ~/.kube/$infra_env.kubeconfig
-
-  curl_return_code=$?
-  if [ ${curl_return_code} -ne 0 ]; then
-    echo "Cannot configure kubectl for $infra_env, get configuration failed with code $curl_return_code"
-    exit ${curl_return_code}
-  fi
-
-  rm -f ~/.kube/config
-  ln -s ~/.kube/$infra_env.kubeconfig ~/.kube/config
-  echo "Configured kubectl for env : $infra_env"
-}
 notify_new_deployment() {
   jq --version || (apt update && apt install -y jq)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "5.10.0",
+  "version": "5.10.1",
   "type": "module",
   "scripts": {
     "clean": "rescript clean",

package/src/form/Toolkit__Form.res

@@ -23,13 +23,18 @@ module Make = (StateLenses: Config) => {
 
   module RadioGroup = {
     @react.component
-    let make = (~field, ~elements, ~inline=?) =>
+    let make = (~field, ~elements, ~variant=?, ~inline=?, ~containerClassName=?) =>
       <Field
         field
         render={({handleChange, error, value}) =>
           <React.Fragment>
             <Toolkit__Ui_RadioGroup
-              defaultValue=value onChange={v => handleChange(v)} elements ?inline
+              ?containerClassName
+              ?variant
+              defaultValue=value
+              onChange={v => handleChange(v)}
+              elements
+              ?inline
             />
             <ErrorMessage ?error />
           </React.Fragment>}

package/src/ui/Toolkit__Ui_RadioGroup.res

@@ -7,7 +7,14 @@ type element = {
 }
 
 @react.component
-let make = (~onChange, ~elements: array<element>, ~defaultValue=?, ~inline=false) => {
+let make = (
+  ~onChange,
+  ~elements: array<element>,
+  ~variant=?,
+  ~defaultValue=?,
+  ~containerClassName="",
+  ~inline=false,
+) => {
   let name = "radio-" ++ ReachUi_AutoId.use("")
   let (value, setValue) = React.useState(() => defaultValue->Option.getWithDefault(""))
 
@@ -16,10 +23,11 @@ let make = (~onChange, ~elements: array<element>, ~defaultValue=?, ~inline=false
     None
   }, [value])
 
-  <div className={inline ? "flex gap-3" : ""}>
+  <div className={cx([inline ? "flex gap-3" : "", containerClassName])}>
     {elements
     ->Array.mapWithIndex((i, element) =>
       <Radio
+        ?variant
         key={"radio-" ++ string_of_int(i)}
         value=element.value
         name