update snapshots

aws · Sep 28, 2022 · 4a8df67 · 4a8df67
1 parent 16683bd
commit 4a8df67
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 78 deletions.
diff --git a/...mbda/test/runtime.inlinecode.integ.snapshot/aws-cdk-lambda-runtime-inlinecode.assets.json b/...mbda/test/runtime.inlinecode.integ.snapshot/aws-cdk-lambda-runtime-inlinecode.assets.json
diff --git a/packages/@aws-cdk/aws-lambda/test/runtime.inlinecode.integ.snapshot/integ.json b/packages/@aws-cdk/aws-lambda/test/runtime.inlinecode.integ.snapshot/integ.json
@@ -1,7 +1,7 @@
 {
   "version": "20.0.0",
   "testCases": {
-    "@aws-cdk/aws-lambda/test/integ.runtime.inlinecode": {
+    "integ.runtime.inlinecode": {
       "stacks": [
         "aws-cdk-lambda-runtime-inlinecode"
       ],

diff --git a/packages/@aws-cdk/aws-lambda/test/runtime.inlinecode.integ.snapshot/manifest.json b/packages/@aws-cdk/aws-lambda/test/runtime.inlinecode.integ.snapshot/manifest.json
@@ -12,24 +12,7 @@
       "environment": "aws://unknown-account/unknown-region",
       "properties": {
         "templateFile": "aws-cdk-lambda-runtime-inlinecode.template.json",
-<<<<<<< HEAD
         "validateOnSynth": false
-=======
-        "validateOnSynth": false,
-        "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
-        "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/33c56e02291eaea4afa147afc5d42ce6d80c4f482906b78fa47ddbe2582f19bc.json",
-        "requiresBootstrapStackVersion": 6,
-        "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
-        "additionalDependencies": [
-          "aws-cdk-lambda-runtime-inlinecode.assets"
-        ],
-        "lookupRole": {
-          "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
-          "requiresBootstrapStackVersion": 8,
-          "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
-        }
->>>>>>> 40ddfdd681 (chore: remove usage of Node12 runtime in tests (#22256))
       },
       "metadata": {
         "/aws-cdk-lambda-runtime-inlinecode/PYTHON_3_7/ServiceRole/Resource": [
@@ -121,42 +104,6 @@
             "type": "aws:cdk:logicalId",
             "data": "NODEJS16XfunctionName"
           }
-        ],
-        "PYTHON36ServiceRole814B3AD9": [
-          {
-            "type": "aws:cdk:logicalId",
-            "data": "PYTHON36ServiceRole814B3AD9",
-            "trace": [
-              "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
-            ]
-          }
-        ],
-        "PYTHON364935EF15": [
-          {
-            "type": "aws:cdk:logicalId",
-            "data": "PYTHON364935EF15",
-            "trace": [
-              "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
-            ]
-          }
-        ],
-        "NODEJS12XServiceRole59E71436": [
-          {
-            "type": "aws:cdk:logicalId",
-            "data": "NODEJS12XServiceRole59E71436",
-            "trace": [
-              "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
-            ]
-          }
-        ],
-        "NODEJS12X8B8075A4": [
-          {
-            "type": "aws:cdk:logicalId",
-            "data": "NODEJS12X8B8075A4",
-            "trace": [
-              "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
-            ]
-          }
         ]
       },
       "displayName": "aws-cdk-lambda-runtime-inlinecode"

diff --git a/packages/@aws-cdk/aws-lambda/test/runtime.inlinecode.integ.snapshot/tree.json b/packages/@aws-cdk/aws-lambda/test/runtime.inlinecode.integ.snapshot/tree.json
@@ -8,13 +8,8 @@
         "id": "Tree",
         "path": "Tree",
         "constructInfo": {
-<<<<<<< HEAD
           "fqn": "@aws-cdk/core.Construct",
           "version": "0.0.0"
-=======
-          "fqn": "constructs.Construct",
-          "version": "10.1.108"
->>>>>>> 40ddfdd681 (chore: remove usage of Node12 runtime in tests (#22256))
         }
       },
       "aws-cdk-lambda-runtime-inlinecode": {