@colisweb/rescript-toolkit 5.24.0 → 5.24.2

package/.secure_files/{ci-functions-v17.8.3 → ci-functions-v19.0.1}

@@ -92,63 +92,6 @@ aws_ecr_token() {
   aws ecr get-authorization-token --region=eu-west-1 --output text --query 'authorizationData[].authorizationToken'
 }
 
-# you will need jq to use these commands. You can install it using "brew install jq"
-# delete_images colisweb_api 8
-# will delete images older than 8 weeks
-delete_images() {
-
-  REPO=$1
-  WEEKS=${2:-16}
-
-  WEEKS_AGO=$(date -v-${WEEKS}w +%F)
-
-  #Get all ecr images
-  IMAGES=$(aws ecr describe-images --repository-name $REPO --output json)
-
-  #Filter unnecessary values and map `imagePushedAt` to EPOCH
-  NON_LATEST_IMAGES=$(echo $IMAGES | jq '[.imageDetails[] | select(.imageTags | any(endswith("latest")) | not)]')
-
-  #Filter on EPOCH
-  OLD_IMAGES=$(echo $NON_LATEST_IMAGES | jq --arg date $WEEKS_AGO '.[] | select(.imagePushedAt[0:10] < $date).imageDigest')
-  while IFS= read -r IMAGE; do
-    if [ "$IMAGE" != "" ]; then
-      echo "Deleting $IMAGE from $REPO"
-      AWS_PAGER="" aws  ecr batch-delete-image --repository-name $REPO --image-ids imageDigest=$IMAGE
-    fi
-  done <<< "$OLD_IMAGES"
-}
-
-# delete_images_all_repos 12
-# will delete images in all repositories older than 12 weeks
-delete_images_all_repos() {
-  REPOSITORIES=$(aws ecr describe-repositories --output json | jq -r '.[]|.[].repositoryName')
-
-  while IFS= read -r REPO; do
-    echo "processing ECR repository $REPO"
-    delete_images $REPO $1
-  done <<< "$REPOSITORIES"
-}
-
-delete_old_cache() {
-  DATE=${1:-$(date -v-1m +%F)}
-  CACHE_BUCKET=${2:-"s3://gitlab-colisweb-distributed-cache/project/"}
-
-  echo "deleting from cache $CACHE_BUCKET all older than $DATE"
-
-  aws_ecr_login
-
-  while read -r line; do
-    datum=$(echo $line | cut -c1-10)
-    if [[ "$datum" < "$DATE" ]] ; then
-      # Shell Parameter Expansion: ${parameter##word}
-      # Allow to return the result from "word" to the end of "parameters"
-      # Here we need the end of the string after "project/" (corresponding to the S3 gitlab project id and filename)
-      TO_DELETE="$CACHE_BUCKET${line##* project/}"
-      echo $TO_DELETE
-      aws s3 rm $TO_DELETE
-    fi
-  done < <(aws s3 ls $CACHE_BUCKET  --recursive)
-}
 
 #!/usr/bin/env bash
 
@@ -250,11 +193,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 +205,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 +215,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 +539,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 +555,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 +617,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 +784,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 +812,68 @@ 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
+
+function kstatus() {
+  if [ -z "$3" ]
+    then
+    configure_kubectl_for $1 && watch -n 1 "kubectl -n $1 get $2"
+  else
+    configure_kubectl_for $1 && watch -n 1 "kubectl -n $1 get $2 | grep $3"
+  fi
+}
+
+#!/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
@@ -948,6 +949,45 @@ pick_pod() {
   fi
 }
 
