From 4b962de888f4770ed13c6e5bce437b8516db9ffb Mon Sep 17 00:00:00 2001 From: David Corwin Date: Fri, 21 Jan 2022 15:16:59 -0800 Subject: [PATCH 1/3] Upgrade to at least node 16.13.1 everywhere --- .circleci/config.yml | 8 ++++---- Dockerfile-app | 2 +- admin-client/Dockerfile-admin | 2 +- admin-client/package.json | 4 ++-- ci/docker/docker-compose.yml | 2 +- ci/pipeline.yml | 4 ++-- package.json | 7 ++++--- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1f564fb9a..fec002ae9 100644 --- a/.circleci/config.yml +++ b/.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 diff --git a/Dockerfile-app b/Dockerfile-app index a53a95f08..eac6c287b 100644 --- a/Dockerfile-app +++ b/Dockerfile-app @@ -1,4 +1,4 @@ -FROM node:16.4 +FROM node:16.13 WORKDIR /app diff --git a/admin-client/Dockerfile-admin b/admin-client/Dockerfile-admin index a53a95f08..eac6c287b 100644 --- a/admin-client/Dockerfile-admin +++ b/admin-client/Dockerfile-admin @@ -1,4 +1,4 @@ -FROM node:16.4 +FROM node:16.13 WORKDIR /app diff --git a/admin-client/package.json b/admin-client/package.json index 87f721b06..9f02f9cf6 100644 --- a/admin-client/package.json +++ b/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", diff --git a/ci/docker/docker-compose.yml b/ci/docker/docker-compose.yml index af76dc078..e2887507f 100644 --- a/ci/docker/docker-compose.yml +++ b/ci/docker/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: app: - image: node:16 + image: node:16.13 volumes: - ../..:/app depends_on: diff --git a/ci/pipeline.yml b/ci/pipeline.yml index be5488fe6..79904a55f 100644 --- a/ci/pipeline.yml +++ b/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 diff --git a/package.json b/package.json index 91fb465bc..2e9cc1a75 100644 --- a/package.json +++ b/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" } } From 78e5f5619c30eca7f7c501ef2824d6fe4c4321e7 Mon Sep 17 00:00:00 2001 From: David Corwin Date: Fri, 21 Jan 2022 15:27:06 -0800 Subject: [PATCH 2/3] Remove dns workaround --- api/services/Dns.js | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/api/services/Dns.js b/api/services/Dns.js index aa10a88bf..fccd2ad77 100644 --- a/api/services/Dns.js +++ b/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]; } } From 86bcf2b50800bb688d387876d98d6513926f4006 Mon Sep 17 00:00:00 2001 From: David Corwin Date: Wed, 26 Jan 2022 13:31:55 -0800 Subject: [PATCH 3/3] Update local dockerfile to ensure they are using at least 16.13.1 --- Dockerfile-app | 2 +- admin-client/Dockerfile-admin | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile-app b/Dockerfile-app index eac6c287b..ee2db958d 100644 --- a/Dockerfile-app +++ b/Dockerfile-app @@ -1,4 +1,4 @@ -FROM node:16.13 +FROM node:16.13.1 WORKDIR /app diff --git a/admin-client/Dockerfile-admin b/admin-client/Dockerfile-admin index eac6c287b..ee2db958d 100644 --- a/admin-client/Dockerfile-admin +++ b/admin-client/Dockerfile-admin @@ -1,4 +1,4 @@ -FROM node:16.13 +FROM node:16.13.1 WORKDIR /app