Commit 1f1131f7 authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Merge branch 'OCFXX-Improve_local_scripts' into 'staging' 

Ocfxx improve local scripts

See merge request !105
parents 225caba9 90e93a35

services/TS29222_CAPIF_API_Invoker_Management_API/prepare_invoker.sh

+31 −10
Original line number Diff line number Diff line 
#!/bin/bash





VAULT_ADDR="http://$VAULT_HOSTNAME:$VAULT_PORT"

VAULT_TOKEN=$VAULT_ACCESS_TOKEN



curl  -vv -k -retry 30 \

    --retry-all-errors \

    --connect-timeout 5 \

    --max-time 10 \

    --retry-delay 10 \

    --retry-max-time 300 \

# Maximum number of retry attempts

MAX_RETRIES=30

# Delay between retries (in seconds)

RETRY_DELAY=10

# Attempt counter

ATTEMPT=0



while [ $ATTEMPT -lt $MAX_RETRIES ]; do

    # Increment ATTEMPT using eval

    eval "ATTEMPT=\$((ATTEMPT + 1))"

    echo "Attempt $ATTEMPT of $MAX_RETRIES"



    # Make the request to Vault and store the response in a variable

    RESPONSE=$(curl -s -k --connect-timeout 5 --max-time 10 \

        --header "X-Vault-Token: $VAULT_TOKEN" \

    --request GET "$VAULT_ADDR/v1/secret/data/server_cert/pub" 2>/dev/null | jq -r '.data.data.pub_key' -j > /usr/src/app/api_invoker_management/pubkey.pem

        --request GET "$VAULT_ADDR/v1/secret/data/server_cert/pub" | jq -r '.data.data.pub_key')



    echo "$RESPONSE"



    # Check if the response is "null" or empty

    if [ -n "$RESPONSE" ] && [ "$RESPONSE" != "null" ]; then

        echo "$RESPONSE" > /usr/src/app/api_invoker_management/pubkey.pem

        echo "Public key successfully saved."

        gunicorn -k uvicorn.workers.UvicornH11Worker --bind 0.0.0.0:8080 \

         --chdir /usr/src/app/api_invoker_management wsgi:app

        exit 0  # Exit successfully

    else

        echo "Invalid response ('null' or empty), retrying in $RETRY_DELAY seconds..."

        sleep $RETRY_DELAY

    fi

done



echo "Error: Failed to retrieve a valid response after $MAX_RETRIES attempts."

exit 1  # Exit with failure

services/TS29222_CAPIF_API_Provider_Management_API/prepare_provider.sh

+31 −9
Original line number Diff line number Diff line
@@ -3,15 +3,37 @@ 
VAULT_ADDR="http://$VAULT_HOSTNAME:$VAULT_PORT"

VAULT_TOKEN=$VAULT_ACCESS_TOKEN



curl  -vv -k -retry 30 \

    --retry-all-errors \

    --connect-timeout 5 \

    --max-time 10 \

    --retry-delay 10 \

    --retry-max-time 300 \

# Maximum number of retry attempts

MAX_RETRIES=30

# Delay between retries (in seconds)

RETRY_DELAY=10

# Attempt counter

ATTEMPT=0



while [ $ATTEMPT -lt $MAX_RETRIES ]; do

    # Increment ATTEMPT using eval

    eval "ATTEMPT=\$((ATTEMPT + 1))"

    echo "Attempt $ATTEMPT of $MAX_RETRIES"



    # Make the request to Vault and store the response in a variable

    RESPONSE=$(curl -s -k --connect-timeout 5 --max-time 10 \

        --header "X-Vault-Token: $VAULT_TOKEN" \

    --request GET "$VAULT_ADDR/v1/secret/data/server_cert/pub" 2>/dev/null | jq -r '.data.data.pub_key' -j > /usr/src/app/api_provider_management/pubkey.pem

        --request GET "$VAULT_ADDR/v1/secret/data/server_cert/pub" | jq -r '.data.data.pub_key')



    echo "$RESPONSE"



    # Check if the response is "null" or empty

    if [ -n "$RESPONSE" ] && [ "$RESPONSE" != "null" ]; then

        echo "$RESPONSE" > /usr/src/app/api_provider_management/pubkey.pem

        echo "Public key successfully saved."

        gunicorn -k uvicorn.workers.UvicornH11Worker --bind 0.0.0.0:8080 \

         --chdir /usr/src/app/api_provider_management wsgi:app

        exit 0  # Exit successfully

    else

        echo "Invalid response ('null' or empty), retrying in $RETRY_DELAY seconds..."

        sleep $RETRY_DELAY

    fi

done



