Enable intrinsic function for configs

package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-appsync-plugin",
-  "version": "0.0.0-development",
+  "version": "0.0.1",
   "description": "AWS AppSync support for the Serverless Framework",
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",

src/__tests__/validation/__snapshots__/auth.test.ts.snap

@@ -16,7 +16,7 @@ exports[`Valdiation Invalid should validate a Lambda with empty config 1`] = `"/
 exports[`Valdiation Invalid should validate a Lambda with invalid config functionnArn 1`] = `
 "/authentication/config/functionArn: must be a string or a CloudFormation intrinsic function
 /authentication/config: must specify functionName, functionArn or function (all exclusives)
-/authentication/config/functionArn: must be string
+/authentication/config/functionArn: must be a string or a CloudFormation intrinsic function
 /authentication/config/identityValidationExpression: must be string
 /authentication/config/authorizerResultTtlInSeconds: must be number"
 `;
@@ -35,7 +35,7 @@ exports[`Valdiation Invalid should validate a Lambda with missing config 1`] = `
 exports[`Valdiation Invalid should validate a OIDC with empty config 1`] = `"/authentication/config: must have required property 'issuer'"`;
 
 exports[`Valdiation Invalid should validate a OIDC with invalid config 1`] = `
-"/authentication/config/issuer: must be string
+"/authentication/config/issuer: must be a string or a CloudFormation intrinsic function
 /authentication/config/clientId: must be string
 /authentication/config/iatTTL: must be number
 /authentication/config/authTTL: must be number"

src/__tests__/validation/__snapshots__/base.test.ts.snap

@@ -31,17 +31,15 @@ exports[`Valdiation Domain Invalid should validate a useCloudFormation: true, ce
 
 exports[`Valdiation Log Invalid should validate a Invalid 1`] = `
 "/logging/level: must be one of 'ALL', 'ERROR' or 'NONE'
-/logging/retentionInDays: must be integer
-/logging/excludeVerboseContent: must be boolean"
+/logging/retentionInDays: must be integer"
 `;
 
 exports[`Valdiation Waf Invalid should validate a Invalid 1`] = `
 "/waf/name: must be string
 /waf/defaultAction: must be 'Allow' or 'Block'
 /waf/rules/0: must be a valid WAF rule
 /waf/rules/1: must be a valid WAF rule
-/waf/rules/2: must be a valid WAF rule
-/waf/enabled: must be boolean"
+/waf/rules/2: must be a valid WAF rule"
 `;
 
 exports[`Valdiation Waf Invalid should validate a Invalid arn 1`] = `"/waf/arn: must be a string or a CloudFormation intrinsic function"`;
@@ -55,7 +53,6 @@ exports[`Valdiation should validate  1`] = `
 ": must have required property 'name'
 : must have required property 'authentication'
 /unknownPorp: invalid (unknown) property
-/xrayEnabled: must be boolean
 /visibility: must be \\"GLOBAL\\" or \\"PRIVATE\\"
 /introspection: must be boolean
 /queryDepthLimit: must be integer

src/validation.ts

@@ -119,7 +119,7 @@ export const appSyncSchema = {
         // Note: functionName and functionArn are already defined in #/definitions/lambdaFunctionConfig
         // But if not also defined here, TypeScript shows an error.
         functionName: { type: 'string' },
-        functionArn: { type: 'string' },
+        functionArn: { $ref: '#/definitions/stringOrIntrinsicFunction' },
         identityValidationExpression: { type: 'string' },
         authorizerResultTtlInSeconds: { type: 'number' },
       },
@@ -128,7 +128,7 @@ export const appSyncSchema = {
     oidcAuth: {
       type: 'object',
       properties: {
-        issuer: { type: 'string' },
+        issuer: { $ref: '#/definitions/stringOrIntrinsicFunction' },
         clientId: { type: 'string' },
         iatTTL: { type: 'number' },
         authTTL: { type: 'number' },
@@ -630,6 +630,9 @@ export const appSyncSchema = {
       },
       required: ['eventBusArn'],
     },
+    xrayEnabledConfig: {
+      $ref: '#/definitions/lambdaFunctionConfig',
+    },
   },
   properties: {
     name: { type: 'string' },
@@ -685,7 +688,13 @@ export const appSyncSchema = {
           'when using CloudFormation, you must provide either certificateArn or hostedZoneId.',
       },
     },
-    xrayEnabled: { type: 'boolean' },
+    xrayEnabled: {
+      oneOf: [
+        { type: 'boolean' },
+        { $ref: '#/definitions/stringOrIntrinsicFunction' },
+      ],
+      errorMessage: 'must be a boolean or a CloudFormation intrinsic function',
+    },
     visibility: {
       type: 'string',
       enum: ['GLOBAL', 'PRIVATE'],
@@ -699,7 +708,12 @@ export const appSyncSchema = {
     waf: {
       type: 'object',
       properties: {
-        enabled: { type: 'boolean' },
+        enabled: {
+          oneOf: [
+            { type: 'boolean' },
+            { $ref: '#/definitions/stringOrIntrinsicFunction' },
+          ],
+        },
       },
       if: {
         required: ['arn'],
@@ -805,7 +819,12 @@ export const appSyncSchema = {
           errorMessage: "must be one of 'ALL', 'ERROR' or 'NONE'",
         },
         retentionInDays: { type: 'integer' },
-        excludeVerboseContent: { type: 'boolean' },
+        excludeVerboseContent: {
+          oneOf: [
+            { type: 'boolean' },
+            { $ref: '#/definitions/stringOrIntrinsicFunction' },
+          ],
+        },
         enabled: { type: 'boolean' },
       },
       required: ['level'],