-
Notifications
You must be signed in to change notification settings - Fork 102
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
CUMULUS-3433 - Update to nodeJs v20 (#3636)
* Update core deps to v20.12.2 * Update unit test to rmove .sort .sort is intermittently failing to order as expected, causing this test to fail in local test at an alarming failure rate. Updating test to be more explicit/remove sort, however this needs to be investigated prior to closing thie branch/PR/ticket * Update kinesis test to node v20 JSON.parse now throws a different error for the merged test case. * Update knex test to handle new subdependency throwing an Aggregate error * Revert "Update unit test to rmove .sort" This reverts commit adbad84. * Update got * Revert "Update got" This reverts commit a19f9d1. * Upgrade ava/nock, fix ingest provider tests * Reapply "Update got" This reverts commit e652516. * Update ingest module for node 20 This update has a couple of controversial changes in it: Updating got to v14 means we're using a pure ESM module given sindre's stance on not supporting common exports. That's being done due to incompatible changes in node streams requires at least got v12 Additionally there's a probable outstanding issue in got sindresorhus/got#2341 related to node v20/fs readstreams/nock and/or msw incompatibility (as well as a possible open source contrib) * Remove httpClient test mock/fix Updating the existing apache server to return 200 on an existing endpoint is far better than the prior commit approach in that it's a valid/useful unit test as a result, with the technical/less tidy downside of requiring the unit test stack to be working. * Update local test stack configuration to restrict connection to localhost * Update send-pan test/dependencies * Update lambdas/async operation to deploy with node 20 * Update common to export a helper to import ESM got module * Add docstring to importGot * Remove unneeded imports * Minor PR review fixes * Update CHANGELOG * Update CHANGELOG * Reconfigure CI to not use unsafe perms modification * Fix broken package.json * Fix extran. dep issue * Make error message test less specific * Update test to not rely on aggregate internal errors * Update packages/ingest/test/test-HttpProviderClient.js Co-authored-by: etcart <[email protected]> * Move importGot -> importEsm, introduce static import definition * Fix inadvertant test commit * Update CMA-js dependency to v2.2.0 * Remove dynamic/frozen import --------- Co-authored-by: etcart <[email protected]>
- Loading branch information
Showing
150 changed files
with
310 additions
and
259 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
16.19.0 | ||
20.12.2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
## Dockerfile to create integration/unit test environment | ||
FROM node:16.19.0-buster | ||
RUN apt update && npm config set unsafe-perm true &&\ | ||
FROM node:20.12.2-buster | ||
RUN apt update &&\ | ||
apt install -y netcat zip jq rsync zip | ||
RUN apt-get install -y make build-essential libssl-dev zlib1g-dev libbz2-dev \ | ||
libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev \ | ||
|
@@ -15,13 +15,8 @@ WORKDIR "/opt/Python-$PYTHON_VERSION.$PYTHON_VERSION_PATCH" | |
RUN ./configure --enable-optimizations && make -j4 && make altinstall | ||
|
||
WORKDIR / | ||
|
||
|
||
|
||
|
||
|
||
RUN update-alternatives --install /usr/bin/python python /usr/local/bin/python3.10 1 && \ | ||
update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1 | ||
RUN python -m pip install -U pip | ||
RUN npm install -g [email protected] && npm config --global set script-shell /bin/bash | ||
RUN npm config --global set script-shell /bin/bash | ||
RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && unzip awscliv2.zip && ./aws/install |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,8 +13,6 @@ npm install @octokit/[email protected] [email protected] | |
. ./bamboo/abort-if-not-pr.sh | ||
|
||
|
||
npm config set unsafe-perm true | ||
|
||
set -o pipefail | ||
|
||
CURRENT_WORKING_DIR=$NONCACHE_WORKING_DIR | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,20 +2,20 @@ | |
# This is the main Apache HTTP server configuration file. It contains the | ||
# configuration directives that give the server its instructions. | ||
# See <URL:http://httpd.apache.org/docs/2.4/> for detailed information. | ||
# In particular, see | ||
# In particular, see | ||
# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html> | ||
# for a discussion of each configuration directive. | ||
# | ||
# Do NOT simply read the instructions in here without understanding | ||
# what they do. They're here only as hints or reminders. If you are unsure | ||
# consult the online docs. You have been warned. | ||
# consult the online docs. You have been warned. | ||
# | ||
# Configuration and logfile names: If the filenames you specify for many | ||
# of the server's control files begin with "/" (or "drive:/" for Win32), the | ||
# server will use that explicit path. If the filenames do *not* begin | ||
# with "/", the value of ServerRoot is prepended -- so "logs/access_log" | ||
# with ServerRoot set to "/usr/local/apache2" will be interpreted by the | ||
# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" | ||
# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" | ||
# will be interpreted as '/logs/access_log'. | ||
|
||
# | ||
|
@@ -45,11 +45,11 @@ ServerRoot "/usr/local/apache2" | |
# ports, instead of the default. See also the <VirtualHost> | ||
# directive. | ||
# | ||
# Change this to Listen on specific IP addresses as shown below to | ||
# Change this to Listen on specific IP addresses as shown below to | ||
# prevent Apache from glomming onto all bound IP addresses. | ||
# | ||
#Listen 12.34.56.78:80 | ||
Listen 3030 | ||
Listen 3030 | ||
|
||
# | ||
# Dynamic Shared Object (DSO) Support | ||
|
@@ -171,7 +171,7 @@ LoadModule version_module modules/mod_version.so | |
LoadModule unixd_module modules/mod_unixd.so | ||
#LoadModule heartbeat_module modules/mod_heartbeat.so | ||
#LoadModule heartmonitor_module modules/mod_heartmonitor.so | ||
#LoadModule dav_module modules/mod_dav.so | ||
LoadModule dav_module modules/mod_dav.so | ||
LoadModule status_module modules/mod_status.so | ||
LoadModule autoindex_module modules/mod_autoindex.so | ||
#LoadModule asis_module modules/mod_asis.so | ||
|
@@ -189,16 +189,16 @@ LoadModule autoindex_module modules/mod_autoindex.so | |
#LoadModule negotiation_module modules/mod_negotiation.so | ||
LoadModule dir_module modules/mod_dir.so | ||
#LoadModule imagemap_module modules/mod_imagemap.so | ||
#LoadModule actions_module modules/mod_actions.so | ||
LoadModule actions_module modules/mod_actions.so | ||
#LoadModule speling_module modules/mod_speling.so | ||
#LoadModule userdir_module modules/mod_userdir.so | ||
LoadModule alias_module modules/mod_alias.so | ||
#LoadModule rewrite_module modules/mod_rewrite.so | ||
LoadModule rewrite_module modules/mod_rewrite.so | ||
|
||
<IfModule unixd_module> | ||
# | ||
# If you wish httpd to run as a different user or group, you must run | ||
# httpd as root initially and it will switch. | ||
# httpd as root initially and it will switch. | ||
# | ||
# User/Group: The name (or #number) of the user/group to run httpd as. | ||
# It is usually good practice to create a dedicated user and group for | ||
|
@@ -239,7 +239,7 @@ ServerAdmin [email protected] | |
|
||
# | ||
# Deny access to the entirety of your server's filesystem. You must | ||
# explicitly permit access to web content directories in other | ||
# explicitly permit access to web content directories in other | ||
# <Directory> blocks below. | ||
# | ||
<Directory /> | ||
|
@@ -261,6 +261,7 @@ ServerAdmin [email protected] | |
# | ||
DocumentRoot "/usr/local/apache2/htdocs" | ||
<Directory "/usr/local/apache2/htdocs"> | ||
|
||
# | ||
# Possible values for the Options directive are "None", "All", | ||
# or any combination of: | ||
|
@@ -297,8 +298,8 @@ DocumentRoot "/usr/local/apache2/htdocs" | |
</IfModule> | ||
|
||
# | ||
# The following lines prevent .htaccess and .htpasswd files from being | ||
# viewed by Web clients. | ||
# The following lines prevent .htaccess and .htpasswd files from being | ||
# viewed by Web clients. | ||
# | ||
<Files ".ht*"> | ||
Require all denied | ||
|
@@ -351,8 +352,8 @@ LogLevel warn | |
|
||
<IfModule alias_module> | ||
# | ||
# Redirect: Allows you to tell clients about documents that used to | ||
# exist in your server's namespace, but do not anymore. The client | ||
# Redirect: Allows you to tell clients about documents that used to | ||
# exist in your server's namespace, but do not anymore. The client | ||
# will make a new request for the document at its new location. | ||
# Example: | ||
# Redirect permanent /foo http://www.example.com/bar | ||
|
@@ -369,7 +370,7 @@ LogLevel warn | |
# the filesystem path. | ||
|
||
# | ||
# ScriptAlias: This controls which directories contain server scripts. | ||
# ScriptAlias: This controls which directories contain server scripts. | ||
# ScriptAliases are essentially the same as Aliases, except that | ||
# documents in the target directory are treated as applications and | ||
# run by the server when requested rather than as documents sent to the | ||
|
@@ -388,6 +389,15 @@ LogLevel warn | |
#Scriptsock cgisock | ||
</IfModule> | ||
|
||
|
||
### Configuration to allow PUT endpoint | ||
|
||
RewriteEngine On | ||
RewriteCond %{REQUEST_METHOD} ^POST$ | ||
RewriteCond %{REQUEST_URI} ^/post_test.*$ | ||
RewriteRule .* - [R=200,L,E=no-gzip:1] | ||
|
||
|
||
# | ||
# "/usr/local/apache2/cgi-bin" should be changed to whatever your ScriptAliased | ||
# CGI directory exists, if you have that configured. | ||
|
@@ -481,10 +491,10 @@ LogLevel warn | |
#MaxRanges unlimited | ||
|
||
# | ||
# EnableMMAP and EnableSendfile: On systems that support it, | ||
# EnableMMAP and EnableSendfile: On systems that support it, | ||
# memory-mapping or the sendfile syscall may be used to deliver | ||
# files. This usually improves server performance, but must | ||
# be turned off when serving from networked-mounted | ||
# be turned off when serving from networked-mounted | ||
# filesystems or if support for these functions is otherwise | ||
# broken on your system. | ||
# Defaults: EnableMMAP On, EnableSendfile Off | ||
|
@@ -494,9 +504,9 @@ LogLevel warn | |
|
||
# Supplemental configuration | ||
# | ||
# The configuration files in the conf/extra/ directory can be | ||
# included to add extra features or to modify the default configuration of | ||
# the server, or you may simply copy their contents here and change as | ||
# The configuration files in the conf/extra/ directory can be | ||
# included to add extra features or to modify the default configuration of | ||
# the server, or you may simply copy their contents here and change as | ||
# necessary. | ||
|
||
# Server-pool management (MPM specific) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.