Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clarify which AWS CLI tools we're talking about #540

Merged
merged 1 commit into from
Aug 2, 2018
Merged

Clarify which AWS CLI tools we're talking about #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ In order to communicate with the Amazon's EC2 API you will need to pass Knife yo

### AWS Configuration / Credential Files

The preferred method of storing credentials for AWS is to use Amazon's own credential and configuration files. The files allow for multiple "profiles", each with their own set of credentials. Also since these credentials aren't stored in your knife.rb/config.rb files you don't have to worry about accidently checking credentials into a git repository. The configs can be created by hand or generated automatically by running `aws configure` if the aws cli tools are installed.
The preferred method of storing credentials for AWS is to use Amazon's own credential and configuration files. The files allow for multiple "profiles", each with their own set of credentials. Also since these credentials aren't stored in your knife.rb/config.rb files you don't have to worry about accidentally checking credentials into a git repository. The configs can be created by hand or generated automatically by running `aws configure` if the AWS Command Line Interface (awscli) is installed.


See Amazon's [Configuration and Credentials Files](https://docs.aws.amazon.com/cli/latest/userguide/cli-config-files.html) documentation for additional information on the file format and default locations for Linux/Mac & Windows hosts.
Expand Down
4 changes: 2 additions & 2 deletions lib/chef/knife/ec2_base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ def self.included(includer)

option :aws_credential_file,
long: "--aws-credential-file FILE",
description: "File containing AWS credentials as used by AWS command line tools",
description: "File containing AWS credentials as used by the AWS Command Line Interface.",
proc: Proc.new { |key| Chef::Config[:knife][:aws_credential_file] = key }

option :aws_config_file,
long: "--aws-config-file FILE",
description: "File containing AWS configurations as used by aws cmdline tools",
description: "File containing AWS configurations as used by the AWS Command Line Interface.",
proc: Proc.new { |key| Chef::Config[:knife][:aws_config_file] = key }

option :aws_profile,
Expand Down