fix(efs): recreate integ.ecs-job-definition

aws · Jun 29, 2023 · 849fd7c · 849fd7c
1 parent ce78939
commit 849fd7c
Show file tree

Hide file tree

Showing 12 changed files with 68 additions and 66 deletions.
diff --git a/...faultTestDeployAssertE5BAAC9B.assets.json → ...faultTestDeployAssertE5BAAC9B.assets.json b/...faultTestDeployAssertE5BAAC9B.assets.json → ...faultTestDeployAssertE5BAAC9B.assets.json
diff --git a/...ultTestDeployAssertE5BAAC9B.template.json → ...ultTestDeployAssertE5BAAC9B.template.json b/...ultTestDeployAssertE5BAAC9B.template.json → ...ultTestDeployAssertE5BAAC9B.template.json
diff --git a/...b7889dfde0a60d16e7bdc96e6c593b/Dockerfile → ...b7889dfde0a60d16e7bdc96e6c593b/Dockerfile b/...b7889dfde0a60d16e7bdc96e6c593b/Dockerfile → ...b7889dfde0a60d16e7bdc96e6c593b/Dockerfile
diff --git a/...97b7889dfde0a60d16e7bdc96e6c593b/index.py → ...97b7889dfde0a60d16e7bdc96e6c593b/index.py b/...97b7889dfde0a60d16e7bdc96e6c593b/index.py → ...97b7889dfde0a60d16e7bdc96e6c593b/index.py
diff --git a/...eg.ecs-job-definition.js.snapshot/cdk.out → ...eg.ecs-job-definition.ts.snapshot/cdk.out b/...eg.ecs-job-definition.js.snapshot/cdk.out → ...eg.ecs-job-definition.ts.snapshot/cdk.out
diff --git a/...ecs-job-definition.js.snapshot/integ.json → ...ecs-job-definition.ts.snapshot/integ.json b/...ecs-job-definition.js.snapshot/integ.json → ...ecs-job-definition.ts.snapshot/integ.json
diff --git a/...-job-definition.js.snapshot/manifest.json → ...-job-definition.ts.snapshot/manifest.json b/...-job-definition.js.snapshot/manifest.json → ...-job-definition.ts.snapshot/manifest.json
@@ -17,7 +17,7 @@
         "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}/dbfcc646c8225dd32d69798b87a8a94086dd89a2b3137bdf4e0ec96d79cdd4cb.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/238f54a14cd8d0bb9eb91ee7e9b46e920ee851fc9520c7c2fa74c997889b2ccb.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
@@ -183,22 +183,16 @@
             "data": "myFileSystemEfsSecurityGroup5809542D"
           }
         ],
