[aws-appsync] API always generates API key even when other default auth mode is set

[matthias-pichler]

When I set a defaultAuthorization prop on the GraphQLApi and use something different than "API_KEY" it gets set correctly but the Key gets generated anyway.

Reproduction Steps

new appsync.GraphQLApi(this, "API", {
  name: "test-api",
  authorizationConfig: {
    defaultAuthorization: {
      authorizationType: appsync.AuthorizationType.IAM,
    },
  },
});

and see in the Cloudformation template the following

ApiDefaultAPIKeyApiKeyF1DF6A86:
  Type: "AWS::AppSync::ApiKey"
  Properties:
    "ApiId":
      "Fn::GetAtt": ["Api387E7E9C","ApiId"]
    Description: "Default API Key created by CDK",

a workaround is to set an empty array as the additional auth types

new appsync.GraphQLApi(this, "API", {
  name: "test-api",
  authorizationConfig: {
    defaultAuthorization: {
      authorizationType: appsync.AuthorizationType.IAM,
    },
    additionalAuthorizationModes: [],
  },
});

Error Log

Environment

• CLI Version : 1.51.0
• Framework Version: 1.51.0
• Node.js Version: 14.3.0
• OS : MacOS
• Language (Version): TypeScript (3.9.4)

Other

The line responsible is

aws-cdk/packages/@aws-cdk/aws-appsync/lib/graphqlapi.ts

Lines 342 to 346 in cec382c

	if (
	defaultAuthorizationType === AuthorizationType.API_KEY ||
	props.authorizationConfig?.additionalAuthorizationModes?.findIndex(
	(authMode) => authMode.authorizationType === AuthorizationType.API_KEY
	) !== -1

The right handside of the or (||) uses optional chaining, hence if additionalAuthorizationModes is undefined additionalAuthorizationModes?.findIndex(...) returns undefined which is not strictly equal to -1.

I would propose the following fix:

    if (
      defaultAuthorizationType === AuthorizationType.API_KEY ||
      props.authorizationConfig?.additionalAuthorizationModes?.some(
        (authMode) => authMode.authorizationType === AuthorizationType.API_KEY
      )
    ) {

using Array.prototype.some() instead of Array.prototype.findIndex()

---

This is 🐛 Bug Report