From patchwork Tue Apr 1 00:59:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034257 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 656017E0E8 for ; Tue, 1 Apr 2025 01:00:12 +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=1743469212; cv=none; b=U+LIWQByOOnXXAbS/FmjlCuBnwoymxB89Pw8il2MqPkMGE7XGtRw+/+X0hUZhTSw3hkAEjoknz2lmGD/nIleOO3SQV7ol75RqvAQRL4jW9Cu189aJrDKPkExB1i2iYvqe6SjNEXcGVBWjT2e9gd/UWq93WrCXxfIDwk1i1E0OU8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469212; c=relaxed/simple; bh=ndzEGUjlnkfBHRdZ+fSleavEDD2fEdSDkpWfYvblCks=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NauadEci02NAkPEDxvJTGTuSJURpSY9bTvzWzoPsJqDi+ICXtQZ9vAdROgHcU8Pt6pJ775jfrQLFliooxTVxK7UNy2/ZxbUonqUEGoNl2S46XkIrHSZaeUVSgFayEV18RRah5m1lqjHK2FXK7ULy8DOwzTF9cIzBaGhC+7qSRtU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hJwPpCtV; 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="hJwPpCtV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3972C4CEEB; Tue, 1 Apr 2025 01:00:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469212; bh=ndzEGUjlnkfBHRdZ+fSleavEDD2fEdSDkpWfYvblCks=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hJwPpCtV1uAx7EnXN5evmFQ6oUPazLg+U1ecfQhkzx2g25vscpLMQAb+J8rC567Pl r8G1IvwDTvHHJaR453pZBM/M9l5EVXJe9x95YWmC/SbF4T89YpTKLdu+EEZQBkww4D VZ9ANDqY6dG05vbUDIOROGubTP3z+ywytOwZkWxI7IJAatc9vQSaVVMqL6SfHNEJhn RBs6LC+3POZQPZ/dt3HrHwzbr1q6hUCyEpT2TIro07iaojEs5VrS3KbOGJqLbKKFc1 77w2yDF2cE7if9rpe4NRBnjPFqJ8uA7J/WUySWMon4zbrAwT2f1VR53uVQoAa7aTG3 8BMIzpKtxJP0A== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 08/31] terraform/OCI: Use "output yaml" for the tenancy OCID Date: Mon, 31 Mar 2025 20:59:37 -0400 Message-ID: <20250401010000.764234-9-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 From: Chuck Lever Refactor: Remove the line in terraform.Makefile that sets "terraform_oci_tenancy_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 | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index 3235c1af84b9..1589585cd2bd 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_tenancy_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_TENANCY_OCID)) 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)) diff --git a/terraform/oci/kconfigs/Kconfig.identity b/terraform/oci/kconfigs/Kconfig.identity index 928c700d9bd4..3061c12f6de0 100644 --- a/terraform/oci/kconfigs/Kconfig.identity +++ b/terraform/oci/kconfigs/Kconfig.identity @@ -1,9 +1,11 @@ config TERRAFORM_OCI_TENANCY_OCID - string "OCI tenant OCID" + string "OCI tenancy OCID" + output yaml help - The OCI ID of the tenancy to use. - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm + The OCID of the tenancy in which to create kdevops + resources. See: + + https://docs.oracle.com/en-us/iaas/Content/API/Concepts/apisigningkey.htm#five config TERRAFORM_OCI_USER_OCID string "OCI user OCID"