Merge pull request #5562 from exoego/log-retenion-regression

Fix logRetentionInDays regression in AWS
serverless · Dec 5, 2018 · 00756dd · 00756dd
2 parents 510a01f + f129894
commit 00756dd
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 18 deletions.
diff --git a/lib/plugins/aws/package/lib/mergeIamTemplates.js b/lib/plugins/aws/package/lib/mergeIamTemplates.js
@@ -32,12 +32,13 @@ module.exports = {
       };
 
       if (_.has(this.serverless.service.provider, 'logRetentionInDays')) {
-        if (_.isInteger(this.serverless.service.provider.logRetentionInDays) &&
-          this.serverless.service.provider.logRetentionInDays > 0) {
-          newLogGroup[logGroupLogicalId].Properties.RetentionInDays
-            = this.serverless.service.provider.logRetentionInDays;
+        const rawRetentionInDays = this.serverless.service.provider.logRetentionInDays;
+        const retentionInDays = parseInt(rawRetentionInDays, 10);
+        if (_.isInteger(retentionInDays) && retentionInDays > 0) {
+          newLogGroup[logGroupLogicalId].Properties.RetentionInDays = retentionInDays;
         } else {
-          const errorMessage = 'logRetentionInDays should be an integer over 0';
+          const errorMessage =
+            `logRetentionInDays should be an integer over 0 but ${rawRetentionInDays}`;
           throw new this.serverless.classes.Error(errorMessage);
         }
       }

diff --git a/lib/plugins/aws/package/lib/mergeIamTemplates.test.js b/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
@@ -296,20 +296,22 @@ describe('#mergeIamTemplates()', () => {
 
   it('should add RetentionInDays to a CloudWatch LogGroup resource if logRetentionInDays is given'
     , () => {
-      awsPackage.serverless.service.provider.logRetentionInDays = 5;
-      const normalizedName = awsPackage.provider.naming.getLogGroupLogicalId(functionName);
-      return awsPackage.mergeIamTemplates().then(() => {
-        expect(awsPackage.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources[normalizedName]
-        ).to.deep.equal(
-          {
-            Type: 'AWS::Logs::LogGroup',
-            Properties: {
-              LogGroupName: awsPackage.provider.naming.getLogGroupName(functionName),
-              RetentionInDays: 5,
-            },
-          }
+      [5, '5'].forEach((logRetentionInDays) => {
+        awsPackage.serverless.service.provider.logRetentionInDays = logRetentionInDays;
+        const normalizedName = awsPackage.provider.naming.getLogGroupLogicalId(functionName);
+        return awsPackage.mergeIamTemplates().then(() => {
+          expect(awsPackage.serverless.service.provider.compiledCloudFormationTemplate
+            .Resources[normalizedName]
+          ).to.deep.equal(
+            {
+              Type: 'AWS::Logs::LogGroup',
+              Properties: {
+                LogGroupName: awsPackage.provider.naming.getLogGroupName(functionName),
+                RetentionInDays: 5,
+              },
+            }
           );
+        });
       });
     });