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

Merge #1

Merged
merged 4 commits into from
Oct 22, 2019
Merged

Merge #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
728764a
Fix typo in KMS alias name
ryanaustincarlson Jun 6, 2019
8eab81c
Merge pull request #199 from rncain/master
IanMeyers Aug 16, 2019
dac12be
Fixing bug introduced in a5533e2 wrt MaxRetryMS
IanMeyers Sep 10, 2019
fea50b0
Merge pull request #198 from ryanaustincarlson/patch-1
IanMeyers Sep 10, 2019
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
Binary file modified dist/AWSLambdaRedshiftLoader-2.7.0.zip
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ var common = require('./common');
var async = require('async');
var uuid = require('uuid');
const {Client} = require('pg');
const maxRetryMS = 200;

// empty import/invocation of the keepalive fix for node-postgres module
require('pg-ka-fix')();
Expand Down
4 changes: 2 additions & 2 deletions kmsCrypto.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var authContext = {
};

// module key alias to be used for this application
var moduleKeyName = "alias/LambaRedshiftLoaderKey";
var moduleKeyName = "alias/LambdaRedshiftLoaderKey";

var setRegion = function(region) {
if (!region) {
Expand Down Expand Up @@ -252,4 +252,4 @@ exports.decryptMap = decryptMap;
var toLambdaStringFormat = function(buffer) {
return buffer.toString('base64');
};
exports.toLambdaStringFormat = toLambdaStringFormat;
exports.toLambdaStringFormat = toLambdaStringFormat;