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

Bug Fix - API Gateway template doesn't explicitly state defaults, so old configurations remain #153

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bug Fix - API Gateway template doesn't explicitly state defaults, so old configurations remain #153

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3d76d5
always send full default configuration with overrides instead of just…
bryan-hunter Jan 20, 2019
9478e63
Merge branch 'master' into send-defaults-with-template
Enase May 9, 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
22 changes: 13 additions & 9 deletions lib/stackops/apiGateway.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ const BbPromise = require('bluebird');
const utils = require('../utils');

const stageMethodConfigMappings = {
cacheDataEncrypted: { prop: 'CacheDataEncrypted', validate: _.isBoolean, default: false },
cacheDataEncrypted: { prop: 'CacheDataEncrypted', validate: _.isBoolean },
cacheTtlInSeconds: { prop: 'CacheTtlInSeconds', validate: _.isInteger },
cachingEnabled: { prop: 'CachingEnabled', validate: _.isBoolean, default: false },
dataTraceEnabled: { prop: 'DataTraceEnabled', validate: _.isBoolean, default: false },
loggingLevel: { prop: 'LoggingLevel', validate: value => _.includes([ 'OFF', 'INFO', 'ERROR' ], value), default: 'OFF' },
metricsEnabled: { prop: 'MetricsEnabled', validate: _.isBoolean, default: false },
cachingEnabled: { prop: 'CachingEnabled', validate: _.isBoolean },
dataTraceEnabled: { prop: 'DataTraceEnabled', validate: _.isBoolean },
loggingLevel: { prop: 'LoggingLevel', validate: value => _.includes([ 'OFF', 'INFO', 'ERROR' ], value) },
metricsEnabled: { prop: 'MetricsEnabled', validate: _.isBoolean },
throttlingBurstLimit: { prop: 'ThrottlingBurstLimit', validate: _.isInteger },
throttlingRateLimit: { prop: 'ThrottlingRateLimit', validate: _.isNumber }
};
Expand Down Expand Up @@ -79,7 +79,13 @@ const internal = {
const eventStageConfig = _.defaults({}, httpEvent.aliasStage, funcStageConfig);
if (!_.isEmpty(eventStageConfig)) {
const methodType = _.toUpper(httpEvent.method);
const methodSetting = {};
const methodSetting = {
CacheDataEncrypted: false,
CachingEnabled: false,
DataTraceEnabled: false,
LoggingLevel: 'OFF',
MetricsEnabled: false
};
const methods = methodType === 'ANY' ? [
'DELETE',
'GET',
Expand All @@ -96,9 +102,7 @@ const internal = {
} else if (!stageMethodConfigMappings[key].validate(value)) {
throw new this.serverless.classes.Error(`Invalid value for stage config '${key}: ${value}' at method '${methodType} /${httpEvent.path}'`);
}
if (!_.has(stageMethodConfigMappings[key], 'default') || stageMethodConfigMappings[key].default !== value) {
methodSetting[stageMethodConfigMappings[key].prop] = value;
}
methodSetting[stageMethodConfigMappings[key].prop] = value;
});
if (!_.isEmpty(methodSetting)) {
methodSetting.ResourcePath = '/' + _.replace('/' + _.trimStart(httpEvent.path, '/'), /\//g, '~1');
Expand Down