get S3 profile using env AWS_PROFILE
This commit is contained in:
		| @@ -7,7 +7,7 @@ import ( | ||||
| 	"github.com/spf13/cobra" | ||||
| ) | ||||
|  | ||||
| const versionStr = "0.9.0" | ||||
| const versionStr = "0.9.1" | ||||
|  | ||||
| var ( | ||||
| 	versionCmd = &cobra.Command{ | ||||
|   | ||||
| @@ -12,6 +12,10 @@ For the main config file to be fetched remotely, pass the URL using `-f [url]`. | ||||
|  | ||||
| If using S3, you should use the s3 protocol URI: `s3://bucketName/key/path`. You will also need to set the env variable `S3_ENDPOINT` to the appropriate value. The flag `--s3-endpoint` can be used to override this value or to set this value, if not already set. | ||||
|  | ||||
| ## Authentication | ||||
|  | ||||
| Currently, only the AWS authentication credentials file `~/.aws/credentials` is supported. For now, the environment variable `AWS_PROFILE` is used to lookup the profile. | ||||
|  | ||||
| ## Scripts | ||||
|  | ||||
| Remote script support is currently limited to http/https endpoints. | ||||
| @@ -44,9 +44,8 @@ func NewS3Fetcher(endpoint string, options ...FetcherOption) (*S3Fetcher, error) | ||||
| 	*/ | ||||
|  | ||||
| 	s3Endpoint := os.Getenv("S3_ENDPOINT") | ||||
| 	creds, err := getS3Credentials("default", s3Endpoint, cfg.HTTPClient) | ||||
| 	creds, err := getS3Credentials(os.Getenv("AWS_PROFILE"), s3Endpoint, cfg.HTTPClient) | ||||
| 	if err != nil { | ||||
| 		println(err.Error()) | ||||
| 		return nil, err | ||||
| 	} | ||||
|  | ||||
| @@ -133,7 +132,7 @@ func getS3Credentials(profile, host string, httpClient *http.Client) (*credentia | ||||
| 	if hdirErr != nil { | ||||
| 		return nil, hdirErr | ||||
| 	} | ||||
| 	s3Creds := credentials.NewFileAWSCredentials(path.Join(homeDir, ".aws", "credentials"), "default") | ||||
| 	s3Creds := credentials.NewFileAWSCredentials(path.Join(homeDir, ".aws", "credentials"), profile) | ||||
| 	credVals, credErr := s3Creds.GetWithContext(&credentials.CredContext{Endpoint: host, Client: httpClient}) | ||||
| 	if credErr != nil { | ||||
| 		return nil, credErr | ||||
|   | ||||
		Reference in New Issue
	
	Block a user