From c25785c7797e4f1016a3b7c6b2bfbf6e60db3635 Mon Sep 17 00:00:00 2001 From: Alan Vosper Date: Mon, 12 Oct 2020 17:41:20 -0700 Subject: [PATCH 1/2] Add required flag for AuthorizationConfig property --- troposphere/ecs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/troposphere/ecs.py b/troposphere/ecs.py index c46551a92..0bec52824 100644 --- a/troposphere/ecs.py +++ b/troposphere/ecs.py @@ -418,7 +418,7 @@ class AuthorizationConfig(AWSProperty): class EFSVolumeConfiguration(AWSProperty): props = { - 'AuthorizationConfig': AuthorizationConfig, + 'AuthorizationConfig': (AuthorizationConfig, False), 'FilesystemId': (basestring, True), 'RootDirectory': (basestring, False), 'TransitEncryption': (ecs_efs_encryption_status, False), From 3f72e577f5ada44d20ca0c91e902a20f9369a60d Mon Sep 17 00:00:00 2001 From: Alan Vosper Date: Mon, 12 Oct 2020 17:42:01 -0700 Subject: [PATCH 2/2] Update ValueError value Specify return value --- troposphere/validators.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/troposphere/validators.py b/troposphere/validators.py index 0d38611fa..9f023d580 100644 --- a/troposphere/validators.py +++ b/troposphere/validators.py @@ -754,6 +754,7 @@ def ecs_efs_encryption_status(status): valid_status = ['ENABLED', 'DISABLED'] if status not in valid_status: raise ValueError( - 'ECS EFS Encryption in transit can only be one of' % ( + 'ECS EFS Encryption in transit can only be one of: "%s"' % ( ', '.join(valid_status)) ) + return status