+# pods_settings $ENV
+# Will output a CSV (;) of all deployments on this environment with cpu and memory request and limits
+# Errors and null outputs are ignored and won't be in the output.
+pods_resources() {
+  ENV=$1
+  configure_kubectl_for $ENV
+  DEPLOYMENTS=(
+    $(kubectl -n $ENV get deployments | grep -Eo '^[^ ]+' | grep -v 'NAME')
+  )
+  echo "deployment; request_cpu; request_memory; limits_cpu;limits_memory"
+  for D in "${DEPLOYMENTS[@]}"; do
+      info=$(kubectl -n $ENV get deployment -o yaml $D |
+        yq '.spec.template.spec.containers[].resources' |
+        yq '.L = .requests.cpu + "; " + .requests.memory + "; " + .limits.cpu + "; " + .limits.memory' |
+        yq ".L") 2&>/dev/null
+      if ! [ "$info" = "null" ]; then
+        echo "$D; $info"
+      fi
+  done
+}
+
+pods_strategies() {
+  ENV=$1
+  configure_kubectl_for $ENV
+  DEPLOYMENTS=(
+    $(kubectl -n $ENV get deployments | grep -Eo '^[^ ]+' | grep -v 'NAME')
+  )
+  echo "deployment; max_surge; max_unavailable"
+  for D in "${DEPLOYMENTS[@]}"; do
+      info=$(kubectl -n $ENV get deployment -o yaml $D |
+        yq '.spec.strategy' |
+        yq '.L = .rollingUpdate.maxSurge + "; " + .rollingUpdate.maxUnavailable' |
+        yq ".L") 2&>/dev/null
+      if ! [ "$info" = "null" ]; then
+        echo "$D; $info"
+      fi
+  done
+}
+
 #!/usr/bin/env bash
 
 bastion_config_for_redis_ca() {
@@ -1498,6 +1538,309 @@ jwt_token() {
   fi
 }
 
+#!/bin/bash
+
+SCRIPT_PATH=$(dirname $(readlink -f $0))
+PATH="$PATH:$SCRIPT_PATH/script"
+
+function get_token {
+    local ENV=$1
+    local LOGINFILE="$HOME/scriptlogin"
+
+   if [ ! -f "$LOGINFILE" ]; then
+    cat > "$LOGINFILE" <<-'EOF'
+    #!/bin/bash
+    case $ENV in 
+        "testing")
+            local USERLOGIN=""
+            local PASSWORD=""
+        ;;
+        "recette")
+            local USERLOGIN=""
+            local PASSWORD=""
+        ;;
+        "staging")
+            local USERLOGIN=""
+            local PASSWORD=""
+        ;;
+        *)
+            local USERLOGIN=""
+            local PASSWORD=""
+            echo "ENV ${ENV} inconue"
+            return
+        ;;
+    esac
+EOF
+    fi
+
+    source "${LOGINFILE}"
+
+    if [ -z "$PASSWORD" ] || [ -z "$USERLOGIN" ]
+    then
+        echo éditer le ficher "$LOGINFILE"
+        return 1
+    fi
+
+    curl -o /dev/null -D - "https://api.$ENV.colisweb.com/api/v6/authent/external/session" \
+        --data-raw '{"username":"'"${USERLOGIN}"'","password":"'"${PASSWORD/\"/\\\"}"'"}' \
+        --compressed 2> /dev/null  | grep set-cook | sed -e 's/.*session=//g;s/;.*//g'
+}
+
+function bash_array_to_json {
+    function join { 
+        local IFS="$1"
+        shift
+        echo "$*"
+    }
+
+    echo '["'"$(join , $*| sed -e 's/,/","/g' )"'"]' | jq
+}
+
+function get_random_street {
+    if [ ! -f "rue.lst" ]; then
+        curl --output tmp1.gz https://adresse.data.gouv.fr/data/ban/adresses/latest/csv/adresses-59.csv.gz
+        gzip -d tmp1.gz
+        cut -d\; -f3,5,6,8 tmp1 | sed '/;Lille/!d' > rue.lst
+        rm tmp
+    fi
+
+    sort -R rue.lst | head -n 1
+}
+
+function rand_slot {
+    DATE="$1"
+
+    USAGE=$(cat <<-EOF
+        {"start":"${DATE}T06:00:00.000Z", "end":"${DATE}T08:00:00.000Z" }
+        {"start":"${DATE}T08:00:00.000Z", "end":"${DATE}T10:00:00.000Z" }
+        {"start":"${DATE}T10:00:00.000Z", "end":"${DATE}T12:00:00.000Z" }
+        {"start":"${DATE}T16:00:00.000Z", "end":"${DATE}T18:00:00.000Z" }
+        {"start":"${DATE}T18:00:00.000Z", "end":"${DATE}T20:00:00.000Z" }
+EOF
+        ) 
+        
+    echo "$USAGE" |  sort -u -R | head -n 1 
+}
+
+function call_create_sfh_order {
+    local ENV=$1 
+    local TOKEN=$2
+    source "$3"
+    local POS=$4
+    local BARECODES="$5"
+    local PACKAGES=$(echo "$BARECODES" | jq '[{
+                "barcode": .[],
+                "length": 10.5,
+                "height": 9.0,
+                "width": 9.0,
+                "weight": 10.11,
+                "description": "test parel",
+                "options": [],
+                "productTypology": "Classical",
+                "packageType": "Parcel"
+            }
+        ]')
+
+    IFS=";" read -r nu rue code_postal ville < <(get_random_street)
+    JSON='{
+        "primaryOrderReference": "'"${PRIMARY_REF}${POS}"'",
+        "secondaryOrderReference": null,
+        "stages": [
+            {
+                "type": "Pickup",
+                "packageBarcodes": '"$BARECODES"',
+                "location": {
+                    "type": "Warehouse",
+                    "warehouseCode": "'"$PICKUP_WAREHOUSE_CODE"'"
+                }
+            },
+            {
+                "type": "Dropoff",
+                "packageBarcodes": '"$BARECODES"',
+                "location": {	
+                    "type": "Address",
+                    "address": {
+                        "address1": "'"$nu $rue"'",
+                        "postalCode": "'"$code_postal"'",
+                        "city": "'"$ville"'",
+                        "country": "France",
+                        "floor": 0,
+                        "lift": "with_lift"
+                    },
+                    "contact": {
+                        "name": "John Doe",
+                        "primaryPhone": "+33606060606"
+                    }
+                }
+            }
+        ],
+        "packages": '"$PACKAGES"',
+        "owner": {
+            "accountIdentifier": "'$ACCOUNTIDENTIFIER'"
+        },
+        "deliveryOptions": [],
+        "ecommerceValidationDate": "'"${DATE}"'"
+    }'
+
+    curl -X POST https://api.$ENV.colisweb.com/api/v6/order/external/warehouse/orders -H 'content-type: application/json'  --cookie session="$TOKEN" --data-raw "$JSON" 
+}
+
+
+function call_scan {
+    local ENV=$1 
+    local TOKEN=$2
+    source "$3"
+    local BARECODES="$4"
+    local SCAN=$(echo "$BARECODES" | jq '[{"barcode" :.[], "context": "shuttle"}]')
+
+    IFS=";" read -r nu rue code_postal ville < <(get_random_street)
+    JSON='{"scans":'$SCAN'}'
+
+    curl -X POST https://api.$ENV.colisweb.com/api/v6/parcel/external/units/scans/bulk -H 'content-type: application/json'  --cookie session="$TOKEN" --data-raw "$JSON" 
+}
+
+
+function call_register_delivery {
+    local ENV=$1 
+    local TOKEN=$2
+
+    SCENARIO=$3
+    source "$SCENARIO"
+
+    local ORDERID=$4    
+    local BARECODES="$5"
+    
+    curl -X POST https://api.$ENV.colisweb.com/api/v6/order/external/warehouse/orders/"$ORDERID"/deliveries \
+        --cookie session="$TOKEN" --data-raw '{
+            "slot": '"$(rand_slot ${DELIVERY_DATE})"',
+            "storeIdOwner":"'"$STOREIDOWNER"'",
+            "pickup":{"type":"hub","code":"'"$HUB"'"},
+            "barcodes":'"$BARECODES"',
+            "price":{"origin":"auto","amount":25.9},
+            "allowCustomerSlotUpdate":false
+        }'
+}
+
+
+
+function _create_scenario_file_if_not_exist () {
+if [ ! -f "$SCENARIO" ] 
+    then
+        cat > "$SCENARIO" <<-'EOF'
+    DELIVERY_DATE=$(date -v+7d '+%Y-%m-%d')
+    ENV="testing"
+    # ENV="staging"
+    # ENV="recette"
+
+    ACCOUNTIDENTIFIER="102"
+    HUB="duck"
+    STOREIDOWNER="184"
+
+    PICKUP_WAREHOUSE_CODE="422"
+
+    BARECODES_COUNT=5
+    PREF="aaaa"
+
+
+    DATE=$(date '+%Y-%m-%d')
+    RAND=$(date +%y%m%d%H%M%S)
+    BARECODE_PART=0000$RAND
+    PRIMARY_REF=$PREF$RAND
+EOF
+echo "éditer le fichier $SCENARIO"
+return 1
+fi
+}
+
+#!/usr/bin/env bash
+
+cleanup_merged_mr() {
+  COLISWEB_IDL_GROUP=3054234
+
+  BEFORE=${1:- $(date -I -v -2y)}
+
+  for (( COUNTER=1; COUNTER<=12; COUNTER+=2 )); do
+    cleanup_grouped_merged_mr $COLISWEB_IDL_GROUP $BEFORE $COUNTER &
+  done
+
+}
+
+cleanup_grouped_merged_mr() {
+  GROUP=$1
+  BEFORE=$2
+  PAGE_COUNT=$3
+  MERGED_MRS=($(curl --header "PRIVATE-TOKEN: $GITLAB_PAT" \
+                    --url "https://gitlab.com/api/v4/groups/$GROUP/merge_requests?updated_before=${BEFORE}T08:00:00Z&status=merged&per_page=50&page=$PAGE_COUNT" |
+                     jq -r '.[] | {iid: .iid|tostring, pid:.project_id|tostring} | (.pid + "/merge_requests/" + .iid)'))
+
+  for MR in ${MERGED_MRS[@]}; do
+    echo "https://gitlab.com/api/v4/projects/$MR"
+    curl --request DELETE \
+      --header "PRIVATE-TOKEN: $GITLAB_PAT" \
+      --url "https://gitlab.com/api/v4/projects/$MR"
+  done
+}
+# FIXME
+# image index (docker manifest) does not have tags and images are tagged but not marked as related to the index.
+# Should be fixed using more complex procedure to relate index and images.
+# you will need jq to use these commands. You can install it using "brew install jq"
+# cleanup_ecr_images colisweb_api 8
+# will delete images older than 8 weeks
+cleanup_ecr_images() {
+
+  REPO=$1
+  WEEKS=${2:-16}
+
+  WEEKS_AGO=$(date -v-${WEEKS}w +%F)
+
+  #Get all ecr images
+  IMAGES=$(aws ecr describe-images --repository-name $REPO --output json)
+
+  #Filter unnecessary values and map `imagePushedAt` to EPOCH
+  NON_LATEST_IMAGES=$(echo $IMAGES | jq '[.imageDetails[] | select(.imageTags | any(endswith("latest")) | not)]')
+
+  #Filter on EPOCH
+  OLD_IMAGES=$(echo $NON_LATEST_IMAGES | jq --arg date $WEEKS_AGO '.[] | select(.imagePushedAt[0:10] < $date).imageDigest')
+  while IFS= read -r IMAGE; do
+    if [ "$IMAGE" != "" ]; then
+      echo "Deleting $IMAGE from $REPO"
+      AWS_PAGER="" aws  ecr batch-delete-image --repository-name $REPO --image-ids imageDigest=$IMAGE
+    fi
+  done <<< "$OLD_IMAGES"
+}
+
+# cleanup_all_ecr_images 12
+# will delete images in all repositories older than 12 weeks
+cleanup_all_ecr_images() {
+  REPOSITORIES=$(aws ecr describe-repositories --output json | jq -r '.[]|.[].repositoryName')
+
+  while IFS= read -r REPO; do
+    echo "processing ECR repository $REPO"
+    cleanup_ecr_images $REPO $1
+  done <<< "$REPOSITORIES"
+}
+
+cleanup_ci_cache() {
+  DATE=${1:-$(date -v-1m +%F)}
+  CACHE_BUCKET=${2:-"s3://gitlab-colisweb-distributed-cache/project/"}
+
+  echo "deleting from cache $CACHE_BUCKET all older than $DATE"
+
+  aws_ecr_login
+
+  while read -r line; do
+    datum=$(echo $line | cut -c1-10)
+    if [[ "$datum" < "$DATE" ]] ; then
+      # Shell Parameter Expansion: ${parameter##word}
+      # Allow to return the result from "word" to the end of "parameters"
+      # Here we need the end of the string after "project/" (corresponding to the S3 gitlab project id and filename)
+      TO_DELETE="$CACHE_BUCKET${line##* project/}"
+      echo $TO_DELETE
+      aws s3 rm $TO_DELETE
+    fi
+  done < <(aws s3 ls $CACHE_BUCKET  --recursive)
+}
+
 #!/usr/bin/env bash
 
 ftp_ikea_k8s() {
@@ -1877,6 +2220,7 @@ datadog_schedule_downtime_single() {
 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}"
@@ -1885,13 +2229,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
 }
 
