From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0149C3C3C for ; Tue, 1 Apr 2025 01:00:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469214; cv=none; b=ieZ34OMt6/Ix5PSKU3wxdSJUsZ4ot91US95Gztw1JvNoKOcugjFpds0aBZ33pFa/Udy63TLPSYTmV7m6mwejqQ2zMC59s3575BevPwoaML5yzrDagTG/pg/8cNA4tnyZwTyt0vJw/XfwOEgcE35DVWDPN/3DJ2uBkarDJRSp54s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469214; c=relaxed/simple; bh=eLJn/f4sZCJ5jQOvEV8w4AdrTyIjNeumFfHakN3shso=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aoxlu0FLu9uZW0/WbB73fGGBhiGiGEskO6TubT9pcuVXmU+gpq4A4ujVjLWhbSxtu1MWtcpD1P9u3pwNujP5OuqI83Vf7xcN6COjwj6F9Rn79HIFJunlouPLiNvYHoLL6+q+mvj/RXv6XN/9+FzuokPsyYZLfWlXixdBRCeeHJY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=U77i3dUr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="U77i3dUr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F2FEC4CEEA; Tue, 1 Apr 2025 01:00:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469213; bh=eLJn/f4sZCJ5jQOvEV8w4AdrTyIjNeumFfHakN3shso=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U77i3dUrRVIcyaa6wDUVmAlM2iQFtRMKOQNKmt+uOB+58B9YEYqkWjaWfBv+GBQlx HJViXigsw5rWOy9xj91Lz5Y7RAu//fqDH8FKPb82ARBVXocPtgoyn+Wy6BMx3qq6fY SN7BsRcwRlJXYGre9gfaj6cy0n1hUglS8NuKpbl5ih/FWat5JOJGPh7WaVk0HgtkIg yQOyEswkkEO3i4XCC+5c+f7InmHZdO9vEWHOtEPV8pg0D/xABbh1GnWwaLFW1tjInw wUIwfT1ZdrXyV0DtkG5nJ5a9FQDK75hek806Ttuy+GMRcGMpGtyTD7B8rDXVi3Avqn q5iKOyA4j5PHg== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 10/31] terraform/OCI: Use "output yaml" for the signing key Date: Mon, 31 Mar 2025 20:59:39 -0400 Message-ID: <20250401010000.764234-11-cel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250401010000.764234-1-cel@kernel.org> References: <20250401010000.764234-1-cel@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Chuck Lever 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 --- 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