Skip to content
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

fix(terraform_docs): Allow having whitespaces in path to .terraform-docs.yaml config file #796

Merged
merged 6 commits into from
Feb 3, 2025
+16 −5
Merged

fix(terraform_docs): Allow having whitespaces in path to .terraform-docs.yaml config file #796

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
611b708
fix(terraform_docs): fix config path having multiple whitespaces
tarfu Jan 30, 2025
3adde17
fix(terraform-docs): apply suggested fix for script execution
tarfu Jan 30, 2025
ed9db97
fix(terraform-docs): follow suggestion for trimming of additional arg…
tarfu Jan 31, 2025
a6bf17a
fix(terraform-docs): rename variable
tarfu Jan 31, 2025
8fdfb5b
fix(terraform_docs): apply some of yermulnik suggestions
tarfu Feb 3, 2025
12c3edd
Merge branch 'master' into whitespace-fix
MaxymVlasov Feb 3, 2025
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
21 changes: 16 additions & 5 deletions hooks/terraform_docs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ function terraform_docs {
local add_to_existing=false
local create_if_not_exist=false
local use_standard_markers=true
local have_config_flag=false

IFS=";" read -r -a configs <<< "$hook_config"

Expand Down Expand Up @@ -142,10 +143,18 @@ function terraform_docs {
local tf_docs_formatter="md"

else

local config_file=${args#*--config}
config_file=${config_file#*=}
config_file=${config_file% *}
have_config_flag=true
# Enable extended pattern matching operators
shopt -qp extglob || EXTGLOB_IS_NOT_SET=true && shopt -s extglob
# Trim any args before the `--config` arg value
local config_file=${args##*--config@(+([[:space:]])|=)}
# Trim any trailing spaces and args (if any)
config_file="${config_file%%+([[:space:]])?(--*)}"
# Trim `--config` arg and its value from original args as we will
# pass `--config` separately to allow whitespaces in its value
args=${args/--config@(+([[:space:]])|=)$config_file*([[:space:]])/}
# Restore state of `extglob` if we changed it
[[ $EXTGLOB_IS_NOT_SET ]] && shopt -u extglob

# Prioritize `.terraform-docs.yml` `output.file` over
# `--hook-config=--path-to-file=` if it set
Expand Down Expand Up @@ -231,8 +240,10 @@ function terraform_docs {
have_marker=$(grep -o "$insertion_marker_begin" "$output_file") || unset have_marker
[[ ! $have_marker ]] && popd > /dev/null && continue
fi
local config_options
[[ $have_config_flag == true ]] && config_options="--config=$config_file"
# shellcheck disable=SC2086
terraform-docs --output-mode="$output_mode" --output-file="$output_file" $tf_docs_formatter $args ./ > /dev/null
terraform-docs --output-mode="$output_mode" --output-file="$output_file" $tf_docs_formatter "$config_options" $args ./ > /dev/null

popd > /dev/null
done
Expand Down
Loading