@colisweb/rescript-toolkit 5.49.3 → 5.49.4

package/.secure_files/{ci-functions-v20.0.2 → ci-functions-v20.7.1}

@@ -62,7 +62,7 @@ extract_arg() {
   value=$3
   if [ "--$name" != "$passed" ]; then
     echo "missing argument $name"
-    exit 1
+    return 1
   fi
   eval $name='$value'
 }
@@ -452,12 +452,12 @@ configure_kubectl_for() {
 database_k8s() {
   MODE=$1
   case $MODE in
-  	 "tests") SSH_LOCAL_PORT=2224;PG_LOCAL_PORT=24440;CA_LOCAL_PORT=25430;ENV="tests";;
-	   "testing") SSH_LOCAL_PORT=2225;PG_LOCAL_PORT=24441;CA_LOCAL_PORT=25431;ENV="testing";;
-	   "staging") SSH_LOCAL_PORT=2226;PG_LOCAL_PORT=24442;CA_LOCAL_PORT=25432;ENV="staging";;
-	   "production") SSH_LOCAL_PORT=2227;PG_LOCAL_PORT=24443;CA_LOCAL_PORT=25433;ENV="production";;
-	   "production_rw") SSH_LOCAL_PORT=2227;PG_LOCAL_PORT=24444;CA_LOCAL_PORT=25434;ENV="production";;
-	   "recette") SSH_LOCAL_PORT=2228;PG_LOCAL_PORT=24446;CA_LOCAL_PORT=25436;ENV="recette";;
+  	 "tests") SSH_LOCAL_PORT=2224;COMP_LOCAL_PORT=25550;PG_LOCAL_PORT=24440;CA_LOCAL_PORT=25430;ENV="tests";;
+	   "testing") SSH_LOCAL_PORT=2225;COMP_LOCAL_PORT=25551;PG_LOCAL_PORT=24441;CA_LOCAL_PORT=25431;ENV="testing";;
+	   "staging") SSH_LOCAL_PORT=2226;COMP_LOCAL_PORT=25552;PG_LOCAL_PORT=24442;CA_LOCAL_PORT=25432;ENV="staging";;
+	   "production") SSH_LOCAL_PORT=2227;COMP_LOCAL_PORT=25553;PG_LOCAL_PORT=24443;CA_LOCAL_PORT=25433;ENV="production";;
+	   "production_rw") SSH_LOCAL_PORT=2227;COMP_LOCAL_PORT=25554;PG_LOCAL_PORT=24444;CA_LOCAL_PORT=25434;ENV="production";;
+	   "recette") SSH_LOCAL_PORT=2228;COMP_LOCAL_PORT=25556; PG_LOCAL_PORT=24446;CA_LOCAL_PORT=25436;ENV="recette";;
 	   *) echo "Unsupported ENV : $MODE"; return 1 ;;
   esac
 
