Skip to content

Commit 99af1eb

Browse files
committed
terraform/AWS: Use "output yaml" for the profile setting
Refactor: Remove the line in terraform.Makefile that sets "terraform_aws_profile", 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 <[email protected]>
1 parent cd82108 commit 99af1eb

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

scripts/terraform.Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ KDEVOPS_MRPROPER += $(KDEVOPS_NODES)
4848
DEFAULT_DEPS_REQS_EXTRA_VARS += $(KDEVOPS_TFVARS)
4949

5050
ifeq (y,$(CONFIG_TERRAFORM_AWS))
51-
TERRAFORM_EXTRA_VARS += terraform_aws_profile=$(subst ",,$(CONFIG_TERRAFORM_AWS_PROFILE))
5251
TERRAFORM_EXTRA_VARS += terraform_aws_region=$(subst ",,$(CONFIG_TERRAFORM_AWS_REGION))
5352
TERRAFORM_EXTRA_VARS += terraform_aws_av_region=$(subst ",,$(CONFIG_TERRAFORM_AWS_AV_REGION))
5453
TERRAFORM_EXTRA_VARS += terraform_aws_ami_owner=$(subst ",,$(CONFIG_TERRAFORM_AWS_AMI_OWNER))

terraform/aws/kconfigs/Kconfig.identity

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
config TERRAFORM_AWS_PROFILE
2-
prompt "AWS profile to use"
3-
string
2+
string "AWS authentication profile to use"
3+
output yaml
44
default "default"
55
help
6-
This option sets the value of the Terraform aws_profile
7-
variable. The AWS profile specifies an IAM user and secret
8-
key that Terraform uses to authenticate to AWS.
6+
This option sets the value of the terraform provider's
7+
aws_profile argument. An AWS profile specifies the IAM
8+
user and secret key that both terraform and the "aws"
9+
command line utility use to authenticate to AWS.
910

1011
AWS profiles are set up in ~/.aws/credentials using the
1112
"aws configure" command. You may also edit this file by

0 commit comments

Comments
 (0)