New retries on prepare scripts (74e79b92) · Commits · OCF / capif

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/clean_capif_docker_services.sh

+19 −2

Original line number	Diff line number	Diff line
		@@ -9,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 true"
		echo " -h : show this help"
		exit 1
		}
		@@ -22,8 +23,10 @@ fi
		FILES=()
		echo "${FILES[@]}"

		REMOVE_IMAGES=false

		# Read params
		while getopts "cvrahmsf:" opt; do
		while getopts "cvrahmsz:" opt; do
		case $opt in
		c)
		echo "Remove Capif services"
		@@ -49,6 +52,10 @@ while getopts "cvrahmsf:" 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
		;;
		@@ -67,9 +74,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"
		GITLAB_BASE_URL=$GITLAB_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 --rmi all
		GITLAB_BASE_URL=$GITLAB_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 *"

services/nginx/nginx_prepare.sh

+107 −29

Original line number	Diff line number	Diff line
		@@ -5,34 +5,112 @@ cd $CERTS_FOLDER
		VAULT_ADDR="http://$VAULT_HOSTNAME:$VAULT_PORT"
		VAULT_TOKEN=$VAULT_ACCESS_TOKEN

		curl -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
		# Success check
		SUCCES_OPERATION=false

		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/ca" 2>/dev/null \| jq -r '.data.data.ca' -j > $CERTS_FOLDER/ca.crt
		--request GET "$VAULT_ADDR/v1/secret/data/ca" \| jq -r '.data.data.ca')

		echo "$RESPONSE"

		# Check if the response is "null" or empty
		if [ -n "$RESPONSE" ] && [ "$RESPONSE" != "null" ]; then
		echo "$RESPONSE" > $CERTS_FOLDER/ca.crt
		openssl verify -CAfile $CERTS_FOLDER/ca.crt $CERTS_FOLDER/ca.crt
		echo "CA Root successfully saved."
		SUCCES_OPERATION=true
		break
		else
		echo "Invalid response ('null' or empty), retrying in $RETRY_DELAY seconds..."
		sleep $RETRY_DELAY
		fi
		done

		if [ "$SUCCES_OPERATION" = false ]; then
		echo "Error: Failed to retrieve a valid response after $MAX_RETRIES attempts."
		exit 1 # Exit with failure
		fi

		curl -k -retry 30 \
		--retry-all-errors \
		--connect-timeout 5 \
		--max-time 10 \
		--retry-delay 10 \
		--retry-max-time 300 \
		# Setup inital value to ATTEMPT and SUCCESS_OPERATION
		ATTEMPT=0
		SUCCES_OPERATION=false

		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" 2>/dev/null \| jq -r '.data.data.cert' -j > $CERTS_FOLDER/server.crt

		curl -k -retry 30 \
		--retry-all-errors \
		--connect-timeout 5 \
		--max-time 10 \
		--retry-delay 10 \
		--retry-max-time 300 \
		--request GET "$VAULT_ADDR/v1/secret/data/server_cert" \| jq -r '.data.data.cert')

		echo "$RESPONSE"

		# Check if the response is "null" or empty
		if [ -n "$RESPONSE" ] && [ "$RESPONSE" != "null" ]; then
		echo "$RESPONSE" > $CERTS_FOLDER/server.crt
		echo "Server Certificate successfully saved."
		ATTEMPT=0
		SUCCES_OPERATION=true
		break
		else
		echo "Invalid response ('null' or empty), retrying in $RETRY_DELAY seconds..."
		sleep $RETRY_DELAY
		fi
		done

		if [ "$SUCCES_OPERATION" = false ]; then
		echo "Error: Failed to retrieve a valid response after $MAX_RETRIES attempts."
		exit 1 # Exit with failure
		fi

		# Setup inital value to ATTEMPT and SUCCESS_OPERATION
		ATTEMPT=0
		SUCCES_OPERATION=false

		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/private" 2>/dev/null \| jq -r '.data.data.key' -j > $CERTS_FOLDER/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" > $CERTS_FOLDER/server.key
		echo "Server Key successfully saved."
		ATTEMPT=0
		SUCCES_OPERATION=true
		break
		else
		echo "Invalid response ('null' or empty), retrying in $RETRY_DELAY seconds..."
		sleep $RETRY_DELAY
		fi
		done

		if [ "$SUCCES_OPERATION" = false ]; then
		echo "Error: Failed to retrieve a valid response after $MAX_RETRIES attempts."
		exit 1 # Exit with failure
		fi

		LOG_LEVEL=$(echo "${LOG_LEVEL}" \| tr '[:upper:]' '[:lower:]')