@@ -478,23 +478,28 @@ database_k8s() {
 		HostName 127.0.0.1
 		Port 2225
 		LocalForward 24441 toutatis-testing-db.ca0rjdmnxf1x.eu-west-1.rds.amazonaws.com:5432
+    LocalForward 25551 toutatis-testing-composite-db.ca0rjdmnxf1x.eu-west-1.rds.amazonaws.com:5432
 		LocalForward 25431 toutatis-testing-mysql-db.ca0rjdmnxf1x.eu-west-1.rds.amazonaws.com:3306
 		LocalForward 25531 testapirds.ca0rjdmnxf1x.eu-west-1.rds.amazonaws.com:3306
+		LocalForward 25561 toutatis-testing-oracle-db.ca0rjdmnxf1x.eu-west-1.rds.amazonaws.com:1521
 	  Host bastion_staging
 		HostName 127.0.0.1
 		Port 2226
 		LocalForward 24442 toutatis-staging-db.ca0rjdmnxf1x.eu-west-1.rds.amazonaws.com:5432
+		LocalForward 25552 toutatis-staging-composite-db.ca0rjdmnxf1x.eu-west-1.rds.amazonaws.com:5432
 		LocalForward 25432 toutatis-staging-mysql-db.ca0rjdmnxf1x.eu-west-1.rds.amazonaws.com:3306
     Host bastion_recette
 		HostName 127.0.0.1
 		Port 2228
 		LocalForward 24446 toutatis-recette-db.ca0rjdmnxf1x.eu-west-1.rds.amazonaws.com:5432
+		LocalForward 25556 toutatis-recette-composite-db.ca0rjdmnxf1x.eu-west-1.rds.amazonaws.com:5432
 		LocalForward 25436 toutatis-recette-mysql-db.ca0rjdmnxf1x.eu-west-1.rds.amazonaws.com:3306
 		LocalForward 25536 testapirds.ca0rjdmnxf1x.eu-west-1.rds.amazonaws.com:3306
 	  Host bastion_production
 		HostName 127.0.0.1
 		Port 2227
     LocalForward 24443 toutatis-production-db-replica.ca0rjdmnxf1x.eu-west-1.rds.amazonaws.com:5432
+    LocalForward 25553 toutatis-production-composite-db.ca0rjdmnxf1x.eu-west-1.rds.amazonaws.com:5432
     LocalForward 25433 toutatis-production-mysql-db-replica.ca0rjdmnxf1x.eu-west-1.rds.amazonaws.com:3306
 EOF
   if [ "$MODE" = "production_rw" ] ; then
@@ -508,6 +513,7 @@ EOF
   	-F "$bastion_config" \
   	"bastion_$ENV"
 
+  echo "sample command (composite) : 'psql postgres://postgres@127.0.0.1:$COMP_LOCAL_PORT'"
   echo "sample command : 'psql postgres://postgres@127.0.0.1:$PG_LOCAL_PORT'"
   echo "sample command : 'mysql -u colisweb -h 127.0.0.1 -P $CA_LOCAL_PORT -p db_name'"
 
@@ -574,6 +580,9 @@ kube_init_database_once() {
 
     psql_on_k8 $namespace once "$db_init_username:$db_init_password@$db_host:$db_port" -c 'GRANT ALL PRIVILEGES ON DATABASE '"$db_database"' TO '"$db_username"';'
     echo "Granted all privileges for $db_username on $db_database"
+
+    psql_on_k8 $namespace once "$db_init_username:$db_init_password@$db_host:$db_port" -c 'GRANT ALL ON SCHEMA public TO '"$db_username"';'
+    echo "Granted all privileges for $db_username on schema public"
   fi
 
   echo "======================="
@@ -863,13 +872,17 @@ function kstatus() {
 #!/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\|---"
+  ENV=${1:-testing}
+
+  configure_kubectl_for "${ENV}"
+
+  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
@@ -935,14 +948,14 @@ pod_copy_to() {
 
 pick_pod() {
   ENV=$1
-  POD_FILTER="pod/$2"
+  POD_FILTER=$2
   configure_kubectl_for $ENV
 
   if [ -z "$2" ] ; then
     kubectl -n $ENV get pods | gum filter | cut -f1 -d" "
   else
-      if PODS=$(kubectl -n $ENV get pods -o=name | grep "$POD_FILTER"); then
-        echo $PODS | head -1 | sed -e 's/pod\///'
+      if PODS=$(kubectl -n $ENV get pods | grep -m1 "$POD_FILTER" | cut -f1 -d" "); then
+        echo $PODS
       else
         echo "no pods found on $ENV matching $POD_FILTER" >&2
       fi
@@ -1422,6 +1435,182 @@ spec:
 }
 
 
+#!/usr/bin/env bash
+
+# Usage info
+show_help_shell() {
+  local help="""Usage: run_job_k8s -s SCRIPT [-e ENV] [-c CONFIG] [-p POD] [-f FOLDER] [ARGS]
+  Create a k8s job executing a script
+
+      -h          display this help and exit
+      -s SCRIPT   run script SCRIPT on a pod (SCRIPT must be a .sc file)
+      -e ENV      opt. set execution environment (default to testing)
+      -c CONFIG   opt. secret file needed for the script (must be a .sc file, not a .secret file)
+      -p POD      opt. name of the pod to create (default to $USERNAME)
+      -f FOLDER   opt. name of the folder containing the scripts to execute (if SCRIPT needs other files)
+      ARGS        opt. additional arguments for SCRIPT
+
+  The organisation of the files must be the same locally as on the pod :
+    - /code containing the script to execute (arg -s) and the other needed files (if the arg -f is used, it must reference this directory)
+    - /conf containing the secret file (arg -c if used)
+  E.g. in the script \"/code/script.sc\", to use a secret file \"/conf/secret.sc\", the import should look like \"import \$file.^.conf.secret.sc\"
+  """
+  echo "$help"
+}
+
+run_shell_k8s() {
+
+  #default values
+  local namespace="testing"
+  local name="$USERNAME"
+  local secret=""
+  local shell_folder=""
+  local script_script=""
+
+  while getopts ":e:c:p:f:s:h" opt; do
+    case $opt in
+      e)
+        namespace="$OPTARG" >&2
+        ;;
+      p)
+        name="$OPTARG" >&2
+        ;;
+      c)
+        secret="$OPTARG" >&2
+        ;;
+      f)
+        shell_folder="$OPTARG" >&2
+        ;;
+      s)
+        shell_script="$OPTARG" >&2
+        ;;
+      h)
+        show_help_job
+        return 0
+        ;;
+      :)
+        echo "Option -$OPTARG requires an argument. Run run_cron_job_k8s -h for help" >&2
+        return 0
+        ;;
+      \?)
+        echo "Invalid option: -$OPTARG. Run run_cron_job_k8s -h for help" >&2
+        return 0
+        ;;
+    esac
+  done
+
+  if [ -z "$shell_script" ]; then
+          echo 'Missing -s. Run run_job_k8s -h for help' >&2
+          return 0
+  fi
+
+  shift "$((OPTIND-1))"
+
+  local script_args=$(
+      if [ "$#" -gt 0 ] ; then
+        printf '"'
+        join_by '", "' $*
+        printf '"'
+      fi
+    )
+
+
+
+
+  local IMAGE="949316342391.dkr.ecr.eu-west-1.amazonaws.com/docker-infra-builder:v3.1.0"
+  local JOB_NAME="job-shell-$name"
+
+    if [[ ! -r "$shell_script" ]]; then
+      echo "shell script not found $shell_script"
+      return 2
+    else
+      local CONFIG_MAP="config-$JOB_NAME"
+      local CONFIG_MAP_DIR="$(mktemp -d)"
+      local SECRET_MAP="secret-$JOB_NAME"
+
+      configure_kubectl_for $namespace
+
+      if [[ ! -z $shell_folder && -d $shell_folder ]] ; then
+        cp -r "$shell_folder/" "$CONFIG_MAP_DIR"
+      fi
+      cp "$shell_script" "$CONFIG_MAP_DIR/script.sh"
+
+      kubectl -n $namespace get configmap $CONFIG_MAP && kubectl -n $namespace delete configmap $CONFIG_MAP
+      kubectl -n $namespace create configmap $CONFIG_MAP --from-file="$CONFIG_MAP_DIR"
+
+      kubectl -n $namespace get secret $SECRET_MAP && kubectl -n $namespace delete secret $SECRET_MAP
+      kubectl -n $namespace create secret generic $SECRET_MAP --from-file="$secret"
+
+      kubectl -n $namespace get job $JOB_NAME && kubectl -n $namespace delete job $JOB_NAME
+
+      echo "starting $JOB_NAME with $IMAGE"
+    fi
+
+      JOB_DEFINITION='
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: '$JOB_NAME'
+  namespace: '$namespace'
+spec:
+  template:
+    spec:
+      containers:
+      - name: '$JOB_NAME'
+        command: ["bash", "/code/script.sh"]
+        image: '$IMAGE'
+        args: ['$script_args']
+        env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.name
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        - name: HOST_IP
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: status.hostIP
+        volumeMounts:
+        - name: config
+          mountPath: /code
+        - name: secret
+          mountPath: /conf
+          readOnly: true
+        resources:
+          requests:
+            cpu: 500m
+            memory: 256Mi
+          limits:
+            cpu: 4000m
+            memory: 1Gi
+      nodeSelector:
+        workType: workers
+      restartPolicy: Never
+      volumes:
+      - name: config
+        configMap:
+          name: '$CONFIG_MAP'
+      - name: secret
+        secret:
+          secretName: '$SECRET_MAP'
+      - name: stockage
+
+     '
+
+
+     echo $JOB_DEFINITION > /tmp/job.yaml
+
+      kubectl -n $namespace  apply -f /tmp/job.yaml
+
+}
+
+
 #!/usr/bin/env bash
 
 run_task() {
@@ -1538,51 +1727,53 @@ jwt_token() {
   fi
 }
 
-#!/bin/bash
+#!/usr/bin/env bash
+
+alias update_devtool="git -C ~/.oh-my-zsh/custom/dev-tools/ pull"
 
-SCRIPT_PATH=$(dirname $(readlink -f $0))
+SCRIPT_PATH=$SCRIPT_FULL_PATH/shell/run
 PATH="$PATH:$SCRIPT_PATH/script"
 
 function get_token {
     local ENV=$1
-    local LOGINFILE="$HOME/scriptlogin"
+    local LOGIN_FILE="$HOME/scriptlogin"
 
-   if [ ! -f "$LOGINFILE" ]; then
-    cat > "$LOGINFILE" <<-'EOF'
+   if [ ! -f "$LOGIN_FILE" ]; then
+    cat > "$LOGIN_FILE" <<-'EOF'
     #!/bin/bash
     case $ENV in 
         "testing")
-            local USERLOGIN=""
-            local PASSWORD=""
+            local BO_USERNAME=""
+            local BO_PASSWORD=""
         ;;
         "recette")
