tests/resource/aws_appsync_graphql_api: Changes from hashicorp#20000 …

…and hashicorp#21400
Pharb · Nov 23, 2021 · 3bbd9a0 · 3bbd9a0
1 parent 61d1b32
commit 3bbd9a0
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 54 deletions.
diff --git a/internal/service/appsync/appsync_test.go b/internal/service/appsync/appsync_test.go
@@ -32,6 +32,7 @@ func TestAccAppSync_serial(t *testing.T) {
 			"AuthenticationType_awsIAM": testAccAppSyncGraphQLAPI_AuthenticationType_awsIAM,
 			"AuthenticationType_amazonCognitoUserPools": testAccAppSyncGraphQLAPI_AuthenticationType_amazonCognitoUserPools,
 			"AuthenticationType_openIDConnect":          testAccAppSyncGraphQLAPI_AuthenticationType_openIDConnect,
+			"AuthenticationType_awsLambda":              testAccAppSyncGraphQLAPI_AuthenticationType_awsLambda,
 			"log":                                       testAccAppSyncGraphQLAPI_log,
 			"Log_fieldLogLevel":                         testAccAppSyncGraphQLAPI_Log_fieldLogLevel,
 			"Log_excludeVerboseContent":                 testAccAppSyncGraphQLAPI_Log_excludeVerboseContent,
@@ -42,11 +43,15 @@ func TestAccAppSync_serial(t *testing.T) {
 			"name":                                      testAccAppSyncGraphQLAPI_name,
 			"UserPool_awsRegion":                        testAccAppSyncGraphQLAPI_UserPool_awsRegion,
 			"UserPool_defaultAction":                    testAccAppSyncGraphQLAPI_UserPool_defaultAction,
+			"LambdaAuthorizerConfig_authorizerUri":      testAccAppSyncGraphQLAPI_LambdaAuthorizerConfig_authorizerUri,
+			"LambdaAuthorizerConfig_identityValidationExpression": testAccAppSyncGraphQLAPI_LambdaAuthorizerConfig_identityValidationExpression,
+			"LambdaAuthorizerConfig_authorizerResultTtlInSeconds": testAccAppSyncGraphQLAPI_LambdaAuthorizerConfig_authorizerResultTtlInSeconds,
 			"tags":                                      testAccAppSyncGraphQLAPI_tags,
 			"AdditionalAuthentication_apiKey":           testAccAppSyncGraphQLAPI_AdditionalAuthentication_apiKey,
 			"AdditionalAuthentication_awsIAM":           testAccAppSyncGraphQLAPI_AdditionalAuthentication_awsIAM,
 			"AdditionalAuthentication_cognitoUserPools": testAccAppSyncGraphQLAPI_AdditionalAuthentication_cognitoUserPools,
 			"AdditionalAuthentication_openIDConnect":    testAccAppSyncGraphQLAPI_AdditionalAuthentication_openIDConnect,
+			"AdditionalAuthentication_awsLambda":        testAccAppSyncGraphQLAPI_AdditionalAuthentication_awsLambda,
 			"AdditionalAuthentication_multiple":         testAccAppSyncGraphQLAPI_AdditionalAuthentication_multiple,
 			"xrayEnabled":                               testAccAppSyncGraphQLAPI_xrayEnabled,
 		},

diff --git a/internal/service/appsync/graphql_api.go b/internal/service/appsync/graphql_api.go
@@ -18,7 +18,7 @@ import (
 
 var validateAuthorizerResultTtlInSeconds = validation.IntBetween(0, 3600)
 
-const defaultAuthorizerResultTtlInSeconds = 300
+const DefaultAuthorizerResultTtlInSeconds = 300
 
 func ResourceGraphQLAPI() *schema.Resource {
 	return &schema.Resource{
@@ -98,7 +98,7 @@ func ResourceGraphQLAPI() *schema.Resource {
 									"authorizer_result_ttl_in_seconds": {
 										Type:         schema.TypeInt,
 										Optional:     true,
-										Default:      defaultAuthorizerResultTtlInSeconds,
+										Default:      DefaultAuthorizerResultTtlInSeconds,
 										ValidateFunc: validateAuthorizerResultTtlInSeconds,
 									},
 									"authorizer_uri": {
@@ -226,7 +226,7 @@ func ResourceGraphQLAPI() *schema.Resource {
 						"authorizer_result_ttl_in_seconds": {
 							Type:         schema.TypeInt,
 							Optional:     true,
-							Default:      defaultAuthorizerResultTtlInSeconds,
+							Default:      DefaultAuthorizerResultTtlInSeconds,
 							ValidateFunc: validateAuthorizerResultTtlInSeconds,
 						},
 						"authorizer_uri": {
@@ -655,7 +655,7 @@ func flattenAppsyncGraphqlApiLambdaAuthorizerConfig(lambdaAuthorizerConfig *apps
 	if lambdaAuthorizerConfig.AuthorizerResultTtlInSeconds != nil {
 		m["authorizer_result_ttl_in_seconds"] = aws.Int64Value(lambdaAuthorizerConfig.AuthorizerResultTtlInSeconds)
 	} else {
-		m["authorizer_result_ttl_in_seconds"] = defaultAuthorizerResultTtlInSeconds
+		m["authorizer_result_ttl_in_seconds"] = DefaultAuthorizerResultTtlInSeconds
 	}
 
 	if lambdaAuthorizerConfig.IdentityValidationExpression != nil {