Use awsKmsArn definition everywhere

serverless · Sep 20, 2020 · 28bc5fa · 28bc5fa
1 parent acb0495
commit 28bc5fa
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/lib/classes/ConfigSchemaHandler/index.js b/lib/classes/ConfigSchemaHandler/index.js
@@ -28,7 +28,8 @@ class ConfigSchemaHandler {
     this.serverless = serverless;
     this.schema = _.cloneDeep(schema);
 
-    deepFreeze(this.schema.properties.service);
+    // TODO: Switch back to deepFreeze(this.schema.properties.service) once awsKmsKeyArn property is removed, see https://github.com/serverless/serverless/issues/8261
+    Object.freeze(this.schema.properties.service.name);
     deepFreeze(this.schema.properties.plugins);
     deepFreeze(this.schema.properties.package);
     Object.freeze(this.schema.properties.layers);

diff --git a/lib/configSchema.js b/lib/configSchema.js
@@ -9,7 +9,7 @@ const schema = {
       type: 'object',
       properties: {
         name: { pattern: '^[a-zA-Z][0-9a-zA-Z-]+$' },
-        awsKmsKeyArn: { pattern: '^arn:(aws[a-zA-Z-]*)?:kms:[a-z0-9-]+-\\d+:\\d{12}:[^\\s]+$' },
+        awsKmsKeyArn: { $ref: '#/definitions/awsKmsArnString' },
       },
       additionalProperties: false,
     },
@@ -125,8 +125,10 @@ const schema = {
   additionalProperties: false,
   required: ['provider', 'service'],
   definitions: {
-    awsKmsArn: {
-      oneOf: [{ $ref: '#/definitions/awsKmsArnString' }, { $ref: '#/definitions/awsCfFunction' }],
+    // TODO: awsKmsArnString definition to be moved to lib/plugins/aws/provider/awsProvider.js once service.awsKmsKeyArn moved to provider.awsKmsKeyArn, see https://github.com/serverless/serverless/issues/8261
+    awsKmsArnString: {
+      type: 'string',
+      pattern: '^arn:aws[a-z-]*:kms',
     },
     errorCode: {
       type: 'string',

diff --git a/lib/configSchema.test.js b/lib/configSchema.test.js
@@ -21,8 +21,7 @@ describe('#configSchema', () => {
     },
     {
       isValid: false,
-      errorMessage:
-        'should match pattern "^arn:(aws[a-zA-Z-]*)?:kms:[a-z0-9-]+-\\d+:\\d{12}:[^\\s]+$',
+      errorMessage: 'should match pattern "^arn:aws[a-z-]*:kms',
       description: 'service awsKmsKeyArn',
       mutation: {
         service: {

diff --git a/lib/plugins/aws/provider/awsProvider.js b/lib/plugins/aws/provider/awsProvider.js
@@ -222,10 +222,6 @@ class AwsProvider {
             required: ['Fn::Sub'],
             additionalProperties: false,
           },
-          awsKmsArnString: {
-            type: 'string',
-            pattern: '^arn:aws[a-z-]*:kms',
-          },
           awsLambdaLayers: {
             type: 'array',
             items: { $ref: '#/definitions/awsArn' },
@@ -440,7 +436,12 @@ class AwsProvider {
         },
         function: {
           properties: {
-            awsKmsKeyArn: { $ref: '#/definitions/awsKmsArn' },
+            awsKmsKeyArn: {
+              oneOf: [
+                { $ref: '#/definitions/awsKmsArnString' },
+                { $ref: '#/definitions/awsCfFunction' },
+              ],
+            },
             condition: {},
             dependsOn: {},
             description: { type: 'string', maxLength: 256 },