Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

Sync master with dev #38

Merged
merged 13 commits into from
Nov 6, 2020
Merged

Sync master with dev #38

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
706a217
Merge winning submission from mlab to dynamodb migration contest
callmekatootie Oct 26, 2020
983f74e
Merge branch 'develop' into dynamodb
callmekatootie Oct 26, 2020
88f4b7f
Remove creds
callmekatootie Oct 26, 2020
21659dc
Merge pull request #37 from topcoder-platform/dynamodb
callmekatootie Oct 26, 2020
ac91ab2
Remove mongoose
callmekatootie Oct 27, 2020
f7a859a
Publish to Bus API
xxcxy Oct 28, 2020
3ae937f
fix delete group topic
xxcxy Oct 28, 2020
5619585
git push origin developMerge branch 'issue_40' into develop
callmekatootie Oct 28, 2020
31ff7e3
Prefix table names in dynamodb
callmekatootie Oct 28, 2020
e85a0c2
Set the api prefix
callmekatootie Oct 28, 2020
db31f50
Fix issue where AWS deployment failed due to access issues
callmekatootie Oct 29, 2020
d53b566
removing explicit setting of AWS keys so as to fall back to the envir…
cwdcwd Nov 4, 2020
0a1e521
pluralizing
cwdcwd Nov 6, 2020
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
Prev Previous commit
Next Next commit
Fix issue where AWS deployment failed due to access issues
  • Loading branch information
@callmekatootie
callmekatootie committed Oct 29, 2020
commit db31f50133077152c4b771c934d9eb54d9a434d0
11 changes: 4 additions & 7 deletions src/models/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,11 @@ const dynamoose = require('dynamoose')
const fs = require('fs')
const path = require('path')

const awsConfig = {
dynamoose.aws.sdk.config.update({
accessKeyId: config.AMAZON.AWS_ACCESS_KEY_ID,
secretAccessKey: config.AMAZON.AWS_SECRET_ACCESS_KEY,
region: config.AMAZON.AWS_REGION
}
if (config.AMAZON.AWS_ACCESS_KEY_ID && config.AMAZON.AWS_SECRET_ACCESS_KEY) {
awsConfig.accessKeyId = config.AMAZON.AWS_ACCESS_KEY_ID
awsConfig.secretAccessKey = config.AMAZON.AWS_SECRET_ACCESS_KEY
}
dynamoose.aws.sdk.config.update(awsConfig)
})

if (config.AMAZON.IS_LOCAL_DB) {
dynamoose.aws.ddb.local(config.AMAZON.DYNAMODB_URL)
Expand Down