fix: Support Condition attribute in resources.extensions (#8217)

serverless · Sep 10, 2020 · 16bae33 · 16bae33
1 parent 7c698bd
commit 16bae33
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/docs/providers/aws/guide/resources.md b/docs/providers/aws/guide/resources.md
@@ -127,6 +127,7 @@ Here's how the extension logic is defined:
 
 | Resource attribute    | Operation                                                                                                                  |
 | --------------------- | -------------------------------------------------------------------------------------------------------------------------- |
+| `Condition`           | Set to extension value if present.                                                                                         |
 | `CreationPolicy`      | Set to extension value if present.                                                                                         |
 | `DeletionPolicy`      | Set to extension value if present.                                                                                         |
 | `DependsOn`           | Merge. The extension value will be added to the resource's `DependsOn` list.                                               |

diff --git a/lib/plugins/aws/package/lib/mergeCustomProviderResources.js b/lib/plugins/aws/package/lib/mergeCustomProviderResources.js
@@ -34,6 +34,7 @@ module.exports = {
           }
 
           switch (extensionAttributeName) {
+            case 'Condition':
             case 'CreationPolicy':
             case 'DeletionPolicy':
             case 'UpdatePolicy':

diff --git a/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js b/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js
@@ -217,6 +217,7 @@ describe('mergeCustomProviderResources', () => {
     it('should overwrite for resources.extensions.*.{CreationPolicy,DeletionPolicy,UpdatePolicy,UpdateReplacePolicy}', () => {
       awsPackage.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
         SampleResource: {
+          Condition: 'Condition',
           CreationPolicy: {
             AutoScalingCreationPolicy: {
               MinSuccessfulInstancesPercent: 10,
@@ -242,6 +243,7 @@ describe('mergeCustomProviderResources', () => {
       awsPackage.serverless.service.resources = {
         extensions: {
           SampleResource: {
+            Condition: 'New',
             CreationPolicy: {
               ResourceSignal: {
                 Count: 3,
@@ -260,6 +262,7 @@ describe('mergeCustomProviderResources', () => {
           awsPackage.serverless.service.provider.compiledCloudFormationTemplate.Resources
             .SampleResource
         ).to.deep.equal({
+          Condition: 'New',
           CreationPolicy: {
             ResourceSignal: {
               Count: 3,