Merge branch 'main' into aws-logs-metrics-fix

.gitattributes

@@ -1,18 +1,16 @@
 # Set the default behavior, in case people don't have core.autocrlf set.
 * text=auto
-
 # Currently, this repository has LF dependencies in building and testing, with json, sh, and no extensions.
 # Until this is fixed, it is best to just set the whole repository to be LF.
 * eol=lf
-
 *.gif binary
 *.zip binary
 *.png binary
 *.jpg binary
 *.tgz binary
 *.tar.gz binary
-
 # Hide snapshots from GitHub UI, except for the actual templates
 **/*.snapshot/** linguist-generated
 **/*.snapshot/**/*.template.json -linguist-generated
 **/*.snapshot/**/*DeployAssert*.template.json linguist-generated
+packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-big-response.js.snapshot/asset.3322b7049fb0ed2b7cbb644a2ada8d1116ff80c32dca89e6ada846b5de26f961.zip filter=lfs diff=lfs merge=lfs -text

packages/@aws-cdk-testing/framework-integ/test/aws-appconfig/test/integ.configuration.js.snapshot/aws-appconfig-configuration.template.json

@@ -780,7 +780,8 @@
      "Ref": "MyBucketF68F3FF0"
     },
     "RetainOnDelete": false,
-    "Prune": true
+    "Prune": true,
+    "OutputObjectKeys": true
    },
    "UpdateReplacePolicy": "Delete",
    "DeletionPolicy": "Delete"
@@ -917,7 +918,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "0158f40002a8c211635388a87874fd4dcc3d68f525fe08a0fe0f014069ae539c.zip"
+     "S3Key": "c6358465bf49dfae556bb430bf9c81fa578c221b82c308e3707901b1dd654762.zip"
     },
     "Environment": {
      "Variables": {

packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.graphql-lambda-permission.graphql

@@ -0,0 +1,3 @@
+type Query {
+  getMessage: String
+}

packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.graphql-lambda-permission.js.snapshot/aws-graphql-lambda-permissions.template.json

@@ -0,0 +1,134 @@
+{
+ "Resources": {
+  "AuthorizerFunctionServiceRole5B2A061B": {
+   "Type": "AWS::IAM::Role",
+   "Properties": {
+    "AssumeRolePolicyDocument": {
+     "Statement": [
+      {
+       "Action": "sts:AssumeRole",
+       "Effect": "Allow",
+       "Principal": {
+        "Service": "lambda.amazonaws.com"
+       }
+      }
+     ],
+     "Version": "2012-10-17"
+    },
+    "ManagedPolicyArns": [
+     {
+      "Fn::Join": [
+       "",
+       [
+        "arn:",
+        {
+         "Ref": "AWS::Partition"
+        },
+        ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+       ]
+      ]
+     }
+    ]
+   }
+  },
+  "AuthorizerFunctionB4DBAA43": {
+   "Type": "AWS::Lambda::Function",
+   "Properties": {
+    "Code": {
+     "ZipFile": "\n        exports.handler = async (event) => {\n          console.log(\"Authorization event:\", JSON.stringify(event));\n          \n          const isAuthorized = true;\n          if (isAuthorized) {\n            return {\n              isAuthorized: true,\n              resolverContext: {\n                userId: 'user-id-example'\n              }\n            };\n          } else {\n            return {\n              isAuthorized: false\n            };\n          }\n        };\n      "
+    },
+    "Handler": "index.handler",
+    "Role": {
+     "Fn::GetAtt": [
+      "AuthorizerFunctionServiceRole5B2A061B",
+      "Arn"
+     ]
+    },
+    "Runtime": "nodejs18.x"
+   },
+   "DependsOn": [
+    "AuthorizerFunctionServiceRole5B2A061B"
+   ]
+  },
+  "AuthorizerFunctionapiappsync4E3369BF": {
+   "Type": "AWS::Lambda::Permission",
+   "Properties": {
+    "Action": "lambda:InvokeFunction",
+    "FunctionName": {
+     "Fn::GetAtt": [
+      "AuthorizerFunctionB4DBAA43",
+      "Arn"
+     ]
+    },
+    "Principal": "appsync.amazonaws.com",
+    "SourceArn": {
+     "Fn::GetAtt": [
+      "apiC8550315",
+      "Arn"
+     ]
+    }
+   }
+  },
+  "apiC8550315": {
+   "Type": "AWS::AppSync::GraphQLApi",
+   "Properties": {
+    "AuthenticationType": "AWS_LAMBDA",
+    "LambdaAuthorizerConfig": {
+     "AuthorizerUri": {
+      "Fn::GetAtt": [
+       "AuthorizerFunctionB4DBAA43",
+       "Arn"
+      ]
+     }
+    },
+    "Name": "api"
+   }
+  },
+  "apiSchema0EA92056": {
+   "Type": "AWS::AppSync::GraphQLSchema",
+   "Properties": {
+    "ApiId": {
+     "Fn::GetAtt": [
+      "apiC8550315",
+      "ApiId"
+     ]
+    },
+    "Definition": "type Query {\n  getMessage: String\n}"
+   }
+  }
+ },
+ "Parameters": {
+  "BootstrapVersion": {
+   "Type": "AWS::SSM::Parameter::Value<String>",
+   "Default": "/cdk-bootstrap/hnb659fds/version",
+   "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+  }
+ },
+ "Rules": {
+  "CheckBootstrapVersion": {
+   "Assertions": [
+    {
+     "Assert": {
+      "Fn::Not": [
+       {
+        "Fn::Contains": [
+         [
+          "1",
+          "2",
+          "3",
+          "4",
+          "5"
+         ],
+         {
+          "Ref": "BootstrapVersion"
+         }
+        ]
+       }
+      ]
+     },
+     "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+    }
+   ]
+  }
+ }
+}