-            local USERLOGIN=""
-            local PASSWORD=""
+            local BO_USERNAME=""
+            local BO_PASSWORD=""
         ;;
         "staging")
-            local USERLOGIN=""
-            local PASSWORD=""
+            local BO_USERNAME=""
+            local BO_PASSWORD=""
         ;;
         *)
-            local USERLOGIN=""
-            local PASSWORD=""
-            echo "ENV ${ENV} inconue"
+            local BO_USERNAME=""
+            local BO_PASSWORD=""
+            echo "ENV ${ENV} inconu"
             return
         ;;
     esac
 EOF
     fi
 
-    source "${LOGINFILE}"
+    source "${LOGIN_FILE}"
 
-    if [ -z "$PASSWORD" ] || [ -z "$USERLOGIN" ]
+    if [ -z "$BO_PASSWORD" ] || [ -z "$BO_USERNAME" ]
     then
-        echo éditer le ficher "$LOGINFILE"
+        echo éditer le ficher "$LOGIN_FILE"
         return 1
     fi
 
     curl -o /dev/null -D - "https://api.$ENV.colisweb.com/api/v6/authent/external/session" \
-        --data-raw '{"username":"'"${USERLOGIN}"'","password":"'"${PASSWORD/\"/\\\"}"'"}' \
+        --data-raw '{"username":"'"${BO_USERNAME}"'","password":"'"${BO_PASSWORD/\"/\\\"}"'"}' \
         --compressed 2> /dev/null  | grep set-cook | sed -e 's/.*session=//g;s/;.*//g'
 }
 