echo "Error: Failed to retrieve a valid response after $MAX_RETRIES attempts."

exit 1  # Exit with failure

services/TS29222_CAPIF_Security_API/prepare_security.sh

+30 −10
Original line number Diff line number Diff line
@@ -3,17 +3,37 @@ 
VAULT_ADDR="http://$VAULT_HOSTNAME:$VAULT_PORT"

VAULT_TOKEN=$VAULT_ACCESS_TOKEN



# Maximum number of retry attempts

MAX_RETRIES=30

# Delay between retries (in seconds)

RETRY_DELAY=10

# Attempt counter

ATTEMPT=0



while [ $ATTEMPT -lt $MAX_RETRIES ]; do

    # Increment ATTEMPT using eval

    eval "ATTEMPT=\$((ATTEMPT + 1))"

    echo "Attempt $ATTEMPT of $MAX_RETRIES"



curl  -k -retry 30 \

    --retry-all-errors \

    --connect-timeout 5 \

    --max-time 10 \

    --retry-delay 10 \

    --retry-max-time 300 \

    # Make the request to Vault and store the response in a variable

    RESPONSE=$(curl -s -k --connect-timeout 5 --max-time 10 \

        --header "X-Vault-Token: $VAULT_TOKEN" \

    --request GET "$VAULT_ADDR/v1/secret/data/server_cert/private" 2>/dev/null | jq -r '.data.data.key' -j > /usr/src/app/capif_security/server.key

        --request GET "$VAULT_ADDR/v1/secret/data/server_cert/private" | jq -r '.data.data.key')



    echo "$RESPONSE"



    # Check if the response is "null" or empty

    if [ -n "$RESPONSE" ] && [ "$RESPONSE" != "null" ]; then

        echo "$RESPONSE" > /usr/src/app/capif_security/server.key

        echo "Public key successfully saved."

        gunicorn -k uvicorn.workers.UvicornH11Worker --bind 0.0.0.0:8080 \

         --chdir /usr/src/app/capif_security wsgi:app

        exit 0  # Exit successfully

    else

        echo "Invalid response ('null' or empty), retrying in $RETRY_DELAY seconds..."

        sleep $RETRY_DELAY

    fi

done



echo "Error: Failed to retrieve a valid response after $MAX_RETRIES attempts."

exit 1  # Exit with failure

services/check_services_are_running.sh

+8 −8
Original line number Diff line number Diff line 
#!/bin/bash

source $(dirname "$(readlink -f "$0")")/variables.sh



export CAPIF_PRIV_KEY=

export CAPIF_PRIV_KEY_BASE_64=

export MONITORING=

export LOG_LEVEL=DEBUG



running="$(LOG_LEVEL=$LOG_LEVEL docker compose -f docker-compose-vault.yml ps --services --all --filter "status=running")"

services="$(LOG_LEVEL=$LOG_LEVEL docker compose -f docker-compose-vault.yml ps --services --all)"

running="$(REGISTRY_BASE_URL=$REGISTRY_BASE_URL OCF_VERSION=$OCF_VERSION CAPIF_HOSTNAME=$CAPIF_HOSTNAME docker compose -f docker-compose-vault.yml ps --services --all --filter "status=running")"

services="$(REGISTRY_BASE_URL=$REGISTRY_BASE_URL OCF_VERSION=$OCF_VERSION CAPIF_HOSTNAME=$CAPIF_HOSTNAME docker compose -f docker-compose-vault.yml ps --services --all)"

if [ "$running" != "$services" ]; then

    echo "Following Vault services are not running:"

    # Bash specific
@@ -15,8 +15,8 @@ else 
    echo "All Vault services are running"

fi



running="$(LOG_LEVEL=$LOG_LEVEL docker compose -f docker-compose-capif.yml ps --services --all --filter "status=running")"

services="$(LOG_LEVEL=$LOG_LEVEL docker compose -f docker-compose-capif.yml ps --services --all)"

running="$(REGISTRY_BASE_URL=$REGISTRY_BASE_URL SERVICES_DIR=$SERVICES_DIR OCF_VERSION=$OCF_VERSION CAPIF_HOSTNAME=$CAPIF_HOSTNAME MONITORING=$MONITORING_STATE LOG_LEVEL=$LOG_LEVEL docker compose -f docker-compose-capif.yml ps --services --all --filter "status=running")"

services="$(REGISTRY_BASE_URL=$REGISTRY_BASE_URL SERVICES_DIR=$SERVICES_DIR OCF_VERSION=$OCF_VERSION CAPIF_HOSTNAME=$CAPIF_HOSTNAME MONITORING=$MONITORING_STATE LOG_LEVEL=$LOG_LEVEL docker compose -f docker-compose-capif.yml ps --services --all)"

