fixing batch integ test. Environment should not be specified.

aws · Aug 18, 2022 · 12c9e78 · 12c9e78
1 parent 1989990
commit 12c9e78
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 20 deletions.
diff --git a/packages/@aws-cdk/aws-batch/test/integ.job-definition.ts b/packages/@aws-cdk/aws-batch/test/integ.job-definition.ts
@@ -6,12 +6,7 @@ import { JobDefinition } from "../lib";
 
 const app = new App();
 
-const stack = new Stack(app, "BatchDefaultEnvVarsStack", {
-  env: {
-    account: process.env.CDK_DEFAULT_ACCOUNT,
-    region: process.env.CDK_DEFAULT_REGION,
-  },
-});
+const stack = new Stack(app, "BatchDefaultEnvVarsStack");
 
 new JobDefinition(stack, "JobDefinition", {
   container: {

diff --git a/...s-cdk/aws-batch/test/job-definition.integ.snapshot/BatchDefaultEnvVarsStack.template.json b/...s-cdk/aws-batch/test/job-definition.integ.snapshot/BatchDefaultEnvVarsStack.template.json
@@ -8,11 +8,15 @@
      "Environment": [
       {
        "Name": "AWS_REGION",
-       "Value": "eu-west-1"
+       "Value": {
+        "Ref": "AWS::Region"
+       }
       },
       {
        "Name": "AWS_ACCOUNT",
-       "Value": "202865745565"
+       "Value": {
+        "Ref": "AWS::AccountId"
+       }
       }
      ],
      "Image": "docker/whalesay",

diff --git a/...g.snapshot/IntegTestBatchDefaultEnvVarsStackDefaultTestDeployAssertC15EFFF2.template.json b/...g.snapshot/IntegTestBatchDefaultEnvVarsStackDefaultTestDeployAssertC15EFFF2.template.json
@@ -15,7 +15,7 @@
      "status": "ACTIVE"
     },
     "flattenResponse": "true",
-    "salt": "1660753068855"
+    "salt": "1660823602154"
    },
    "UpdateReplacePolicy": "Delete",
    "DeletionPolicy": "Delete"
@@ -36,7 +36,7 @@
      ]
     },
     "expected": "{\"$StringLike\":\"AWS_REGION\"}",
-    "salt": "1660753068856"
+    "salt": "1660823602155"
    },
    "UpdateReplacePolicy": "Delete",
    "DeletionPolicy": "Delete"

diff --git a/packages/@aws-cdk/aws-batch/test/job-definition.integ.snapshot/manifest.json b/packages/@aws-cdk/aws-batch/test/job-definition.integ.snapshot/manifest.json
@@ -9,7 +9,7 @@
     },
     "BatchDefaultEnvVarsStack": {
       "type": "aws:cloudformation:stack",
-      "environment": "aws://202865745565/eu-west-1",
+      "environment": "aws://unknown-account/unknown-region",
       "properties": {
         "templateFile": "BatchDefaultEnvVarsStack.template.json",
         "validateOnSynth": false

diff --git a/packages/@aws-cdk/aws-batch/test/job-definition.integ.snapshot/tree.json b/packages/@aws-cdk/aws-batch/test/job-definition.integ.snapshot/tree.json
@@ -9,7 +9,7 @@
         "path": "Tree",
         "constructInfo": {
           "fqn": "constructs.Construct",
-          "version": "10.1.71"
+          "version": "10.1.78"
         }
       },
       "BatchDefaultEnvVarsStack": {
@@ -47,11 +47,15 @@
                       "environment": [
                         {
                           "name": "AWS_REGION",
-                          "value": "eu-west-1"
+                          "value": {
+                            "Ref": "AWS::Region"
+                          }
                         },
                         {
                           "name": "AWS_ACCOUNT",
-                          "value": "202865745565"
+                          "value": {
+                            "Ref": "AWS::AccountId"
+                          }
                         }
                       ],
                       "image": "docker/whalesay",
@@ -107,7 +111,7 @@
                 "path": "IntegTest-BatchDefaultEnvVarsStack/DefaultTest/Default",
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.1.71"
+                  "version": "10.1.78"
                 }
               },
               "DeployAssert": {
@@ -127,7 +131,7 @@
                             "path": "IntegTest-BatchDefaultEnvVarsStack/DefaultTest/DeployAssert/AwsApiCallBatchdescribeJobDefinitions/SdkProvider/AssertionsProvider",
                             "constructInfo": {
                               "fqn": "constructs.Construct",
-                              "version": "10.1.71"
+                              "version": "10.1.78"
                             }
                           }
                         },
@@ -167,7 +171,7 @@
                                 "path": "IntegTest-BatchDefaultEnvVarsStack/DefaultTest/DeployAssert/AwsApiCallBatchdescribeJobDefinitions/AssertEqualsBatchdescribeJobDefinitions/AssertionProvider/AssertionsProvider",
                                 "constructInfo": {
                                   "fqn": "constructs.Construct",
-                                  "version": "10.1.71"
+                                  "version": "10.1.78"
                                 }
                               }
                             },
@@ -245,7 +249,7 @@
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.1.71"
+                      "version": "10.1.78"
                     }
                   },
                   "AssetParameters": {
@@ -283,13 +287,13 @@
                         },
                         "constructInfo": {
                           "fqn": "constructs.Construct",
-                          "version": "10.1.71"
+                          "version": "10.1.78"
                         }
                       }
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.1.71"
+                      "version": "10.1.78"
                     }
                   }
                 },