From d071c5f74d2d1deca71edebc53d072a1c90d8bad Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 7 Oct 2021 12:11:59 +0200
Subject: [PATCH] refactor(AWS Deploy): Improve error message

---
 .../aws/package/lib/mergeCustomProviderResources.js        | 3 ++-
 .../aws/package/lib/mergeCustomProviderResources.test.js   | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/plugins/aws/package/lib/mergeCustomProviderResources.js b/lib/plugins/aws/package/lib/mergeCustomProviderResources.js
index 314d5aa41e6..664e3683541 100644
--- a/lib/plugins/aws/package/lib/mergeCustomProviderResources.js
+++ b/lib/plugins/aws/package/lib/mergeCustomProviderResources.js
@@ -72,7 +72,8 @@ module.exports = {
             // default includes any future attributes we don't know about yet.
             default:
               throw new ServerlessError(
-                `${resourceName}: Sorry, extending the ${extensionAttributeName} resource ` +
+                `Cannot extend "${resourceName}" resource, as extending ` +
+                  `the "${extensionAttributeName}" ` +
                   'attribute at this point is not supported. Feel free to propose support ' +
                   'for it in the Framework issue tracker: ' +
                   'https://github.com/serverless/serverless/issues',
diff --git a/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js b/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js
index 75b868dfc6f..be0036bc0e8 100644
--- a/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js
@@ -4,6 +4,7 @@ const path = require('path');
 const expect = require('chai').expect;
 const AwsPackage = require('../../../../../../../lib/plugins/aws/package/index');
 const Serverless = require('../../../../../../../lib/Serverless');
+const ServerlessError = require('../../../../../../../lib/serverless-error');
 
 describe('mergeCustomProviderResources', () => {
   let serverless;
@@ -299,9 +300,9 @@ describe('mergeCustomProviderResources', () => {
         },
       };
 
-      expect(() => awsPackage.mergeCustomProviderResources()).to.throw(
-        /SampleResource: Sorry, extending the unsupported resource attribute at this point is not supported/
-      );
+      expect(() => awsPackage.mergeCustomProviderResources())
+        .to.throw(ServerlessError)
+        .with.property('code', 'RESOURCE_EXTENSION_UNSUPPORTED_ATTRIBUTE');
     });
   });
 });