Update Deps

openaddresses · Oct 15, 2024 · ebd5ea2 · ebd5ea2
1 parent bd0eab2
commit ebd5ea2
Show file tree

Hide file tree

Showing 7 changed files with 3,562 additions and 1,162 deletions.
diff --git a/api/package-lock.json b/api/package-lock.json
diff --git a/api/package.json b/api/package.json
@@ -33,7 +33,7 @@
         "@openaddresses/batch-generic": "^14.0.0",
         "@openaddresses/batch-schema": "^9.0.0",
         "@turf/turf": "^6.5.0",
-        "ajv-formats": "^2.1.1",
+        "ajv-formats": "^3.0.0",
         "bcrypt": "^5.0.0",
         "body-parser": "^1.20.2",
         "busboy": "^1.6.0",
@@ -68,7 +68,7 @@
         "glob": "^10.0.1",
         "nock": "^13.0.8",
         "nodemon": "^3.0.0",
-        "nyc": "^15.1.0",
+        "nyc": "^17.0.0",
         "path-to-regexp": "^6.2.1",
         "tap-merge": "^0.3.1"
     }

diff --git a/cloudformation/task.template.js b/cloudformation/task.template.js
@@ -44,6 +44,37 @@ export default {
                 State: 'ENABLED'
             }
         },
+        BatchLargeComputeEnvironment: {
+            Type: 'AWS::Batch::ComputeEnvironment',
+            Properties: {
+                Type: 'MANAGED',
+                ServiceRole: cf.getAtt('BatchServiceRole', 'Arn'),
+                ComputeEnvironmentName: 'mega',
+                ComputeResources: {
+                    ImageId: 'ami-0914ebfbccd143a3f',
+                    MaxvCpus: 16,
+                    DesiredvCpus: 0,
+                    MinvCpus: 0,
+                    SecurityGroupIds: [cf.ref('BatchSecurityGroup')],
+                    LaunchTemplate: {
+                        LaunchTemplateId: cf.ref('BatchLargeLaunchTemplate'),
+                        Version: cf.getAtt('BatchLargeLaunchTemplate', 'LatestVersionNumber')
+                    },
+                    Subnets:  [
+                        'subnet-de35c1f5',
+                        'subnet-e67dc7ea',
+                        'subnet-38b72502',
+                        'subnet-76ae3713',
+                        'subnet-35d87242',
+                        'subnet-b978ade0'
+                    ],
+                    Type : 'EC2',
+                    InstanceRole : cf.getAtt('BatchInstanceProfile', 'Arn'),
+                    InstanceTypes : ['m5.large', 'c5.large']
+                },
+                State: 'ENABLED'
+            }
+        },
         BatchInstanceRole: {
             Type: 'AWS::IAM::Role',
             Properties: {
@@ -68,6 +99,22 @@ export default {
                 Path: '/'
             }
         },
+        BatchLargeLaunchTemplate: {
+            Type: 'AWS::EC2::LaunchTemplate',
+            Properties: {
+                LaunchTemplateData: {
+                    BlockDeviceMappings: [{
+                        DeviceName: '/dev/xvda',
+                        Ebs: {
+                            Encrypted: true,
+                            VolumeSize: 250,
+                            VolumeType: 'gp3'
+                        }
+                    }]
+                },
+                LaunchTemplateName: 'mega'
+            }
+        },
         BatchMegaLaunchTemplate: {
             Type: 'AWS::EC2::LaunchTemplate',
             Properties: {

diff --git a/task/.eslintrc.json b/task/.eslintrc.json
diff --git a/task/eslint.config.js b/task/eslint.config.js
@@ -0,0 +1,38 @@
+import js from "@eslint/js";
+import nodePlugin from "eslint-plugin-n";
+
+export default [
+    js.configs.recommended,
+    nodePlugin.configs["flat/recommended-module"],
+    {
+        "rules": {
+            "no-console": 0,
+            "arrow-parens": [ "error", "always" ],
+            "no-var": "error",
+            "prefer-const": "error",
+            "array-bracket-spacing": [ "error", "never" ],
+            "comma-dangle": [ "error", "never" ],
+            "computed-property-spacing": [ "error", "never" ],
+            "eol-last": "error",
+            "eqeqeq": [ "error", "smart" ],
+            "indent": [ "error", 4, { "SwitchCase": 1 } ],
+            "no-confusing-arrow": [ "error", { "allowParens": false } ],
+            "no-extend-native": "error",
+            "no-mixed-spaces-and-tabs": "error",
+            "func-call-spacing": [ "error", "never" ],
+            "no-trailing-spaces": "error",
+            "no-unused-vars": "error",
+            "no-use-before-define": [ "error", "nofunc" ],
+            "object-curly-spacing": [ "error", "always" ],
+            "prefer-arrow-callback": "error",
+            "quotes": [ "error", "single", "avoid-escape" ],
+            "semi": [ "error", "always" ],
+            "space-infix-ops": "error",
+            "spaced-comment": [ "error", "always" ],
+            "keyword-spacing": [ "error", { "before": true, "after": true } ],
+            "template-curly-spacing": [ "error", "never" ],
+            "semi-spacing": "error",
+            "strict": "error",
+        }
+    }
+]