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 04A837E0E8 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=1743469213; cv=none; b=A6EnqPPiGu7pB+2Qd1VfWTUQfBUcQLoj4DzF1B3NbF94prpsVzuGf/eU9KLkDvUZ843JIlT+v/0LAwpJAmvTa4IRWeGfbipMhDUTr5zwMTV1grocGjsUDvhRsv0+iiNs0XMn4jHDYPIHyD4riOhIN5XioosYEww2A4M0wzOiIpY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469213; c=relaxed/simple; bh=QC8rkNw57mkJpu6xmuo/4ITkBhxvptvcKFweDpq3fhs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PkfJdzBk0F/t57UqAKNfMUsExQZ4nuVxvNXD5LkGRRqiwTGfg6xvZ+P+u0J9XVCC+D56SWjPMgmxcSgM/Bhwfz53o65G+vk9Sayio3I8i09LyNwDmrUWCo06WHLRWbwXpf6FMx4UNmJJNLLN+uajrTE1oMorip0yJH6EM5yEPvM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=P7OCk2D0; 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="P7OCk2D0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8351AC4CEE5; Tue, 1 Apr 2025 01:00:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469212; bh=QC8rkNw57mkJpu6xmuo/4ITkBhxvptvcKFweDpq3fhs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P7OCk2D0ba2GEOF4ysGXYwdyx5yIX/9KHVrmV6k+a4g6/fsWWlnqEjzMjT+5GMjD7 mIjPJBqGAWnEucVvDgdthPLRwtpzKtlE7EDAZNflbMrF+iVI1FGHBmOXlB2ogyXU7c fmeZrq+4WP9uoN1o2V8dWKmrn2+qcBy1X/vhaHToLjFDXoYUnjSnWZYCjxFmV9GXfT 6REENfcDpKtTUPpBNAKMLPGu5cNstyMZA6B3VBl4KzbCknoLePi9DGpd9JYA3BzqBo rwGs2EfbCJP4OOBj47h+nKmSyanl+Oli1rNzveX3ncBztMjMCfTYOmf6BT77zCN2tP hMXILXbTxejUQ== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 09/31] terraform/OCI: Use "output yaml" for the user OCID Date: Mon, 31 Mar 2025 20:59:38 -0400 Message-ID: <20250401010000.764234-10-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_ocid", 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 | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index 1589585cd2bd..aced091fa08c 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_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_USER_OCID)) 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)) diff --git a/terraform/oci/kconfigs/Kconfig.identity b/terraform/oci/kconfigs/Kconfig.identity index 3061c12f6de0..392ac584a567 100644 --- a/terraform/oci/kconfigs/Kconfig.identity +++ b/terraform/oci/kconfigs/Kconfig.identity @@ -9,10 +9,12 @@ config TERRAFORM_OCI_TENANCY_OCID config TERRAFORM_OCI_USER_OCID string "OCI user OCID" + output yaml help - The OCI ID of the user to use. - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm + The OCID of the cloud user that kdevops should authenticate as. + See: + + 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" -- 2.48.1