Commit 4658c29f authored by Guillermo Sanz López's avatar Guillermo Sanz López
Browse files

working with 11 test errors

parent e688da54

services/TS29222_CAPIF_API_Invoker_Management_API/prepare_invoker.sh

+31 −1
Original line number Diff line number Diff line
@@ -20,7 +20,37 @@ while [ $ATTEMPT -lt $MAX_RETRIES ]; do 
    #     --header "X-Vault-Token: $VAULT_TOKEN" \

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

 

   CCF_ID="CCF11111111-2222-3333-4444-555555555555"

    #    CCF_ID="CCF11111111-2222-3333-4444-555555555555"



    # --------------------------------------------------------------

    # 0) Get CCF_ID from helper

    # --------------------------------------------------------------

    HELPER_URL="http://helper:8080/api/getCcfId"

    ATTEMPT_CCFID=0

    CCF_ID=""



    echo "[STEP] Fetching CCF_ID from Helper: $HELPER_URL"

    while [ $ATTEMPT_CCFID -lt $MAX_RETRIES ]; do

    ATTEMPT_CCFID=$((ATTEMPT_CCFID + 1))

    echo "[INFO] Attempt $ATTEMPT_CCFID/$MAX_RETRIES – GET $HELPER_URL"



    RAW=$(curl -sS --fail --connect-timeout 5 --max-time 10 "$HELPER_URL" || true)

    CCF_ID=$(echo "$RAW" | jq -r '.ccf_id // empty' 2>/dev/null)



    if [ -n "$CCF_ID" ]; then

        echo "[INFO] Got CCF_ID=$CCF_ID"

        break

    fi



    echo "[WARN] Helper not ready or invalid response. Retrying in ${RETRY_DELAY}s..."

    sleep $RETRY_DELAY

    done



    if [ -z "$CCF_ID" ]; then

    echo "[ERROR] Unable to retrieve CCF_ID from Helper after $MAX_RETRIES attempts"

    exit 1

    fi





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

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

services/TS29222_CAPIF_API_Provider_Management_API/prepare_provider.sh

+30 −1
Original line number Diff line number Diff line
@@ -15,7 +15,36 @@ while [ $ATTEMPT -lt $MAX_RETRIES ]; do 
    eval "ATTEMPT=\$((ATTEMPT + 1))"

    echo "Attempt $ATTEMPT of $MAX_RETRIES"



    CCF_ID="CCF11111111-2222-3333-4444-555555555555"

    # CCF_ID="CCF11111111-2222-3333-4444-555555555555"



    # --------------------------------------------------------------

    # 0) Get CCF_ID from helper

    # --------------------------------------------------------------

    HELPER_URL="http://helper:8080/api/getCcfId"

    ATTEMPT_CCFID=0

    CCF_ID=""



    echo "[STEP] Fetching CCF_ID from Helper: $HELPER_URL"

    while [ $ATTEMPT_CCFID -lt $MAX_RETRIES ]; do

    ATTEMPT_CCFID=$((ATTEMPT_CCFID + 1))

    echo "[INFO] Attempt $ATTEMPT_CCFID/$MAX_RETRIES – GET $HELPER_URL"



    RAW=$(curl -sS --fail --connect-timeout 5 --max-time 10 "$HELPER_URL" || true)

    CCF_ID=$(echo "$RAW" | jq -r '.ccf_id // empty' 2>/dev/null)



    if [ -n "$CCF_ID" ]; then

        echo "[INFO] Got CCF_ID=$CCF_ID"

        break

    fi



    echo "[WARN] Helper not ready or invalid response. Retrying in ${RETRY_DELAY}s..."

    sleep $RETRY_DELAY

    done



    if [ -z "$CCF_ID" ]; then

    echo "[ERROR] Unable to retrieve CCF_ID from Helper after $MAX_RETRIES attempts"

    exit 1

    fi



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

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

services/TS29222_CAPIF_Security_API/prepare_security.sh

+30 −1
Original line number Diff line number Diff line
@@ -57,7 +57,36 @@ while [ $ATTEMPT -lt $MAX_RETRIES ]; do 
    #     --header "X-Vault-Token: $VAULT_TOKEN" \

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



    CCF_ID="CCF11111111-2222-3333-4444-555555555555"

    # CCF_ID="CCF11111111-2222-3333-4444-555555555555"

    # --------------------------------------------------------------

    # 0) Get CCF_ID from helper

    # --------------------------------------------------------------

    HELPER_URL="http://helper:8080/api/getCcfId"

    ATTEMPT_CCFID=0

    CCF_ID=""



    echo "[STEP] Fetching CCF_ID from Helper: $HELPER_URL"

    while [ $ATTEMPT_CCFID -lt $MAX_RETRIES ]; do

    ATTEMPT_CCFID=$((ATTEMPT_CCFID + 1))

    echo "[INFO] Attempt $ATTEMPT_CCFID/$MAX_RETRIES – GET $HELPER_URL"



    RAW=$(curl -sS --fail --connect-timeout 5 --max-time 10 "$HELPER_URL" || true)

    CCF_ID=$(echo "$RAW" | jq -r '.ccf_id // empty' 2>/dev/null)



    if [ -n "$CCF_ID" ]; then

        echo "[INFO] Got CCF_ID=$CCF_ID"

        break

    fi



    echo "[WARN] Helper not ready or invalid response. Retrying in ${RETRY_DELAY}s..."

    sleep $RETRY_DELAY

    done



    if [ -z "$CCF_ID" ]; then

    echo "[ERROR] Unable to retrieve CCF_ID from Helper after $MAX_RETRIES attempts"

    exit 1

    fi





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

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

services/docker-compose-capif.yml

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ services: 
      - VAULT_PORT=8200

      - LOG_LEVEL=${LOG_LEVEL}

    image: ${REGISTRY_BASE_URL}/helper:${OCF_VERSION}

    depends_on:

      - nginx

    # depends_on:

    #   - nginx



  access-control-policy:

    build:

services/helper/helper_service/certs/.gitkeep

deleted100644 → 0
+0 −0

Empty file deleted.