-        "/stack/myFileSystem/EfsMountTarget1": [
+        "/stack/myFileSystem/EfsMountTarget-PrivateSubnet1": [
           {
             "type": "aws:cdk:logicalId",
-            "data": "myFileSystemEfsMountTarget154A20479"
+            "data": "myFileSystemEfsMountTargetPrivateSubnet1752908A7"
           }
         ],
-        "/stack/myFileSystem/EfsMountTarget2": [
+        "/stack/myFileSystem/EfsMountTarget-PrivateSubnet2": [
           {
             "type": "aws:cdk:logicalId",
-            "data": "myFileSystemEfsMountTarget2E187D733"
-          }
-        ],
-        "/stack/mySecret/Resource": [
-          {
-            "type": "aws:cdk:logicalId",
-            "data": "mySecretE4D0A59C"
+            "data": "myFileSystemEfsMountTargetPrivateSubnet245A93748"
           }
         ],
         "/stack/myContainer/ExecutionRole/Resource": [

diff --git a/...-definition.js.snapshot/stack.assets.json → ...-definition.ts.snapshot/stack.assets.json b/...-definition.js.snapshot/stack.assets.json → ...-definition.ts.snapshot/stack.assets.json
@@ -1,15 +1,15 @@
 {
   "version": "32.0.0",
   "files": {
-    "dbfcc646c8225dd32d69798b87a8a94086dd89a2b3137bdf4e0ec96d79cdd4cb": {
+    "238f54a14cd8d0bb9eb91ee7e9b46e920ee851fc9520c7c2fa74c997889b2ccb": {
       "source": {
         "path": "stack.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "dbfcc646c8225dd32d69798b87a8a94086dd89a2b3137bdf4e0ec96d79cdd4cb.json",
+          "objectKey": "238f54a14cd8d0bb9eb91ee7e9b46e920ee851fc9520c7c2fa74c997889b2ccb.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...efinition.js.snapshot/stack.template.json → ...efinition.ts.snapshot/stack.template.json b/...efinition.js.snapshot/stack.template.json → ...efinition.ts.snapshot/stack.template.json
@@ -427,7 +427,7 @@
     }
    }
   },
-  "myFileSystemEfsMountTarget154A20479": {
+  "myFileSystemEfsMountTargetPrivateSubnet1752908A7": {
    "Type": "AWS::EFS::MountTarget",
    "Properties": {
     "FileSystemId": {
@@ -446,7 +446,7 @@
     }
    }
   },
-  "myFileSystemEfsMountTarget2E187D733": {
+  "myFileSystemEfsMountTargetPrivateSubnet245A93748": {
    "Type": "AWS::EFS::MountTarget",
    "Properties": {
     "FileSystemId": {

diff --git a/....ecs-job-definition.js.snapshot/tree.json → ....ecs-job-definition.ts.snapshot/tree.json b/....ecs-job-definition.js.snapshot/tree.json → ....ecs-job-definition.ts.snapshot/tree.json
@@ -715,9 +715,9 @@
                   "version": "0.0.0"
                 }
               },
-              "EfsMountTarget1": {
-                "id": "EfsMountTarget1",
-                "path": "stack/myFileSystem/EfsMountTarget1",
+              "EfsMountTarget-PrivateSubnet1": {
+                "id": "EfsMountTarget-PrivateSubnet1",
+                "path": "stack/myFileSystem/EfsMountTarget-PrivateSubnet1",
                 "attributes": {
                   "aws:cdk:cloudformation:type": "AWS::EFS::MountTarget",
                   "aws:cdk:cloudformation:props": {
@@ -742,9 +742,9 @@
                   "version": "0.0.0"
                 }
               },
-              "EfsMountTarget2": {
-                "id": "EfsMountTarget2",
-                "path": "stack/myFileSystem/EfsMountTarget2",
+              "EfsMountTarget-PrivateSubnet2": {
+                "id": "EfsMountTarget-PrivateSubnet2",
+                "path": "stack/myFileSystem/EfsMountTarget-PrivateSubnet2",
                 "attributes": {
                   "aws:cdk:cloudformation:type": "AWS::EFS::MountTarget",
                   "aws:cdk:cloudformation:props": {
@@ -775,30 +775,6 @@
               "version": "0.0.0"
             }
           },
-          "mySecret": {
-            "id": "mySecret",
-            "path": "stack/mySecret",
-            "children": {
-              "Resource": {
-                "id": "Resource",
-                "path": "stack/mySecret/Resource",
-                "attributes": {
-                  "aws:cdk:cloudformation:type": "AWS::SecretsManager::Secret",
-                  "aws:cdk:cloudformation:props": {
-                    "generateSecretString": {}
-                  }
-                },
-                "constructInfo": {
-                  "fqn": "aws-cdk-lib.aws_secretsmanager.CfnSecret",
-                  "version": "0.0.0"
-                }
-              }
-            },
-            "constructInfo": {
-              "fqn": "aws-cdk-lib.aws_secretsmanager.Secret",
-              "version": "0.0.0"
-            }
-          },
           "myContainer": {
             "id": "myContainer",
             "path": "stack/myContainer",
@@ -848,8 +824,8 @@
               }
             },
             "constructInfo": {
-              "fqn": "constructs.Construct",
-              "version": "10.2.52"
+              "fqn": "@aws-cdk/aws-batch-alpha.EcsEc2ContainerDefinition",
+              "version": "0.0.0"
             }
           },
           "ECSJobDefn": {
@@ -892,14 +868,6 @@
                           "value": "12"
                         }
                       ],
-                      "secrets": [
-                        {
-                          "name": "MY_SECRET_ENV_VAR",
-                          "valueFrom": {
-                            "Ref": "mySecretE4D0A59C"
-                          }
-                        }
-                      ],
                       "mountPoints": [
                         {
                           "containerPath": "ahhh",
@@ -948,7 +916,7 @@
               }
             },
             "constructInfo": {
-              "fqn": "aws-cdk-lib.Resource",
+              "fqn": "@aws-cdk/aws-batch-alpha.EcsJobDefinition",
               "version": "0.0.0"
             }
           },
@@ -1001,8 +969,8 @@
               }
             },
             "constructInfo": {
-              "fqn": "constructs.Construct",
-              "version": "10.2.52"
+              "fqn": "@aws-cdk/aws-batch-alpha.EcsFargateContainerDefinition",
+              "version": "0.0.0"
             }
           },
           "ECSFargateJobDefn": {
@@ -1086,7 +1054,7 @@
               }
             },
             "constructInfo": {
-              "fqn": "aws-cdk-lib.Resource",
+              "fqn": "@aws-cdk/aws-batch-alpha.EcsJobDefinition",
               "version": "0.0.0"
             }
           },
@@ -1235,8 +1203,8 @@
               }
             },
             "constructInfo": {
-              "fqn": "constructs.Construct",
-              "version": "10.2.52"
+              "fqn": "@aws-cdk/aws-batch-alpha.EcsEc2ContainerDefinition",
+              "version": "0.0.0"
             }
           },
           "ECSDockerJobDefn": {
@@ -1287,7 +1255,7 @@
               }
             },
             "constructInfo": {
-              "fqn": "aws-cdk-lib.Resource",
+              "fqn": "@aws-cdk/aws-batch-alpha.EcsJobDefinition",
               "version": "0.0.0"
             }
           },