if [ "$running" != "$services" ]; then

    echo "Following CCF services are not running:"

    # Bash specific
@@ -26,8 +26,8 @@ else 
    echo "All CCF services are running"

fi



running="$(LOG_LEVEL=$LOG_LEVEL docker compose -f docker-compose-register.yml ps --services --all --filter "status=running")"

services="$(LOG_LEVEL=$LOG_LEVEL docker compose -f docker-compose-register.yml ps --services --all)"

running="$(REGISTRY_BASE_URL=$REGISTRY_BASE_URL SERVICES_DIR=$SERVICES_DIR OCF_VERSION=$OCF_VERSION CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 LOG_LEVEL=$LOG_LEVEL docker compose -f docker-compose-register.yml ps --services --all --filter "status=running")"

services="$(REGISTRY_BASE_URL=$REGISTRY_BASE_URL SERVICES_DIR=$SERVICES_DIR OCF_VERSION=$OCF_VERSION CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 LOG_LEVEL=$LOG_LEVEL docker compose -f docker-compose-register.yml ps --services --all)"

if [ "$running" != "$services" ]; then

    echo "Following Register services are not running:"

    # Bash specific

services/clean_capif_docker_services.sh

+20 −8
Original line number Diff line number Diff line 
#!/bin/bash



# Directories variables setup (no modification needed)

export SERVICES_DIR=$(dirname "$(readlink -f "$0")")

export CAPIF_BASE_DIR=$(dirname "$SERVICES_DIR")

# Path to the register config.yaml file

REGISTER_CONFIG_FILE="$SERVICES_DIR/register/config.yaml"

source $(dirname "$(readlink -f "$0")")/variables.sh



help() {

  echo "Usage: $1 <options>"
@@ -14,6 +9,7 @@ help() { 
  echo "       -m : Clean monitoring service"

  echo "       -s : Clean Robot Mock service"

  echo "       -a : Clean all services"

  echo "       -z : Clean images generated by docker-compose. Boolean. Default false"

  echo "       -h : show this help"

  exit 1

}
@@ -28,7 +24,7 @@ FILES=() 
echo "${FILES[@]}"



# Read params

while getopts "cvrahms" opt; do

while getopts "cvrahmsz:" opt; do

  case $opt in

    c)

      echo "Remove Capif services"
@@ -54,6 +50,10 @@ while getopts "cvrahms" opt; do 
      echo "Remove all services"

      FILES=("$SERVICES_DIR/docker-compose-capif.yml" "$SERVICES_DIR/docker-compose-vault.yml" "$SERVICES_DIR/docker-compose-register.yml" "$SERVICES_DIR/docker-compose-mock-server.yml" "$SERVICES_DIR//monitoring/docker-compose.yml")

      ;;

    z)

      echo "Remove images generated by docker-compose"

      REMOVE_IMAGES=$OPTARG

      ;;

    h)

      help

      ;;
@@ -72,9 +72,19 @@ done 
echo "after check"

echo "${FILES[@]}"



echo "Remove images set to $REMOVE_IMAGES"

if [ $REMOVE_IMAGES == "true" ] ; then

  echo "Removing images generated by docker-compose"

  REMOVE_IMAGES="--rmi all"

else

  echo "Not removing images generated by docker-compose"

  REMOVE_IMAGES=""

fi





for FILE in "${FILES[@]}"; do

  echo "Executing 'docker compose down' for file $FILE"

  CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 DUID=$DUID DGID=$DGID MONITORING=$MONITORING_STATE LOG_LEVEL=$LOG_LEVEL docker compose -f "$FILE" down --rmi all

  REGISTRY_BASE_URL=$REGISTRY_BASE_URL SERVICES_DIR=$SERVICES_DIR OCF_VERSION=$OCF_VERSION CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 DUID=$DUID DGID=$DGID MONITORING=$MONITORING_STATE LOG_LEVEL=$LOG_LEVEL docker compose -f "$FILE" down $REMOVE_IMAGES

  status=$?

    if [ $status -eq 0 ]; then

        echo "*** Removed Service from $FILE ***"
@@ -83,6 +93,8 @@ for FILE in "${FILES[@]}"; do 
    fi

done



# Path to the register config.yaml file

REGISTER_CONFIG_FILE="$SERVICES_DIR/register/config.yaml"

# Check if the backup config.yaml file exists before restoring

if [ -f "$REGISTER_CONFIG_FILE.bak" ]; then

  git update-index --no-assume-unchanged "$REGISTER_CONFIG_FILE.bak"