Skip to content

Commit 6a4cf4c

Browse files
committed
Merge pull request #33 from quiddle/loosen-aws-option-requirements
Loosen AWS option requirements
2 parents c66374a + 929b115 commit 6a4cf4c

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

README.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,16 @@ For detailed information on how configuration of plugins works, please refer to
6262
**WARNING: Don't share a configuration object between [ember-cli-deploy-s3](https://github.com/ember-cli-deploy/ember-cli-deploy-s3) and this plugin. The way these two plugins read their configuration has sideeffects which will unfortunately break your deploy if you share one configuration object between the two** (we are already working on a fix)
6363
<hr/>
6464

65-
### accessKeyId (`required`)
65+
### accessKeyId
66+
67+
The AWS access key for the user that has the ability to upload to the `bucket`. If this is left undefined, the normal [AWS SDK credential resolution](7) will take place.
6668

67-
The AWS access key for the user that has the ability to upload to the `bucket`.
6869
*Default:* `undefined`
6970

70-
### secretAccessKey (`required`)
71+
### secretAccessKey
72+
73+
The AWS secret for the user that has the ability to upload to the `bucket`. This must be defined when `accessKeyId` is defined.
7174

72-
The AWS secret for the user that has the ability to upload to the `bucket`.
7375
*Default:* `undefined`
7476

7577
### bucket (`required`)
@@ -215,3 +217,4 @@ You can deploy your Ember application to S3 and still use the history-api for pr
215217
[4]: https://github.com/ember-cli-deploy/ember-cli-deploy-build "ember-cli-deploy-build"
216218
[5]: https://github.com/ember-cli/ember-cli-deploy "ember-cli-deploy"
217219
[6]: https://github.com/ember-cli-deploy/ember-cli-deploy-revision-data "ember-cli-deploy-revision-data"
220+
[7]: https://docs.aws.amazon.com/AWSJavaScriptSDK/guide/node-configuring.html#Setting_AWS_Credentials "Setting AWS Credentials"

index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module.exports = {
2828
},
2929
allowOverwrite: false
3030
},
31-
requiredConfig: ['accessKeyId', 'secretAccessKey', 'bucket', 'region'],
31+
requiredConfig: ['bucket', 'region'],
3232

3333
upload: function(context) {
3434
var bucket = this.readConfig('bucket');

0 commit comments

Comments
 (0)