@@ -1326,7 +1294,7 @@
                 "path": "BatchEcsJobDefinitionTest/DefaultTest/Default",
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.52"
+                  "version": "10.2.55"
                 }
               },
               "DeployAssert": {
@@ -1372,7 +1340,7 @@
         "path": "Tree",
         "constructInfo": {
           "fqn": "constructs.Construct",
-          "version": "10.2.52"
+          "version": "10.2.55"
         }
       }
     },

diff --git a/packages/@aws-cdk/cx-api/FEATURE_FLAGS.md b/packages/@aws-cdk/cx-api/FEATURE_FLAGS.md
@@ -54,6 +54,7 @@ Flags come in three types:
 | [@aws-cdk/aws-ec2:restrictDefaultSecurityGroup](#aws-cdkaws-ec2restrictdefaultsecuritygroup) | Restrict access to the VPC default security group | 2.78.0 | (default) |
 | [@aws-cdk/aws-kms:aliasNameRef](#aws-cdkaws-kmsaliasnameref) | KMS Alias name and keyArn will have implicit reference to KMS Key | 2.83.0 | (fix) |
 | [@aws-cdk/core:includePrefixInUniqueNameGeneration](#aws-cdkcoreincludeprefixinuniquenamegeneration) | Include the stack prefix in the stack name generation process | 2.84.0 | (fix) |
+| [@aws-cdk/aws-efs:mountTargetOrderInsensitiveLogicalId](#aws-cdkaws-efsmounttargetorderinsensitivelogicalid) | When enabled, mount targets will have a stable logicalId that is linked to the associated subnet. | V2NEXT | (fix) |
 
 <!-- END table -->
 
@@ -98,7 +99,8 @@ The following json shows the current recommended set of flags, as `cdk init` wou
     "@aws-cdk/aws-ec2:restrictDefaultSecurityGroup": true,
     "@aws-cdk/aws-apigateway:requestValidatorUniqueId": true,
     "@aws-cdk/aws-kms:aliasNameRef": true,
-    "@aws-cdk/core:includePrefixInUniqueNameGeneration": true
+    "@aws-cdk/core:includePrefixInUniqueNameGeneration": true,
+    "@aws-cdk/aws-efs:mountTargetOrderInsensitiveLogicalId": true
   }
 }
 ```
@@ -1008,4 +1010,22 @@ is not viable in some productive setups.
 | 2.84.0 | `false` | `true` |
 
 
+### @aws-cdk/aws-efs:mountTargetOrderInsensitiveLogicalId
+
+*When enabled, mount targets will have a stable logicalId that is linked to the associated subnet.* (fix)
+
+When this feature flag is enabled, each mount target will have a stable
+logicalId that is linked to the associated subnet. If the flag is set to
+false then the logicalIds of the mount targets can change if the number of
+subnets changes.
+
+Set this flag to false for existing mount targets.
+
+
+| Since | Default | Recommended |
+| ----- | ----- | ----- |
+| (not in v1) |  |  |
+| V2NEXT | `false` | `true` |
+
+
 <!-- END details -->
diff --git a/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md b/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md
@@ -58,6 +58,7 @@ Flags come in three types:
 | [@aws-cdk/aws-ec2:restrictDefaultSecurityGroup](#aws-cdkaws-ec2restrictdefaultsecuritygroup) | Restrict access to the VPC default security group | 2.78.0 | (default) |
 | [@aws-cdk/aws-kms:aliasNameRef](#aws-cdkaws-kmsaliasnameref) | KMS Alias name and keyArn will have implicit reference to KMS Key | 2.83.0 | (fix) |
 | [@aws-cdk/core:includePrefixInUniqueNameGeneration](#aws-cdkcoreincludeprefixinuniquenamegeneration) | Include the stack prefix in the stack name generation process | 2.84.0 | (fix) |
+| [@aws-cdk/aws-efs:mountTargetOrderInsensitiveLogicalId](#aws-cdkaws-efsmounttargetorderinsensitivelogicalid) | When enabled, mount targets will have a stable logicalId that is linked to the associated subnet. | V2NEXT | (fix) |
 
 <!-- END table -->
 
@@ -102,7 +103,8 @@ The following json shows the current recommended set of flags, as `cdk init` wou
     "@aws-cdk/aws-ec2:restrictDefaultSecurityGroup": true,
     "@aws-cdk/aws-apigateway:requestValidatorUniqueId": true,
     "@aws-cdk/aws-kms:aliasNameRef": true,
-    "@aws-cdk/core:includePrefixInUniqueNameGeneration": true
+    "@aws-cdk/core:includePrefixInUniqueNameGeneration": true,
+    "@aws-cdk/aws-efs:mountTargetOrderInsensitiveLogicalId": true
   }
 }
 ```
@@ -1088,4 +1090,22 @@ is not viable in some productive setups.
 | 2.84.0 | `false` | `true` |
 
 
+### @aws-cdk/aws-efs:mountTargetOrderInsensitiveLogicalId
+
+*When enabled, mount targets will have a stable logicalId that is linked to the associated subnet.* (fix)
+
+When this feature flag is enabled, each mount target will have a stable
+logicalId that is linked to the associated subnet. If the flag is set to
+false then the logicalIds of the mount targets can change if the number of
+subnets changes.
+
+Set this flag to false for existing mount targets.
+
+
+| Since | Default | Recommended |
+| ----- | ----- | ----- |
+| (not in v1) |  |  |
+| V2NEXT | `false` | `true` |
+
+
 <!-- END details -->