Merge pull request #2333 from Bash-it/ira/completion-cleanup

Author: seefood

.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 ---
 # fail_fast: true
 minimum_pre_commit_version: 1.18.1
-exclude: "docs/_build/"
+exclude: "docs/_build/|vendor/"
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.3.0

completion/available/terraform.completion.bash

@@ -1,28 +1,28 @@
 # shellcheck shell=bash
+about-completion "terraform/tofu completion"
 
-if _command_exists terraform; then
-
-	# Don't handle completion if it's already managed
-	complete -p terraform &> /dev/null && return
-
-	# Terraform completes itself
-	complete -C terraform terraform
-
-elif _command_exists tofu; then
-
-	# Don't handle completion if it's already managed
-	complete -p tofu &> /dev/null && return
-
-	# OpenTofu completes itself
-	complete -C tofu tofu
+# Note, this is not using the _bash-it-completion-helper-necessary function
+# because it's a multiple choice case, and will therefore produce more
+# sensible log messages.
 
+# Check if at least one of the binaries is available (OR logic)
+if ! _binary_exists terraform && ! _binary_exists tofu; then
+	_log_warning "Without 'terraform' or 'tofu' installed, this completion won't be too useful."
+	return 1
 fi
 
+# Handle terraform completion if available and not already managed
+if _binary_exists terraform; then
+	_bash-it-completion-helper-sufficient terraform || {
+		# Terraform completes itself
+		complete -C terraform terraform
+	}
+fi
 
-
-## TODO: change the logic to the new way of doing things?
-## Make sure terraform is installed
-#_bash-it-completion-helper-necessary terraform || return
-
-## Don't handle completion if it's already managed
-#_bash-it-completion-helper-sufficient terraform || return
+# Handle tofu completion if available and not already managed
+if _binary_exists tofu; then
+	_bash-it-completion-helper-sufficient tofu || {
+		# OpenTofu completes itself
+		complete -C tofu tofu
+	}
+fi