fix(Config Schema): Address invalid schema definitions

serverless · Jan 5, 2022 · 9e1fe0a · 9e1fe0a
1 parent dbb044c
commit 9e1fe0a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/lib/plugins/aws/package/compile/events/cloudFront.js b/lib/plugins/aws/package/compile/events/cloudFront.js
@@ -26,18 +26,18 @@ class AwsCompileCloudFrontEvents {
     const originObjectSchema = {
       type: 'object',
       properties: {
-        ConnectionAttempts: { type: 'integer', miminum: 1, maximum: 3 },
-        ConnectionTimeout: { type: 'integer', miminum: 1, maximum: 10 },
+        ConnectionAttempts: { type: 'integer', minimum: 1, maximum: 3 },
+        ConnectionTimeout: { type: 'integer', minimum: 1, maximum: 10 },
         CustomOriginConfig: {
           type: 'object',
           properties: {
-            HTTPPort: { type: 'integer', miminum: 0, maximum: 65535 },
-            HTTPSPort: { type: 'integer', miminum: 0, maximum: 65535 },
-            OriginKeepaliveTimeout: { type: 'integer', miminum: 1, maximum: 60 },
+            HTTPPort: { type: 'integer', minimum: 0, maximum: 65535 },
+            HTTPSPort: { type: 'integer', minimum: 0, maximum: 65535 },
+            OriginKeepaliveTimeout: { type: 'integer', minimum: 1, maximum: 60 },
             OriginProtocolPolicy: {
               enum: ['http-only', 'match-viewer', 'https-only'],
             },
-            OriginReadTimeout: { type: 'integer', miminum: 1, maximum: 60 },
+            OriginReadTimeout: { type: 'integer', minimum: 1, maximum: 60 },
             OriginSSLProtocols: {
               type: 'array',
               items: { enum: ['SSLv3', 'TLSv1', 'TLSv1.1', 'TLSv1.2'] },

diff --git a/lib/plugins/aws/package/compile/events/eventBridge/index.js b/lib/plugins/aws/package/compile/events/eventBridge/index.js
@@ -56,7 +56,7 @@ class AwsCompileEventBridgeEvents {
             },
           ],
         },
-        schedule: { pattern: '^(?:cron|rate)\\(.+\\)$' },
+        schedule: { pattern: '^(?:cron|rate)\\(.+\\)$', type: 'string' },
         enabled: { type: 'boolean' },
         pattern: {
           type: 'object',

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
@@ -171,12 +171,12 @@ const oidcAlbAuthorizer = {
   type: 'object',
   properties: {
     type: { const: 'oidc' },
-    authorizationEndpoint: { format: 'uri' },
+    authorizationEndpoint: { format: 'uri', type: 'string' },
     clientId: { type: 'string' },
     clientSecret: { type: 'string' },
-    issuer: { format: 'uri' },
-    tokenEndpoint: { format: 'uri' },
-    userInfoEndpoint: { format: 'uri' },
+    issuer: { format: 'uri', type: 'string' },
+    tokenEndpoint: { format: 'uri', type: 'string' },
+    userInfoEndpoint: { format: 'uri', type: 'string' },
     ...baseAlbAuthorizerProperties,
   },
   required: [
@@ -805,7 +805,7 @@ class AwsProvider {
                             additionalProperties: false,
                           },
                         },
-                        requires: [
+                        required: [
                           'CookiesConfig',
                           'EnableAcceptEncodingGzip',
                           'HeadersConfig',
@@ -999,7 +999,7 @@ class AwsProvider {
                             path: { type: 'string' },
                             file: { type: 'string' },
                             buildArgs: { type: 'object', additionalProperties: { type: 'string' } },
-                            cacheFrom: { type: 'array', additionalProperties: { type: 'string' } },
+                            cacheFrom: { type: 'array', items: { type: 'string' } },
                             platform: { type: 'string' },
                           },
                           additionalProperties: false,
@@ -1348,6 +1348,7 @@ class AwsProvider {
           },
         },
         resources: {
+          type: 'object',
           properties: {
             AWSTemplateFormatVersion: {
               type: 'string',