@@ -1597,29 +1788,53 @@ function bash_array_to_json {
 }
 
 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
+    local CODE_POSTAUX_ARG=${1:-59000}
+    IFS=',' read -r -a CODE_POSTAUX <<< "$CODE_POSTAUX_ARG"
+    for CODE_POSTAL in "${CODE_POSTAUX[@]}"; do
+      if [[ ! "$CODE_POSTAL" =~ ^[0-9]{5}$ ]]; then
+          echo "Chaque CODE_POSTAL doit avoir une taille de 5 chiffre : $CODE_POSTAL"
+          exit 1
+      fi
+    done
+    local CODE_POSTAL=$(echo "${CODE_POSTAUX[@]}" | tr " " "\n" | sort -u -R | head -n 1)
+
+    get_random_street_in_cp $CODE_POSTAL
+}
+
+function get_random_street_in_cp {
+    local CODE_POSTAL=$1
+
+    FILENAME="rue-$CODE_POSTAL.lst"
+    if [ ! -f "$FILENAME" ]; then
+        curl --output tmp1.gz https://adresse.data.gouv.fr/data/ban/adresses/latest/csv/adresses-"${CODE_POSTAL:0:2}".csv.gz
         gzip -d tmp1.gz
-        cut -d\; -f3,5,6,8 tmp1 | sed '/;Lille/!d' > rue.lst
-        rm tmp
+        cut -d\; -f3,5,6,8 tmp1 | sed "/;$CODE_POSTAL;/!d" > "$FILENAME"
+        rm tmp1
     fi
 
-    sort -R rue.lst | head -n 1
+    sort -R "$FILENAME" | 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 
+
+    local SCENARIO=$2
+    if [ -f "$SCENARIO" ]; then
+        source "$SCENARIO"
+    fi
+    local ORDER_DATE="$1"
+
+     DEFAULT=(
+        "06:00+01:00[Europe/Paris]-08:00+01:00[Europe/Paris]" 
+        "08:00+01:00[Europe/Paris]-10:00+01:00[Europe/Paris]" 
+        "10:00+01:00[Europe/Paris]-12:00+01:00[Europe/Paris]" 
+        "16:00+01:00[Europe/Paris]-18:00+01:00[Europe/Paris]" 
+        "18:00+01:00[Europe/Paris]-20:00+01:00[Europe/Paris]"
+    )
+    USAGE=${DELIVERY_SLOTS:-${DEFAULT[@]}}
+    
+    IFS="-" read -r start_time end_time < <(echo "${USAGE[@]}" | tr " " "\n" |  sort -u -R | head -n 1 )
+
+    echo '{"start":"'"${ORDER_DATE}T${start_time}"'", "end":"'"${ORDER_DATE}T${end_time}"'" }'
 }
 
 function call_create_sfh_order {
@@ -1627,36 +1842,58 @@ function call_create_sfh_order {
     local TOKEN=$2
     source "$3"
     local POS=$4
-    local BARECODES="$5"
-    local PACKAGES=$(echo "$BARECODES" | jq '[{
+    local BARCODES="$5"
+    local CODE_POSTAUX="$6"
+    local PACKAGES=$(echo "$BARCODES" | jq '[{
                 "barcode": .[],
-                "length": 10.5,
-                "height": 9.0,
-                "width": 9.0,
-                "weight": 10.11,
-                "description": "test parel",
+                "length": 20.0,
+                "height": 15.0,
+                "width": 4.0,
+                "weight": 1.5,
+                "description": "test parcel",
                 "options": [],
                 "productTypology": "Classical",
                 "packageType": "Parcel"
             }
         ]')
 
-    IFS=";" read -r nu rue code_postal ville < <(get_random_street)
+    DELIVERY_OPTIONS_P='['
+    for option in "${DELIVERY_OPTIONS[@]}"; do
+        if [ "$DELIVERY_OPTIONS_P" != '[' ]; then
+            DELIVERY_OPTIONS_P+=", "
+        fi
+        DELIVERY_OPTIONS_P+="\"$option\""
+    done
+    DELIVERY_OPTIONS_P+=']'
+
+    IFS=";" read -r nu rue code_postal ville < <(get_random_street "$CODE_POSTAUX")
+
+    if [ -n "$PICKUP_STORE_CODE" ]; then
+        PICKUP_LOCATION='{
+            "type": "store",
+            "storeCode": "'"$PICKUP_STORE_CODE"'"
+        }'
+    elif [ -n "$PICKUP_WAREHOUSE_CODE" ]; then
+        PICKUP_LOCATION='{
+            "type": "Warehouse",
+            "warehouseCode": "'"$PICKUP_WAREHOUSE_CODE"'"
+        }'
+    else
+        echo PICKUP_WAREHOUSE_CODE ou PICKUP_STORE_CODE doit être définie dans la "$3"
+        exit 1
+    fi
     JSON='{
         "primaryOrderReference": "'"${PRIMARY_REF}${POS}"'",
         "secondaryOrderReference": null,
         "stages": [
             {
                 "type": "Pickup",
-                "packageBarcodes": '"$BARECODES"',
-                "location": {
-                    "type": "Warehouse",
-                    "warehouseCode": "'"$PICKUP_WAREHOUSE_CODE"'"
-                }
+                "packageBarcodes": '"$BARCODES"',
+                "location":  '"$PICKUP_LOCATION"'
             },
             {
                 "type": "Dropoff",
-                "packageBarcodes": '"$BARECODES"',
+                "packageBarcodes": '"$BARCODES"',
                 "location": {	
                     "type": "Address",
                     "address": {
@@ -1676,13 +1913,18 @@ function call_create_sfh_order {
         ],
         "packages": '"$PACKAGES"',
         "owner": {
-            "accountIdentifier": "'$ACCOUNTIDENTIFIER'"
+            "accountIdentifier": "'$ACCOUNT_IDENTIFIER'"
         },
-        "deliveryOptions": [],
-        "ecommerceValidationDate": "'"${DATE}"'"
+        "deliveryOptions": '"$DELIVERY_OPTIONS_P"',
+        "ecommerceValidationDate": "'"${ORDER_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" 
+    RESULT=$(curl -s -X POST https://api.$ENV.colisweb.com/api/v6/order/external/warehouse/orders -H 'content-type: application/json'  --cookie session="$TOKEN" --data-raw "$JSON")
+    ORDER_ID=$(jq ".orderId" -r <<< "$RESULT")
+
+    echo "nouvelle commande : https://bo.$ENV.colisweb.com/admin/orders/$ORDER_ID" >&2
+
+    echo "$RESULT"
 }
 
 
@@ -1690,10 +1932,9 @@ function call_scan {
     local ENV=$1 
     local TOKEN=$2
     source "$3"
-    local BARECODES="$4"
-    local SCAN=$(echo "$BARECODES" | jq '[{"barcode" :.[], "context": "shuttle"}]')
+    local BARCODES="$4"
+    local SCAN=$(echo "$BARCODES" | 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" 
@@ -1707,18 +1948,21 @@ function call_register_delivery {
     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"'",
+    local ORDER_ID=$4
+    local BARCODES="$5"
+
+    DATA='{
+            "slot": '"$(rand_slot "${DELIVERY_DATE}" "$SCENARIO")"',
+            "storeIdOwner":"'"$STORE_ID_OWNER"'",
             "pickup":{"type":"hub","code":"'"$HUB"'"},
-            "barcodes":'"$BARECODES"',
+            "barcodes":'"$BARCODES"',
             "price":{"origin":"auto","amount":25.9},
-            "allowCustomerSlotUpdate":false
+            "allowCustomerSlotUpdate":false,
+            "withForcedSlot": false
         }'
+
+    curl -X POST https://api.$ENV.colisweb.com/api/v6/order/external/warehouse/orders/"$ORDER_ID"/deliveries \
+        --cookie session="$TOKEN" --data-raw "$DATA"
 }
 
 
@@ -1727,25 +1971,45 @@ 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
+DELIVERY_DATE=$(date -v+7d '+%Y-%m-%d') # ici on demande de crée a date d'aujourd'hui + 7 jours 
+                                        # peu remplacer -v+7d par -v+1d pour une livrasion programmer demain
+                                        # utiliser que par create_many_sfh_order_and_delivery
+ENV="testing"                           # sur quelle enviromement lancer le scripts
+# ENV="staging"
+# ENV="recette"
+
+ACCOUNT_IDENTIFIER="102"                # pour la creation de order force utilies owner.accountIdentifier
+                                        # sur l'appel api/v6/order/external/warehouse/orders 
+                                        # (creation de la commade) 
+HUB="duck"                              # pour sur l'appel api/v6/order/external/warehouse/orders
+                                        # parametre pickup.code (type est a "hub")
+STORE_ID_OWNER="184"                    # parametre pickup.storeIdOwner
+                                        # sur l'appel api/v6/order/external/warehouse/orders
+# PICKUP_STORE_CODE="2"                 # si non commenté alors départ du magasin
+PICKUP_WAREHOUSE_CODE="422"             # pour un départ d'entrepôt
+
+BARCODES_COUNT=5                        # nombres packages 
+PREF="aaaa"                             # doit faire 4 caractères utilies pour générer les barecode 
+                                        # des packtages
+
+CODE_POSTAUX=("59000", "75001")        #  liste code postale sur lequelle une addresse aléatoire seras choisi
+                                        # (creation de la commade)
+DELIVERY_SLOTS=(                                 # liste des horraires de créneau de livraison choisi aléatoirement 
+    "06:00+01:00[Europe/Paris]-08:00+01:00[Europe/Paris]" 
+    "08:00+01:00[Europe/Paris]-10:00+01:00[Europe/Paris]" 
+    "10:00+01:00[Europe/Paris]-12:00+01:00[Europe/Paris]" 
+    "16:00+01:00[Europe/Paris]-18:00+01:00[Europe/Paris]" 
+    "18:00+01:00[Europe/Paris]-20:00+01:00[Europe/Paris]"
+)
+
+# DELIVERY_OPTIONS=("skill1" "skill2") # liste des nom skill - a décommanter
+
+# normalement pas bessoin modifer
+ORDER_DATE=$(date '+%Y-%m-%d')          # date du jour
+RAND=$(date +%y%m%d%H%M%S)              # valueur peudo aleadoire (ici basé par date) doit faire 17 caractères
+BARCODE_PART=0000$RAND                  # utiliser pour générer les bare code les barecode sont : 
+                                        # {BARECODE_PART}{00000} a {BARECODE_PART}{BARECODES_COUNT}
+PRIMARY_REF=$PREF$RAND                  # primaryOrderReference de la commande
 EOF
 echo "éditer le fichier $SCENARIO"
 return 1
@@ -1780,46 +2044,68 @@ cleanup_grouped_merged_mr() {
       --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() {
+# cleanup_all_ecr_images 12
+# will delete images in all repositories older than 12 weeks
+# cleanup_single_ecr_repository colisweb-api 8
+# will delete images older than 8 weeks in the colisweb-api repository
+cleanup_all_ecr_images() {
+  WEEKS=$1
 
-  REPO=$1
-  WEEKS=${2:-16}
+  # OR to work on bash and zsh
+  CLEAN_BEFORE=$(date -v-${WEEKS}w +%F || date --date="-${WEEKS} weeks" +'%Y-%m-%d')
+  REPOSITORIES=$(aws ecr describe-repositories --output json | jq -r '.[] |.[].repositoryName')
 
-  WEEKS_AGO=$(date -v-${WEEKS}w +%F)
+  while read -r REPOSITORY; do
+    echo "processing ECR repository $REPOSITORY before $CLEAN_BEFORE"
+    cleanup_single_ecr_repository "$CLEAN_BEFORE" "$REPOSITORY"
+  done <<< "$REPOSITORIES"
+}
 
-  #Get all ecr images
-  IMAGES=$(aws ecr describe-images --repository-name $REPO --output json)
+cleanup_single_ecr_repository() {
+  BEFORE=$1
+  REPOSITORY=$2
 
-  #Filter unnecessary values and map `imagePushedAt` to EPOCH
-  NON_LATEST_IMAGES=$(echo $IMAGES | jq '[.imageDetails[] | select(.imageTags | any(endswith("latest")) | not)]')
+  echo "gettings tags for repository $REPOSITORY before $BEFORE"
 
-  #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"
-}
+  ALL_TAGS=$(aws ecr describe-images --repository-name "$REPOSITORY" --output json |
+       jq  '.imageDetails' |
+       jq  '. |= sort_by(.imagePushedAt)' |
+       jq --arg date $BEFORE '.[] | select(.imagePushedAt[0:10] < $date)' |
+       jq  'select((.imageTags != null) or (.imageTags == []))' |
+       jq  'select(.imageTags | any(endswith("latest")) | not)' |
+       jq -r '.imageTags | join(" ")' |
+       sort -u)
 
-# 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')
+  if [ -z "${ALL_TAGS}" ]; then
+    echo "no tag to delete for repository $REPOSITORY"
+  else
+    echo "deleting $(echo $ALL_TAGS | wc -l) tags for $REPOSITORY"
+
+    while read image_tags; do
+      SINGLE_TAG=$(echo $image_tags | grep -o '^\S*')
+
+      DIGESTS_TO_DELETE=$(docker buildx imagetools inspect \
+          949316342391.dkr.ecr.eu-west-1.amazonaws.com/$REPOSITORY:$SINGLE_TAG --raw |
+           jq -r '[.manifests | .[].digest] | join(" imageDigest=") | "imageDigest=" + .' ||
+           echo "")
+
+      TAGS_TO_DELETE=$(echo "$image_tags" | sed 's/[^ ]* */imageTag=&/g')
+
+      export AWS_PAGER=""
+
+      aws ecr batch-delete-image --repository-name "$REPOSITORY" --image-ids $(echo $TAGS_TO_DELETE) > /dev/null 2>&1
+      test -z $DIGESTS_TO_DELETE ||
+        aws ecr batch-delete-image --repository-name "$REPOSITORY" --image-ids $(echo $DIGESTS_TO_DELETE)> /dev/null 2>&1
+    done <<< $ALL_TAGS
+
+    echo "deleted $(echo $ALL_TAGS | wc -l) tags"
+  fi
 
-  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/"}
@@ -1841,6 +2127,23 @@ cleanup_ci_cache() {
   done < <(aws s3 ls $CACHE_BUCKET  --recursive)
 }
 
+cleanup_batch_definitions() {
+  DEFINITION_NAME=$1
+  ARNs=($(
+    aws batch describe-job-definitions \
+    --status ACTIVE \
+    --job-definition-name "$DEFINITION_NAME" |
+      jq '.jobDefinitions | sort_by(-.revision)' |
+      jq 'del( .[0])' |
+      jq -r '.[] | .jobDefinitionArn'
+      )
+    )
+  for A in ${ARNs[@]}; do
+    echo "deregister $A"
+    aws batch deregister-job-definition --job-definition $A
+  done
+  echo "cleaned up all definitions except latest"
+}
 #!/usr/bin/env bash
 
 ftp_ikea_k8s() {
@@ -2296,15 +2599,15 @@ extract_yaml_config_variable() {
 
   if [ ! -f ${CONFIGS_PATH}/common.yaml ]; then
     echo >&2 "Missing $CONFIGS_PATH/common.yaml configuration file"
-    exit 1
+    return 1
   fi
   if [ ! -f ${CONFIGS_PATH}/${ENVIRONMENT}.yaml ]; then
     echo >&2 "Missing $CONFIGS_PATH/$ENVIRONMENT.yaml configuration file"
-    exit 1
+    return 1
   fi
   if [ ! -f ${CONFIGS_PATH}/${ENVIRONMENT}-secrets.yaml ]; then
     echo >&2 "Missing $CONFIGS_PATH/$ENVIRONMENT-secrets.yaml configuration file"
-    exit 1
+    return 1
   fi
 
   result=$(yq -r ${VARIABLE} "$CONFIGS_PATH/$ENVIRONMENT-secrets.yaml")
@@ -2315,10 +2618,10 @@ extract_yaml_config_variable() {
       if [ $? -ne 0 ] || [ "$result" = "null" ]; then
         if [ $OPTIONAL = true ]; then
           echo ""
-          exit 0
+          return 0
         else
           echo >&2 "Missing path $VARIABLE in $CONFIGS_PATH/$ENVIRONMENT-secrets.yaml, $CONFIGS_PATH/$ENVIRONMENT.yaml or $CONFIGS_PATH/common.yaml"
-          exit 1
+          return 1
         fi
       fi
     fi
@@ -2591,7 +2894,7 @@ deploy_chart() {
   if [ ! -d ${root_path}/${path_chart} ] || [ ! -f ${root_path}/${path_chart}/Chart.yaml ]; then
       echo "Bad Chart $root_path/$path_chart : does not exists or missing Chart.yaml"
       print_usage
-      exit 1
+      return 1
   fi
 
   # Unset Kubectl configuration made via the KUBECONFIG env variable
@@ -2674,7 +2977,7 @@ verify_deployments() {
 
     if [ $? -ne 0 ]; then
       echo "at least one deployment failed or timed out (after $TIMEOUT)"
-      exit 1
+      return 1
     fi
   done
 
@@ -2697,7 +3000,7 @@ check_config_file() {
     if [ ! -f ${filename} ]; then
         echo "Missing $filename configuration file"
         print_usage
-        exit 1
+        return 1
     fi
 }
 
@@ -2922,7 +3225,7 @@ emit_datadog_deploy_event() {
     echo "event successfully created check in datadog UI : $url"
   else
     echo " failed to create event "
-    exit 1
+    return 1
   fi
 }