kdevops.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
From: Daniel Gomez <da.gomez@samsung.com>
To: "mcgrof@kernel.org" <mcgrof@kernel.org>
Cc: "kdevops@lists.linux.dev" <kdevops@lists.linux.dev>,
	"jlayton@kernel.org" <jlayton@kernel.org>,
	Daniel Gomez <da.gomez@samsung.com>
Subject: [PATCH 2/5] terraform: aws: hide AWS availability region option
Date: Tue, 12 Sep 2023 19:49:14 +0000	[thread overview]
Message-ID: <20230912194908.939107-3-da.gomez@samsung.com> (raw)
In-Reply-To: <20230912194908.939107-1-da.gomez@samsung.com>

This commit is part of the propagation fix found by Jeff
Layton in the choice/endchoice Kconfig option.

TERRAFORM_AWS_AV_REGION is a multichoice with single choice option
as it depends on AWS region multichoice option. Hide the option by
removing the string and assign the value automatically with its
AWS region option dependency.

Also, s/aws/AWS/g.

Signed-off-by: Daniel Gomez <da.gomez@samsung.com>
---
 terraform/aws/Kconfig | 36 +++++++++---------------------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git a/terraform/aws/Kconfig b/terraform/aws/Kconfig
index 158a0d63..cf3d59f0 100644
--- a/terraform/aws/Kconfig
+++ b/terraform/aws/Kconfig
@@ -7,21 +7,21 @@ choice
 config TERRAFORM_AWS_US_WEST_1
 	bool "us-west-1 - North California"
 	help
-	  This option will set the aws region to us-west-1.
+	  This option will set the AWS region to us-west-1.
 
 config TERRAFORM_AWS_US_WEST_2
 	bool "us-west-2 - Oregon"
 	help
-	  This option will set the aws region to us-west-2.
+	  This option will set the AWS region to us-west-2.
 
 endchoice
 
 config TERRAFORM_AWS_REGION
-	string "AWS region"
+	string
 	default "us-west-1" if TERRAFORM_AWS_US_WEST_1
 	default "us-west-2" if TERRAFORM_AWS_US_WEST_2
 	help
-	  This option will set the aws region to the specified value.
+	  This option will set the AWS region to the specified value.
 
 	  If you wish to expand on this list send a patch after reading
 	  this list:
@@ -30,7 +30,7 @@ config TERRAFORM_AWS_REGION
 
 	  Note that if you change region the AMI may change as well even
 	  for the same distribution. At least that applies to Amazon EC2
-	  optimized images. Use the aws console, to set that up it will
+	  optimized images. Use the AWS console, to set that up it will
 	  ask you for your credentials and then a region. Before adding
 	  an entry for ami image be sure you are on the region and then
 	  query with something like:
@@ -57,30 +57,12 @@ config TERRAFORM_AWS_REGION
 	  aws ec2 describe-images --image-ids ami-0699f753302dd8b00 | grep OwnerId
 	    "OwnerId": "137112412989",
 
-choice
-	prompt "AWS availability region to use"
-	default TERRAFORM_AWS_AV_US_WEST_1B
-
-config TERRAFORM_AWS_AV_US_WEST_1B
-	bool "us-west-1b"
-	depends on TERRAFORM_AWS_US_WEST_1
-	help
-	  This option will set the aws availiability region to us-west-1b.
-
-config TERRAFORM_AWS_AV_US_WEST_2B
-	bool "us-west-2b"
-	depends on TERRAFORM_AWS_US_WEST_2
-	help
-	  This option will set the aws availiability region to us-west-2b.
-
-endchoice
-
 config TERRAFORM_AWS_AV_REGION
-	string "AWS availablity region"
-	default "us-west-1b" if TERRAFORM_AWS_AV_US_WEST_1B
-	default "us-west-2b" if TERRAFORM_AWS_AV_US_WEST_2B
+	string
+	default "us-west-1b" if TERRAFORM_AWS_US_WEST_1
+	default "us-west-2b" if TERRAFORM_AWS_US_WEST_2
 	help
-	  This option will set the aws availablity region to the specified
+	  This option will set the AWS availablity region to the specified
 	  value.
 
 	  If you wish to expand on this list send a patch after reading this
-- 
2.39.2

  parent reply	other threads:[~2023-09-12 19:54 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CGME20230912194912eucas1p20d99edc0e417cda49b132eb8b7777198@eucas1p2.samsung.com>
2023-09-12 19:49 ` [PATCH 0/5] Fix choice/endchoice kconfig options Daniel Gomez
     [not found]   ` <CGME20230912194914eucas1p2e6fc3cdcb7745a011c0760849f08eca8@eucas1p2.samsung.com>
2023-09-12 19:49     ` [PATCH 1/5] terraform: gce: remove redundant string for cpu and mem choice Daniel Gomez
     [not found]   ` <CGME20230912194916eucas1p18db4cbc48e72969e5ab4bdb7a0bb1ae9@eucas1p1.samsung.com>
2023-09-12 19:49     ` Daniel Gomez [this message]
     [not found]   ` <CGME20230912194917eucas1p255a2d6e940671576c95355d4ab9e99d4@eucas1p2.samsung.com>
2023-09-12 19:49     ` [PATCH 3/5] terraform: aws: hide TERRAFORM_AWS_AMI_OWNER and drop AWS name search Daniel Gomez
     [not found]   ` <CGME20230912194919eucas1p1acf335160e5a2750745c5fba9084b080@eucas1p1.samsung.com>
2023-09-12 19:49     ` [PATCH 4/5] terraform: aws: drop multichoice option for TERRAFORM_AWS_VIRT_TYPE Daniel Gomez
     [not found]   ` <CGME20230912194920eucas1p188665453a470e3ef71f957c1b063ba4a@eucas1p1.samsung.com>
2023-09-12 19:49     ` [PATCH 5/5] terraform: aws: hide TERRAFORM_AWS_INSTANCE_TYPE Daniel Gomez
2023-09-12 21:49   ` [PATCH 0/5] Fix choice/endchoice kconfig options Luis Chamberlain
2023-09-13  4:56     ` Luis Chamberlain

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230912194908.939107-3-da.gomez@samsung.com \
    --to=da.gomez@samsung.com \
    --cc=jlayton@kernel.org \
    --cc=kdevops@lists.linux.dev \
    --cc=mcgrof@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).