From 3aef0dc156455b98a6a1a1bf444432d7856f9901 Mon Sep 17 00:00:00 2001 From: Jeff Bachtel Date: Fri, 16 Nov 2018 16:35:20 -0500 Subject: [PATCH 1/2] Remove trailing space --- templates/assets/cloudformation/database.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/assets/cloudformation/database.yml b/templates/assets/cloudformation/database.yml index bb398a08..493aed40 100644 --- a/templates/assets/cloudformation/database.yml +++ b/templates/assets/cloudformation/database.yml @@ -138,14 +138,14 @@ Resources: EngineMode: !Ref DatabaseEngineMode KmsKeyId: !Ref DatabaseKeyArn StorageEncrypted: true - ScalingConfiguration: + ScalingConfiguration: Fn::If: - IsServerless - MaxCapacity: !Ref ScalingMaxCapacity MinCapacity: !Ref ScalingMinCapacity SecondsUntilAutoPause: !Ref SecondsUntilAutoPause - AutoPause: - Fn::If: + AutoPause: + Fn::If: - IsServerlessAutoPause - 'true' - 'false' From 45dd226cea36f6ebc1357683158adcf5531b98ce Mon Sep 17 00:00:00 2001 From: Jeff Bachtel Date: Fri, 16 Nov 2018 16:35:36 -0500 Subject: [PATCH 2/2] Fix https://github.com/stelligent/mu/issues/398 AWS::NoValue should be a reference to a pseudo-property, see https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/pseudo-parameter-reference.html#cfn-pseudo-param-novalue --- templates/assets/cloudformation/database.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/assets/cloudformation/database.yml b/templates/assets/cloudformation/database.yml index 493aed40..5127c721 100644 --- a/templates/assets/cloudformation/database.yml +++ b/templates/assets/cloudformation/database.yml @@ -149,7 +149,7 @@ Resources: - IsServerlessAutoPause - 'true' - 'false' - - AWS::NoValue + - !Ref AWS::NoValue MasterUsername: !Ref DatabaseMasterUsername MasterUserPassword: !Ref DatabaseMasterPassword Tags: