Skip to content

Commit 2e59959

Browse files
committed
feat: Allow to use ~/.aws/credentials file as alternative to env variables
Close #1320
1 parent 08893e3 commit 2e59959

File tree

4 files changed

+12
-19
lines changed

4 files changed

+12
-19
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"ajv": "^5.0.4-beta.0",
3232
"ajv-keywords": "^2.0.1-beta.2",
3333
"archiver": "^1.3.0",
34-
"aws-sdk": "^2.31.0",
34+
"aws-sdk": "^2.32.0",
3535
"bluebird-lst": "^1.0.2",
3636
"chalk": "^1.1.3",
3737
"chromium-pickle-js": "^0.2.0",

packages/electron-publisher-s3/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
],
1313
"dependencies": {
1414
"fs-extra-p": "^4.1.0",
15-
"aws-sdk": "^2.31.0",
15+
"aws-sdk": "^2.32.0",
1616
"mime": "^1.3.4",
1717
"electron-publish": "~0.0.0-semantic-release",
1818
"electron-builder-util": "~0.0.0-semantic-release"

packages/electron-publisher-s3/src/s3Publisher.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { S3 } from "aws-sdk"
22
import { S3Options } from "electron-builder-http/out/publishOptions"
3-
import { debug, isEmptyOrSpaces } from "electron-builder-util"
3+
import { debug } from "electron-builder-util"
44
import { PublishContext, Publisher } from "electron-publish"
55
import { stat } from "fs-extra-p"
66
import mime from "mime"
@@ -15,13 +15,6 @@ export default class S3Publisher extends Publisher {
1515
super(context)
1616

1717
debug(`Creating S3 Publisher — bucket: ${info.bucket}`)
18-
19-
if (isEmptyOrSpaces(process.env.AWS_ACCESS_KEY_ID)) {
20-
throw new Error(`Env AWS_ACCESS_KEY_ID is not set`)
21-
}
22-
if (isEmptyOrSpaces(process.env.AWS_SECRET_ACCESS_KEY)) {
23-
throw new Error(`Env AWS_SECRET_ACCESS_KEY is not set`)
24-
}
2518
}
2619

2720
static async checkAndResolveOptions(options: S3Options) {

yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,9 @@ asynckit@^0.4.0:
271271
version "0.4.0"
272272
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
273273

274-
aws-sdk@^2.31.0:
275-
version "2.31.0"
276-
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.31.0.tgz#e17480610ebddad57732918a4849f9e5f4ade44d"
274+
aws-sdk@^2.32.0:
275+
version "2.32.0"
276+
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.32.0.tgz#9fe278b2ec1b12fddd1afeb74439581cdc2e5990"
277277
dependencies:
278278
buffer "4.9.1"
279279
crypto-browserify "1.0.9"
@@ -2235,15 +2235,15 @@ micromatch@^2.1.5, micromatch@^2.3.11:
22352235
parse-glob "^3.0.4"
22362236
regex-cache "^0.4.2"
22372237

2238-
mime-db@~1.26.0:
2239-
version "1.26.0"
2240-
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.26.0.tgz#eaffcd0e4fc6935cf8134da246e2e6c35305adff"
2238+
mime-db@~1.27.0:
2239+
version "1.27.0"
2240+
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
22412241

22422242
mime-types@^2.1.12, mime-types@~2.1.7:
2243-
version "2.1.14"
2244-
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.14.tgz#f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee"
2243+
version "2.1.15"
2244+
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed"
22452245
dependencies:
2246-
mime-db "~1.26.0"
2246+
mime-db "~1.27.0"
22472247

22482248
mime@^1.3.4:
22492249
version "1.3.4"

0 commit comments

Comments
 (0)