Merge pull request #3759 from 18F/3737-upgrade-node-remove-dns-workar…

…ound

3737 upgrade node remove dns workaround

.circleci/config.yml

@@ -101,7 +101,7 @@ commands:
 jobs:
   build:
     docker:
-      - image: circleci/node:16.4
+      - image: circleci/node:16.13
         environment:
           YARN_VERSION: 0.24.6-1
           CC_TEST_REPORTER_ID: 101a439651b6abd27e5440028a53b5b8f08fe0889f3948d5f58f6cf9f7c786a0
@@ -166,7 +166,7 @@ jobs:
 
   deploy:
     docker:
-      - image: circleci/node:16.4
+      - image: circleci/node:16.13
     parameters:
       app:
         type: string
@@ -190,7 +190,7 @@ jobs:
 
   deploy-admin-client:
     docker:
-      - image: circleci/node:16.4
+      - image: circleci/node:16.13
     parameters:
       app:
         type: string
@@ -234,7 +234,7 @@ jobs:
 
   deploy-queues-ui:
     docker:
-      - image: circleci/node:16.4
+      - image: circleci/node:16.13
     parameters:
       app:
         type: string

Dockerfile-app

@@ -1,4 +1,4 @@
-FROM node:16.4
+FROM node:16.13.1
 
 WORKDIR /app
 

admin-client/Dockerfile-admin

@@ -1,4 +1,4 @@
-FROM node:16.4
+FROM node:16.13.1
 
 WORKDIR /app
 

admin-client/package.json

@@ -10,8 +10,8 @@
     "start": "sirv public -p 3000 --host --single --dev"
   },
   "engines": {
-    "node": "16.x.x",
-    "npm": "7.x.x"
+    "node": "^16.13.1",
+    "npm": "^8.1.2"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^12.0.0",

api/services/Dns.js

@@ -107,29 +107,6 @@ async function resolveDnsRecord(dnsRecord) {
       return [DnsResultState.Pending, 'Record not set'];
     }
 
-    // 2021-11-10
-    // A temporary workaround until node is updated with the latest c-ares version
-    // that fixes the regression in handling domain names with underscores
-    // https://github.com/nodejs/node/issues/39780
-    if (code === 'EBADRESP') {
-      // eslint-disable-next-line global-require
-      const { execFileSync } = require('child_process');
-      const value = execFileSync('dig', ['+short', dnsRecord.type, dnsRecord.name], { encoding: 'utf8' });
-
-      if (!value) {
-        return [DnsResultState.Pending, 'Record not set'];
-      }
-
-      const formattedValue = value.trim().slice(0, -1);
-
-      if (formattedValue === dnsRecord.target) {
-        return [DnsResultState.Success];
-      }
-
-      return [DnsResultState.Pending, `Record incorrectly set to ${formattedValue}`];
-    }
-    // end workaround
-
     return [DnsResultState.Error, error.message];
   }
 }

ci/docker/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   app:
-    image: node:16
+    image: node:16.13
     volumes:
       - ../..:/app
     depends_on:

ci/pipeline.yml

@@ -12,7 +12,7 @@ node-image: &node-image
   type: docker-image
   source:
     repository: node
-    tag: 16
+    tag: 16.13
 
 cf-image: &cf-image
   platform: linux
@@ -524,7 +524,7 @@ resources:
     type: docker-image
     source:
       repository: node
-      tag: 16
+      tag: 16.13
 
   - name: slack
     type: slack-notification

package.json

@@ -95,7 +95,8 @@
     "send-email": "node ./scripts/send-email.js",
     "bootstrap-admins": "node ./scripts/bootstrap-admins.js",
     "migrate-build-notification-settings": "node ./scripts/migrate-build-notification-settings.js",
-    "remove-bucket-website-configs": "node ./scripts/remove-bucket-website-configs.js"
+    "remove-bucket-website-configs": "node ./scripts/remove-bucket-website-configs.js",
+    "check-object-paths": "node ./scripts/check-object-paths.js"
   },
   "main": "index.js",
   "repository": {
@@ -171,7 +172,7 @@
     "webpack-manifest-plugin": "^3.0.0"
   },
   "engines": {
-    "node": "16.x.x",
-    "npm": "7.x.x"
+    "node": "^16.13.1",
+    "npm": "^8.1.2"
   }
 }