Skip to content

Commit 9c2d764

Browse files
JoshuaSBrownJoshuaSBrown
authored
[DAPS-1651] bug compose env generator (#1656) (#1658)
* [DAPS-1651] fixed bug in compose env generator (#1656), compose_generate_env.sh script was not reading existing values correctly.
1 parent 33676ab commit 9c2d764

File tree

4 files changed

+56
-56
lines changed

4 files changed

+56
-56
lines changed

‎compose/all/compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ services:
138138
DATAFED_GLOBUS_CONTROL_PORT: "${DATAFED_GLOBUS_CONTROL_PORT}"
139139
DATAFED_GCS_COLLECTION_BASE_PATH: "${DATAFED_GCS_COLLECTION_BASE_PATH}"
140140
DATAFED_GCS_COLLECTION_ROOT_PATH: "${DATAFED_GCS_COLLECTION_ROOT_PATH}"
141-
DATAFED_REPO_USER: "${DATAFED_REPO_USER}"
141+
DATAFED_REPO_USER: "datafed"
142142
UID: "${DATAFED_UID}"
143143
HOST_HOSTNAME: "localhost"
144144
DATAFED_AUTHZ_USER: "datafed"

‎compose/all/generate_env.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ SOURCE=$(dirname "$SCRIPT")
44
PROJECT_ROOT=$(realpath "${SOURCE}/../../")
55

66
# Variables specific to running the compose instance
7-
export DATAFED_COMPOSE_REPO_DOMAIN="datafed-repo"
7+
export DATAFED_REPO_DOMAIN="datafed-repo"
88

99
"${PROJECT_ROOT}/scripts/compose_generate_env.sh" -d "$(pwd)" "$@"

‎compose/repo/compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ services:
4747
DATAFED_GLOBUS_CONTROL_PORT: "${DATAFED_GLOBUS_CONTROL_PORT}"
4848
DATAFED_GCS_COLLECTION_BASE_PATH: "${DATAFED_GCS_COLLECTION_BASE_PATH}"
4949
DATAFED_GCS_COLLECTION_ROOT_PATH: "${DATAFED_GCS_COLLECTION_ROOT_PATH}"
50-
DATAFED_REPO_USER: "${DATAFED_REPO_USER}"
50+
DATAFED_REPO_USER: "datafed"
5151
UID: "${DATAFED_UID}"
5252
HOST_HOSTNAME: "localhost"
5353
DATAFED_AUTHZ_USER: "datafed"

‎scripts/compose_generate_env.sh‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -118,16 +118,41 @@ if [ ! -d "$local_DATAFED_WEB_KEY_DIR" ]; then
118118
fi
119119

120120
# Use the new function to get values with proper fallback
121-
local_DATAFED_COMPOSE_DOMAIN=$(get_env_value "DATAFED_COMPOSE_DOMAIN" "localhost")
121+
local_DATAFED_DOMAIN=$(get_env_value "DATAFED_DOMAIN" "localhost")
122122
local_DATAFED_WEB_CERT_NAME="cert.crt"
123123
local_DATAFED_WEB_KEY_NAME="cert.key"
124124

125-
local_DATAFED_WEB_CERT_PATH="${local_DATAFED_WEB_KEY_DIR}/${local_DATAFED_WEB_CERT_NAME}"
126-
local_DATAFED_WEB_CSR_PATH="${local_DATAFED_WEB_KEY_DIR}/cert.csr"
127-
local_DATAFED_WEB_KEY_PATH="${local_DATAFED_WEB_KEY_DIR}/${local_DATAFED_WEB_KEY_NAME}"
125+
local_DATAFED_WEB_CERT_PATH=$(get_env_value "DATAFED_WEB_CERT_PATH" "${local_DATAFED_WEB_KEY_DIR}/${local_DATAFED_WEB_CERT_NAME}")
126+
local_DATAFED_WEB_CSR_PATH=$(get_env_value "DATAFED_WEB_CSR_PATH" "${local_DATAFED_WEB_KEY_DIR}/cert.csr")
127+
local_DATAFED_WEB_KEY_PATH=$(get_env_value "DATAFED_WEB_KEY_PATH" "${local_DATAFED_WEB_KEY_DIR}/${local_DATAFED_WEB_KEY_NAME}")
128128

129-
need_certs="FALSE"
129+
# Get all values using the new function
130+
local_DATAFED_UID=$(get_env_value "DATAFED_UID" "$(id -u)")
131+
local_DATAFED_USER89_PASSWORD=$(get_env_value "DATAFED_USER89_PASSWORD" "")
132+
local_DATAFED_REPO_FORM_PATH=$(get_env_value "DATAFED_REPO_FORM_PATH" "")
133+
local_DATAFED_GLOBUS_APP_SECRET=$(get_env_value "DATAFED_GLOBUS_APP_SECRET" "")
134+
local_DATAFED_GLOBUS_APP_ID=$(get_env_value "DATAFED_GLOBUS_APP_ID" "")
135+
local_DATAFED_GLOBUS_KEY_DIR=$(get_env_value "DATAFED_GLOBUS_KEY_DIR" "${COMPOSE_ENV_DIR}/globus")
136+
local_DATAFED_ZEROMQ_SESSION_SECRET=$(get_env_value "DATAFED_ZEROMQ_SESSION_SECRET" "")
137+
local_DATAFED_HTTPS_SERVER_PORT=$(get_env_value "DATAFED_HTTPS_SERVER_PORT" "443")
138+
local_DATAFED_CONTAINER_LOG_PATH=$(get_env_value "DATAFED_CONTAINER_LOG_PATH" "/opt/datafed/logs")
139+
local_DATAFED_DATABASE_PASSWORD=$(get_env_value "DATAFED_DATABASE_PASSWORD" "butterscotch")
140+
local_DATAFED_DATABASE_IP_ADDRESS=$(get_env_value "DATAFED_DATABASE_IP_ADDRESS" "http://arango")
141+
local_DATAFED_ENABLE_FOXX_TESTS=$(get_env_value "DATAFED_ENABLE_FOXX_TESTS" "FALSE")
142+
local_DATAFED_DATABASE_PORT=$(get_env_value "DATAFED_DATABASE_PORT" "8529")
143+
local_DATAFED_GCS_ROOT_NAME=$(get_env_value "DATAFED_GCS_ROOT_NAME" "DataFed_Compose")
144+
local_DATAFED_GCS_IP=$(get_env_value "DATAFED_GCS_IP" "")
145+
local_DATAFED_REPO_ID_AND_DIR=$(get_env_value "DATAFED_REPO_ID_AND_DIR" "datafed-repo")
146+
local_DATAFED_HOST_COLLECTION_MOUNT=$(get_env_value "DATAFED_HOST_COLLECTION_MOUNT" "$HOME/compose_collection")
147+
local_DATAFED_HOST_DEPLOYMENT_KEY_PATH=$(get_env_value "DATAFED_HOST_DEPLOYMENT_KEY_PATH" "${local_DATAFED_GLOBUS_KEY_DIR}/deployment-key.json")
148+
local_DATAFED_HOST_CRED_FILE_PATH=$(get_env_value "DATAFED_HOST_CRED_FILE_PATH" "${local_DATAFED_GLOBUS_KEY_DIR}/client_cred.json")
149+
local_DATAFED_GCS_COLLECTION_BASE_PATH=$(get_env_value "DATAFED_GCS_COLLECTION_BASE_PATH" "/")
150+
local_DATAFED_GCS_COLLECTION_ROOT_PATH=$(get_env_value "DATAFED_GCS_COLLECTION_ROOT_PATH" "/mnt/datafed")
151+
local_DATAFED_GLOBUS_CONTROL_PORT=$(get_env_value "DATAFED_GLOBUS_CONTROL_PORT" "443")
152+
local_DATAFED_GLOBUS_SUBSCRIPTION=$(get_env_value "DATAFED_GLOBUS_SUBSCRIPTION" "")
153+
local_DATAFED_CORE_LOG_LEVEL=$(get_env_value "DATAFED_CORE_LOG_LEVEL" "3")
130154

155+
need_certs="FALSE"
131156
# Check if we need to generate certificates
132157
if [ "$OVERWRITE_CERTS" = "TRUE" ]; then
133158
echo "Overwrite certs flag enabled. Regenerating SSL certificates..."
@@ -152,48 +177,24 @@ if [ "$need_certs" = "TRUE" ]; then
152177
openssl genrsa -out "$local_DATAFED_WEB_KEY_PATH" 2048
153178
openssl req -new -key "$local_DATAFED_WEB_KEY_PATH" \
154179
-out "${local_DATAFED_WEB_CSR_PATH}" \
155-
-subj "/C=US/ST=TN/L=Oak Ridge/O=ORNL/OU=DLT/CN=${local_DATAFED_COMPOSE_DOMAIN}"
180+
-subj "/C=US/ST=TN/L=Oak Ridge/O=ORNL/OU=DLT/CN=${local_DATAFED_DOMAIN}"
156181
openssl x509 -req -days 3650 \
157182
-in "${local_DATAFED_WEB_CSR_PATH}" \
158183
-signkey "$local_DATAFED_WEB_KEY_PATH" \
159184
-out "$local_DATAFED_WEB_CERT_PATH"
160185
fi
161186

162-
# Get all values using the new function
163-
local_DATAFED_COMPOSE_USER89_PASSWORD=$(get_env_value "DATAFED_COMPOSE_USER89_PASSWORD" "")
164-
165187
# Handle repo domain logic
166-
if [ -z "$(get_env_value "DATAFED_COMPOSE_REPO_DOMAIN" "")" ]; then
167-
if [ "${local_DATAFED_COMPOSE_DOMAIN}" = "localhost" ]; then
168-
local_DATAFED_COMPOSE_REPO_DOMAIN=""
188+
if [ -z "$(get_env_value "DATAFED_REPO_DOMAIN" "")" ]; then
189+
if [ "${local_DATAFED_DOMAIN}" = "localhost" ]; then
190+
local_DATAFED_REPO_DOMAIN=""
169191
else
170-
local_DATAFED_COMPOSE_REPO_DOMAIN="${local_DATAFED_COMPOSE_DOMAIN}"
192+
local_DATAFED_REPO_DOMAIN="${local_DATAFED_DOMAIN}"
171193
fi
172194
else
173-
local_DATAFED_COMPOSE_REPO_DOMAIN=$(get_env_value "DATAFED_COMPOSE_REPO_DOMAIN" "")
195+
local_DATAFED_REPO_DOMAIN=$(get_env_value "DATAFED_REPO_DOMAIN" "")
174196
fi
175197

176-
local_DATAFED_COMPOSE_REPO_FORM_PATH=$(get_env_value "DATAFED_COMPOSE_REPO_FORM_PATH" "")
177-
local_DATAFED_COMPOSE_GLOBUS_APP_SECRET=$(get_env_value "DATAFED_COMPOSE_GLOBUS_APP_SECRET" "")
178-
local_DATAFED_COMPOSE_GLOBUS_APP_ID=$(get_env_value "DATAFED_COMPOSE_GLOBUS_APP_ID" "")
179-
local_DATAFED_GLOBUS_KEY_DIR=$(get_env_value "DATAFED_GLOBUS_KEY_DIR" "${COMPOSE_ENV_DIR}/globus")
180-
local_DATAFED_COMPOSE_ZEROMQ_SESSION_SECRET=$(get_env_value "DATAFED_COMPOSE_ZEROMQ_SESSION_SECRET" "")
181-
local_DATAFED_COMPOSE_HTTPS_SERVER_PORT=$(get_env_value "DATAFED_COMPOSE_HTTPS_SERVER_PORT" "443")
182-
local_DATAFED_COMPOSE_CONTAINER_LOG_PATH=$(get_env_value "DATAFED_COMPOSE_CONTAINER_LOG_PATH" "/opt/datafed/logs")
183-
local_DATAFED_COMPOSE_DATABASE_PASSWORD=$(get_env_value "DATAFED_COMPOSE_DATABASE_PASSWORD" "butterscotch")
184-
local_DATAFED_COMPOSE_DATABASE_IP_ADDRESS=$(get_env_value "DATAFED_COMPOSE_DATABASE_IP_ADDRESS" "http://arango")
185-
local_DATAFED_ENABLE_FOXX_TESTS=$(get_env_value "DATAFED_ENABLE_FOXX_TESTS" "FALSE")
186-
local_DATAFED_COMPOSE_DATABASE_PORT=$(get_env_value "DATAFED_COMPOSE_DATABASE_PORT" "8529")
187-
local_DATAFED_COMPOSE_GCS_IP=$(get_env_value "DATAFED_COMPOSE_GCS_IP" "")
188-
local_DATAFED_HOST_COLLECTION_MOUNT=$(get_env_value "DATAFED_COMPOSE_HOST_COLLECTION_MOUNT" "$HOME/compose_collection")
189-
local_DATAFED_COMPOSE_HOST_DEPLOYMENT_KEY_PATH=$(get_env_value "DATAFED_COMPOSE_HOST_DEPLOYMENT_KEY_PATH" "${local_DATAFED_GLOBUS_KEY_DIR}/deployment-key.json")
190-
local_DATAFED_HOST_CRED_FILE_PATH=$(get_env_value "DATAFED_COMPOSE_HOST_CRED_FILE_PATH" "${local_DATAFED_GLOBUS_KEY_DIR}/client_cred.json")
191-
local_DATAFED_GCS_COLLECTION_BASE_PATH=$(get_env_value "DATAFED_GCS_COLLECTION_BASE_PATH" "/")
192-
local_DATAFED_GCS_COLLECTION_ROOT_PATH=$(get_env_value "DATAFED_GCS_COLLECTION_ROOT_PATH" "/mnt/datafed")
193-
local_DATAFED_GLOBUS_CONTROL_PORT=$(get_env_value "DATAFED_GLOBUS_CONTROL_PORT" "443")
194-
local_DATAFED_GLOBUS_SUBSCRIPTION=$(get_env_value "DATAFED_GLOBUS_SUBSCRIPTION" "")
195-
local_DATAFED_CORE_LOG_LEVEL=$(get_env_value "DATAFED_CORE_LOG_LEVEL" "3")
196-
197198
# Make the logs folder if it doesn't exist
198199
mkdir -p "${COMPOSE_ENV_DIR}/logs"
199200

@@ -208,40 +209,39 @@ touch "$ENV_FILE_PATH"
208209
if [ "${BUILD_METADATA}" == "TRUE" ] || [ "${BUILD_REPO}" == "TRUE" ]; then
209210

210211
cat <<EOF >>"$ENV_FILE_PATH"
211-
DATAFED_HTTPS_SERVER_PORT=${local_DATAFED_COMPOSE_HTTPS_SERVER_PORT}
212-
DATAFED_DOMAIN=${local_DATAFED_COMPOSE_DOMAIN}
213-
DATAFED_UID=$(id -u)
214-
DATAFED_CONTAINER_LOG_PATH=${local_DATAFED_COMPOSE_CONTAINER_LOG_PATH}
212+
DATAFED_HTTPS_SERVER_PORT=${local_DATAFED_HTTPS_SERVER_PORT}
213+
DATAFED_DOMAIN=${local_DATAFED_DOMAIN}
214+
DATAFED_UID=${local_DATAFED_UID}
215+
DATAFED_CONTAINER_LOG_PATH=${local_DATAFED_CONTAINER_LOG_PATH}
215216
DATAFED_CORE_LOG_LEVEL=${local_DATAFED_CORE_LOG_LEVEL}
216217
EOF
217218
fi
218219

219220
if [ "${BUILD_METADATA}" == "TRUE" ]; then
220221
cat <<EOF >>"$ENV_FILE_PATH"
221-
DATAFED_GLOBUS_APP_SECRET=${local_DATAFED_COMPOSE_GLOBUS_APP_SECRET}
222-
DATAFED_GLOBUS_APP_ID=${local_DATAFED_COMPOSE_GLOBUS_APP_ID}
223-
DATAFED_ZEROMQ_SESSION_SECRET=${local_DATAFED_COMPOSE_ZEROMQ_SESSION_SECRET}
224-
DATAFED_WEB_CERT_PATH=/opt/datafed/keys/${local_DATAFED_WEB_CERT_NAME}
225-
DATAFED_WEB_KEY_PATH=/opt/datafed/keys/${local_DATAFED_WEB_KEY_NAME}
226-
DATAFED_DATABASE_PASSWORD=${local_DATAFED_COMPOSE_DATABASE_PASSWORD}
227-
DATAFED_DATABASE_IP_ADDRESS=${local_DATAFED_COMPOSE_DATABASE_IP_ADDRESS}
228-
DATAFED_DATABASE_PORT=${local_DATAFED_COMPOSE_DATABASE_PORT}
222+
DATAFED_GLOBUS_APP_SECRET=${local_DATAFED_GLOBUS_APP_SECRET}
223+
DATAFED_GLOBUS_APP_ID=${local_DATAFED_GLOBUS_APP_ID}
224+
DATAFED_ZEROMQ_SESSION_SECRET=${local_DATAFED_ZEROMQ_SESSION_SECRET}
225+
DATAFED_WEB_CERT_PATH=${local_DATAFED_WEB_CERT_PATH}
226+
DATAFED_WEB_KEY_PATH=${local_DATAFED_WEB_CERT_PATH}
227+
DATAFED_DATABASE_PASSWORD=${local_DATAFED_DATABASE_PASSWORD}
228+
DATAFED_DATABASE_IP_ADDRESS=${local_DATAFED_DATABASE_IP_ADDRESS}
229+
DATAFED_DATABASE_PORT=${local_DATAFED_DATABASE_PORT}
229230
DATAFED_ENABLE_FOXX_TESTS=${local_DATAFED_ENABLE_FOXX_TESTS}
230231
EOF
231232
fi
232233

233234
if [ "${BUILD_REPO}" == "TRUE" ]; then
234235
cat <<EOF >>"$ENV_FILE_PATH"
235-
DATAFED_REPO_USER=datafed
236-
DATAFED_GCS_ROOT_NAME=DataFed_Compose
237-
DATAFED_GCS_IP=${local_DATAFED_COMPOSE_GCS_IP}
238-
DATAFED_REPO_ID_AND_DIR=compose-home
236+
DATAFED_GCS_ROOT_NAME=${local_DATAFED_GCS_ROOT_NAME}
237+
DATAFED_GCS_IP=${local_DATAFED_GCS_IP}
238+
DATAFED_REPO_ID_AND_DIR=${local_DATAFED_REPO_ID_AND_DIR}
239239
DATAFED_HOST_COLLECTION_MOUNT=${local_DATAFED_HOST_COLLECTION_MOUNT}
240-
DATAFED_HOST_DEPLOYMENT_KEY_PATH=${local_DATAFED_COMPOSE_HOST_DEPLOYMENT_KEY_PATH}
240+
DATAFED_HOST_DEPLOYMENT_KEY_PATH=${local_DATAFED_HOST_DEPLOYMENT_KEY_PATH}
241241
DATAFED_HOST_CRED_FILE_PATH=${local_DATAFED_HOST_CRED_FILE_PATH}
242242
DATAFED_GLOBUS_CONTROL_PORT=${local_DATAFED_GLOBUS_CONTROL_PORT}
243243
DATAFED_GLOBUS_SUBSCRIPTION=${local_DATAFED_GLOBUS_SUBSCRIPTION}
244-
DATAFED_REPO_DOMAIN=${local_DATAFED_COMPOSE_REPO_DOMAIN}
244+
DATAFED_REPO_DOMAIN=${local_DATAFED_REPO_DOMAIN}
245245
DATAFED_GCS_COLLECTION_BASE_PATH=${local_DATAFED_GCS_COLLECTION_BASE_PATH}
246246
DATAFED_GCS_COLLECTION_ROOT_PATH=${local_DATAFED_GCS_COLLECTION_ROOT_PATH}
247247
EOF

0 commit comments

Comments
 (0)