[RFC PATCH 10/31] terraform/OCI: Use "output yaml" for the signing key

[cel@kernel.org]

From: Chuck Lever <chuck.lever@oracle.com>

Refactor:  Remove the line in terraform.Makefile that sets
"terraform_oci_user_private_key_path" and just pass it directly
from Kconfig via an "output yaml" directive.

As an additional clean up, update the help text.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 scripts/terraform.Makefile              |  1 -
 terraform/oci/kconfigs/Kconfig.identity | 11 +++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile
index aced091fa08c..b631b4c09a0e 100644
--- a/scripts/terraform.Makefile
+++ b/scripts/terraform.Makefile
@@ -96,7 +96,6 @@ endif
 
 ifeq (y,$(CONFIG_TERRAFORM_OCI))
 TERRAFORM_EXTRA_VARS += terraform_oci_region=$(subst ",,$(CONFIG_TERRAFORM_OCI_REGION))
-TERRAFORM_EXTRA_VARS += terraform_oci_user_private_key_path=$(subst ",,$(CONFIG_TERRAFORM_OCI_USER_PRIVATE_KEY_PATH))
 TERRAFORM_EXTRA_VARS += terraform_oci_user_fingerprint=$(subst ",,$(CONFIG_TERRAFORM_OCI_USER_FINGERPRINT))
 TERRAFORM_EXTRA_VARS += terraform_oci_availablity_domain=$(subst ",,$(CONFIG_TERRAFORM_OCI_AVAILABLITY_DOMAIN))
 TERRAFORM_EXTRA_VARS += terraform_oci_compartment_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_COMPARTMENT_OCID))
diff --git a/terraform/oci/kconfigs/Kconfig.identity b/terraform/oci/kconfigs/Kconfig.identity
index 392ac584a567..87f5457995f5 100644
--- a/terraform/oci/kconfigs/Kconfig.identity
+++ b/terraform/oci/kconfigs/Kconfig.identity
@@ -17,11 +17,14 @@ config TERRAFORM_OCI_USER_OCID
 	  https://docs.oracle.com/en-us/iaas/Content/API/Concepts/apisigningkey.htm#five
 
 config TERRAFORM_OCI_USER_PRIVATE_KEY_PATH
-	string "OCI user private key path"
+	string "Pathname to private key file"
+	output yaml
 	help
-	  Path to the file containing the private key of the user.
-	  Read this:
-	  https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm
+	  Pathname to the local file containing the signing key of
+	  the user. You can upload an pre-existing key, or generate
+	  one on the OCI cloud console and download it. See:
+
+	  https://docs.oracle.com/en-us/iaas/Content/API/Concepts/apisigningkey.htm#two
 
 config TERRAFORM_OCI_USER_FINGERPRINT
 	string "OCI user fingerprint"
-- 
2.48.1