Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore!: upgrade to Node 14 #891

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/.OwlBot.lock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
# limitations under the License.
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest
digest: sha256:0527a86c10b67742c409dc726ba9a31ec4e69b0006e3d7a49b0e6686c59cdaa9
# created: 2023-05-24T20:32:43.844586914Z
digest: sha256:e08f9a3757808cdaf7a377e962308c65c4d7eff12db206d4fae702dd50d43430
# created: 2023-08-03T18:46:14.719706948Z
2 changes: 1 addition & 1 deletion .github/sync-repo-settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ branchProtectionRules:
- "cla/google"
- "docs"
- "lint"
- "test (12)"
- "test (14)"
- "test (16)"
- "test (18)"
- "system-test"
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: [12, 14, 16]
node: [14, 16, 18]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 12
node-version: 14
- run: npm install
- run: npm run system-test
- name: coverage
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/common.cfg

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 0 additions & 24 deletions .kokoro/continuous/node13/common.cfg

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .kokoro/release/docs.cfg

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .kokoro/release/publish.cfg

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .kokoro/samples-test.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .kokoro/system-test.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .kokoro/test.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .kokoro/test.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ also contains samples.

## Supported Node.js Versions

Our client libraries follow the [Node.js release schedule](https://nodejs.org/en/about/releases/).
Our client libraries follow the [Node.js release schedule](https://github.com/nodejs/release#release-schedule).
Libraries are compatible with all current _active_ and _maintenance_ versions of
Node.js.
If you are using an end-of-life version of Node.js, we recommend that you update
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,33 +27,33 @@
},
"license": "Apache-2.0",
"dependencies": {
"@google-cloud/common": "^4.0.0",
"@google-cloud/common": "^5.0.0",
"@google-cloud/logging-min": "^10.0.0",
"@types/console-log-level": "^1.4.0",
"@types/semver": "^7.0.0",
"console-log-level": "^1.4.0",
"delay": "^5.0.0",
"extend": "^3.0.2",
"gcp-metadata": "^4.0.0",
"gcp-metadata": "^6.0.0",
"parse-duration": "^1.0.0",
"pprof": "3.2.1",
"pretty-ms": "^7.0.0",
"protobufjs": "~7.2.4",
"semver": "^7.0.0",
"teeny-request": "^8.0.0"
"teeny-request": "^9.0.0"
},
"devDependencies": {
"@types/extend": "^3.0.0",
"@types/long": "^4.0.0",
"@types/mocha": "^9.0.0",
"@types/nock": "^10.0.0",
"@types/node": "^18.0.0",
"@types/node": "^20.4.9",
"@types/pretty-ms": "^4.0.0",
"@types/sinon": "^10.0.0",
"@types/tmp": "0.2.3",
"c8": "^8.0.0",
"c8": "^8.0.1",
"codecov": "^3.0.0",
"gts": "^3.1.0",
"gts": "^5.0.0",
"js-green-licenses": "^4.0.0",
"jsdoc": "^4.0.0",
"jsdoc-fresh": "^2.0.0",
Expand All @@ -64,7 +64,7 @@
"sinon": "^15.0.0",
"source-map": "^0.7.0",
"tmp": "0.2.1",
"typescript": "^4.7.2"
"typescript": "^5.1.6"
},
"files": [
"build/src",
Expand All @@ -77,6 +77,6 @@
]
},
"engines": {
"node": ">=12.0.0"
"node": ">=14.0.0"
}
}
4 changes: 2 additions & 2 deletions samples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"test": "echo 'no test yet'"
},
"engines": {
"node": ">=12.0.0"
"node": ">=14.0.0"
},
"repository": {
"type": "git",
Expand All @@ -22,4 +22,4 @@
"files": [
"*.js"
]
}
}
5 changes: 4 additions & 1 deletion src/profiler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,10 @@
* Error constructed from HTTP server response which indicates backoff.
*/
export class BackoffResponseError extends Error {
constructor(message: string | undefined, readonly backoffMillis: number) {
constructor(
message: string | undefined,
readonly backoffMillis: number
) {

Check warning on line 203 in src/profiler.ts

View check run for this annotation

Codecov / codecov/patch

src/profiler.ts#L201-L203

Added lines #L201 - L203 were not covered by tests
super(message);
}
}
Expand Down
2 changes: 1 addition & 1 deletion system-test/busybench/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"build/src"
],
"engines": {
"node": ">=12.0.0"
"node": ">=14.0.0"
},
"license": "Apache-2.0",
"keywords": [],
Expand Down
33 changes: 23 additions & 10 deletions system-test/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ npm_install() {

# Install git
retry apt-get update >/dev/null
retry apt-get -y -q install git >/dev/null
retry apt-get -y -q install git build-essential >/dev/null

# Install desired version of Node.js
retry curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash >/dev/null
Expand Down Expand Up @@ -265,25 +265,38 @@ func TestAgentIntegration(t *testing.T) {
InstanceConfig: proftest.InstanceConfig{
ProjectID: projectID,
Zone: zone,
Name: fmt.Sprintf("profiler-test-node12-%s", runID),
Name: fmt.Sprintf("profiler-test-node14-%s", runID),
MachineType: "n1-standard-1",
},
name: fmt.Sprintf("profiler-test-node12-%s-gce", runID),
name: fmt.Sprintf("profiler-test-node14-%s-gce", runID),
wantProfiles: wantProfiles,
nodeVersion: "12",
nodeVersion: "14",
timeout: gceTestTimeout,
benchDuration: gceBenchDuration,
},
{
InstanceConfig: proftest.InstanceConfig{
ProjectID: projectID,
Zone: zone,
Name: fmt.Sprintf("profiler-test-node14-%s", runID),
Name: fmt.Sprintf("profiler-test-node16-%s", runID),
MachineType: "n1-standard-1",
},
name: fmt.Sprintf("profiler-test-node14-%s-gce", runID),
name: fmt.Sprintf("profiler-test-node16-%s-gce", runID),
wantProfiles: wantProfiles,
nodeVersion: "14",
nodeVersion: "16",
timeout: gceTestTimeout,
benchDuration: gceBenchDuration,
},
{
InstanceConfig: proftest.InstanceConfig{
ProjectID: projectID,
Zone: zone,
Name: fmt.Sprintf("profiler-test-node18-%s", runID),
MachineType: "n1-standard-1",
},
name: fmt.Sprintf("profiler-test-node18-%s-gce", runID),
wantProfiles: wantProfiles,
nodeVersion: "18",
timeout: gceTestTimeout,
benchDuration: gceBenchDuration,
},
Expand All @@ -295,16 +308,16 @@ func TestAgentIntegration(t *testing.T) {
InstanceConfig: proftest.InstanceConfig{
ProjectID: projectID,
Zone: zone,
Name: fmt.Sprintf("profiler-backoff-test-node12-%s", runID),
Name: fmt.Sprintf("profiler-backoff-test-node14-%s", runID),

// Running many copies of the benchmark requires more
// memory than is available on an n1-standard-1. Use a
// machine type with more memory for backoff test.
MachineType: "n1-highmem-2",
},
name: fmt.Sprintf("profiler-backoff-test-node12-%s", runID),
name: fmt.Sprintf("profiler-backoff-test-node14-%s", runID),
backoffTest: true,
nodeVersion: "12",
nodeVersion: "14",
timeout: backoffTestTimeout,
benchDuration: backoffBenchDuration,
})
Expand Down