Skip to content

fix: catalog onboarding issue #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 26, 2025
Merged

fix: catalog onboarding issue #214

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions tests/scripts/pre-validation-deploy-base-ocp-and-monitoring-instances.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,19 @@ TF_VARS_FILE="terraform.tfvars"
cluster_id_value=$(terraform output -state=terraform.tfstate -raw cluster_id)
cluster_resource_group_id_var_name="cluster_resource_group_id"
cluster_resource_group_id_value=$(terraform output -state=terraform.tfstate -raw cluster_resource_group_id)
cloud_monitoring_instance_region_var_name="instance_region"
access_key_var_name="access_key"
access_key_value=$(terraform output -state=terraform.tfstate -raw access_key)
cloud_monitoring_instance_crn_var_name="instance_crn"
cloud_monitoring_instance_crn_value=$(terraform output -state=terraform.tfstate -raw instance_crn)

echo "Appending '${cluster_id_var_name}', '${cluster_resource_group_id_var_name}', '${cloud_monitoring_instance_region_var_name}' and '${access_key_var_name}' input variable values to ${JSON_FILE}.."
echo "Appending '${cluster_id_var_name}', '${cluster_resource_group_id_var_name}', and '${cloud_monitoring_instance_crn_var_name}' input variable values to ${JSON_FILE}.."

cd "${cwd}"
jq -r --arg cluster_id_var_name "${cluster_id_var_name}" \
--arg cluster_id_value "${cluster_id_value}" \
--arg cluster_resource_group_id_var_name "${cluster_resource_group_id_var_name}" \
--arg cluster_resource_group_id_value "${cluster_resource_group_id_value}" \
--arg access_key_var_name "${access_key_var_name}" \
--arg access_key_value "${access_key_value}" \
--arg cloud_monitoring_instance_region_var_name "${cloud_monitoring_instance_region_var_name}" \
--arg cloud_monitoring_instance_region_var_value "${REGION}" \
'. + {($cluster_id_var_name): $cluster_id_value, ($cluster_resource_group_id_var_name): $cluster_resource_group_id_value, ($cloud_monitoring_instance_region_var_name): $cloud_monitoring_instance_region_var_value, ($access_key_var_name): $access_key_value}' "${JSON_FILE}" > tmpfile && mv tmpfile "${JSON_FILE}" || exit 1
--arg cloud_monitoring_instance_crn_var_name "${cloud_monitoring_instance_crn_var_name}" \
--arg cloud_monitoring_instance_crn_var_value "${cloud_monitoring_instance_crn_value}" \
'. + {($cluster_id_var_name): $cluster_id_value, ($cluster_resource_group_id_var_name): $cluster_resource_group_id_value, ($cloud_monitoring_instance_crn_var_name): $cloud_monitoring_instance_crn_var_value}' "${JSON_FILE}" > tmpfile && mv tmpfile "${JSON_FILE}" || exit 1

echo "Pre-validation complete successfully"
)