@@ -2027,7 +2375,7 @@ init_migrate_db() {
 
   unset KUBECONFIG
 
-  configure_kubectl_for_ci ${ENVIRONMENT}
+  configure_kubectl_for ${ENVIRONMENT}
 
   kube_init_service_database \
     --namespace ${ENVIRONMENT} \
@@ -2073,7 +2421,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
@@ -2126,7 +2474,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"
 
@@ -2192,11 +2540,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 \
@@ -2205,7 +2553,7 @@ helm_deploy_v3() {
     --helm_extra_args --set global.version=$VERSION
 }
 
-deploy_chart_v3() {
+deploy_chart() {
   set -e
   set -x
 
@@ -2252,15 +2600,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"
@@ -2268,7 +2616,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 \
@@ -2290,7 +2638,7 @@ deploy_chart_v3() {
   set +x
 }
 
-verify_deployments_v3() {
+verify_deployments() {
   set -e
 
   # usage :
@@ -2310,7 +2658,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"
@@ -2353,40 +2701,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.24.0",
+  "version": "5.24.2",
   "type": "module",
   "scripts": {
     "clean": "rescript clean",

package/src/primitives/Toolkit__Primitives_Array.res

@@ -0,0 +1,30 @@
+module Array = {
+  include Belt.Array
+
+  let findMap: (array<'a>, 'a => option<'b>) => option<'b> = (array, findMapper) => {
+    let result = ref(None)
+    let index = ref(0)
+
+    while result.contents->Option.isNone && index.contents < array->Array.length {
+      result := findMapper(array[index.contents]->Option.getExn)
+      index := index.contents + 1
+    }
+
+    result.contents
+  }
+
+  let findMapWithIndex: (array<'a>, (int, 'a) => option<'b>) => option<'b> = (
+    array,
+    findMapper,
+  ) => {
+    let result = ref(None)
+    let index = ref(0)
+
+    while result.contents->Option.isNone && index.contents < array->Array.length {
+      result := findMapper(array[index.contents]->Option.getExn, index.contents)
+      index := index.contents + 1
+    }
+
+    result.contents
+  }
+}

package/src/ui/Toolkit__Ui_MultiSelect.res

@@ -67,14 +67,14 @@ let make = (
     | options =>
       <>
         <div
-          className="table table-fixed w-full pr-8"
+          className="table table-fixed w-full mr-8"
           title={options->Array.map(({label}) => label)->Js.Array2.joinWith(", ")}>
           <span className="table-cell truncate text-left">
             {options->Array.map(({label}) => label)->Js.Array2.joinWith(", ")->React.string}
           </span>
         </div>
         <button
-          className={"absolute right-1 z-20 bg-info-100 text-info-600 text-sm rounded px-1.5 py-0.5 inline-flex items-center gap-2"}
+          className={"absolute right-1 bg-info-100 text-info-600 text-sm rounded px-1.5 py-0.5 inline-flex items-center gap-2"}
           onClick={event => {
             event->JsxEventC.Mouse.stopPropagation
             onChange([])

package/src/ui/Toolkit__Ui_MultiSelectWithValidation.res

@@ -142,14 +142,14 @@ let make = (
     | options =>
       <>
         <div
-          className="table table-fixed w-full pr-8"
+          className="table table-fixed w-full mr-8"
           title={options->Array.map(({label}) => label)->Js.Array2.joinWith(", ")}>
           <span className="table-cell truncate text-left">
             {options->Array.map(({label}) => label)->Js.Array2.joinWith(", ")->React.string}
           </span>
         </div>
         <button
-          className={"absolute right-1 z-20 bg-info-100 text-info-600 text-sm rounded px-1.5 py-0.5 inline-flex items-center gap-2"}
+          className={"absolute right-1  bg-info-100 text-info-600 text-sm rounded px-1.5 py-0.5 inline-flex items-center gap-2"}
           onClick={event => {
             event->JsxEventC.Mouse.stopPropagation
             onValidate([])