Skip to content

Commit 66b78ff

Browse files
keks42wing328
keks42
and
wing328
authored
Replace deprecated HttpModule from @nestjs/common with @nestjs/axios (#651)
* feat: replace deprecated HttpModule from @nestjs/common with @nestjs/axios * feat: repair yarn.lock-file * feat: update actions and use node 16 for pipelines/actions Co-authored-by: Rebecca Cramer <rebecca.cramer@hdi.de> Co-authored-by: William Cheng <wing328hk@gmail.com>
1 parent aa303d0 commit 66b78ff

7 files changed

Lines changed: 54 additions & 35 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,16 @@ jobs:
1212
build:
1313
name: Build
1414
runs-on: ubuntu-latest
15+
strategy:
16+
matrix:
17+
node-version: [ 16.x ]
1518

1619
steps:
1720
- name: Checkout
18-
uses: actions/checkout@v2
21+
uses: actions/checkout@v3
1922

2023
- name: Use Node.js ${{matrix.node-version }}
21-
uses: actions/setup-node@v2
24+
uses: actions/setup-node@v3
2225
with:
2326
node-version: ${{matrix.node-version }}
2427

@@ -39,7 +42,7 @@ jobs:
3942
cd dist/apps/generator-cli
4043
yarn pack -f ../package.tgz
4144
42-
- uses: actions/upload-artifact@v2
45+
- uses: actions/upload-artifact@v3
4346
with:
4447
name: package.tgz
4548
path: dist/apps/package.tgz
@@ -51,17 +54,18 @@ jobs:
5154
strategy:
5255
matrix:
5356
os: [ ubuntu-latest, macos-latest ]
57+
node-version: [ 16.x ]
5458

5559
steps:
5660
- name: Checkout
57-
uses: actions/checkout@v2
61+
uses: actions/checkout@v3
5862

5963
- name: Use Node.js ${{matrix.node-version }}
60-
uses: actions/setup-node@v2
64+
uses: actions/setup-node@v3
6165
with:
6266
node-version: ${{matrix.node-version }}
6367

64-
- uses: actions/download-artifact@v2
68+
- uses: actions/download-artifact@v3
6569
with:
6670
name: package.tgz
6771

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414

1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v3
1818

1919
- name: Use Node.js ${{matrix.node-version }}
20-
uses: actions/setup-node@v2
20+
uses: actions/setup-node@v3
2121
with:
2222
node-version: ${{matrix.node-version }}
2323

‎apps/generator-cli/src/app/app.module.ts‎

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,13 @@
1-
import { HttpModule, Inject, Module, OnApplicationBootstrap } from '@nestjs/common';
2-
import { AxiosProxyConfig } from 'axios';
3-
import { Command } from 'commander';
4-
import * as url from 'url';
1+
import {Inject, Module, OnApplicationBootstrap} from '@nestjs/common';
2+
import {HttpModule} from '@nestjs/axios';
3+
import {Command} from 'commander';
54

6-
import { COMMANDER_PROGRAM, LOGGER } from './constants';
7-
import { VersionManagerController } from './controllers/version-manager.controller';
8-
import { ConfigService, GeneratorService, PassThroughService, UIService, VersionManagerService } from './services';
9-
10-
let proxyConfig: AxiosProxyConfig;
11-
const proxyUrl = process.env.HTTPS_PROXY || process.env.HTTP_PROXY;
12-
13-
if (proxyUrl) {
14-
const proxy = url.parse(proxyUrl);
15-
const proxyAuth = proxy.auth && proxy.auth.split(':');
16-
17-
proxyConfig = {
18-
host: proxy.hostname,
19-
port: parseInt(proxy.port, 10),
20-
auth: proxyAuth && { username: proxyAuth[0], password: proxyAuth[1] },
21-
protocol: proxy.protocol.replace(':', '')
22-
};
23-
}
5+
import {COMMANDER_PROGRAM, LOGGER} from './constants';
6+
import {VersionManagerController} from './controllers/version-manager.controller';
7+
import {ConfigService, GeneratorService, PassThroughService, UIService, VersionManagerService} from './services';
248

259
@Module({
26-
imports: [HttpModule.register({proxy: proxyConfig})],
10+
imports: [HttpModule],
2711
controllers: [
2812
VersionManagerController
2913
],
@@ -37,7 +21,7 @@ if (proxyUrl) {
3721
provide: COMMANDER_PROGRAM,
3822
useValue: new Command('openapi-generator-cli').helpOption(false).usage('<command> [<args>]')
3923
},
40-
{ provide: LOGGER, useValue: console }
24+
{provide: LOGGER, useValue: console}
4125
]
4226
})
4327
export class AppModule implements OnApplicationBootstrap {
@@ -54,7 +38,7 @@ export class AppModule implements OnApplicationBootstrap {
5438
let selectedVersion = this.versionManager.getSelectedVersion();
5539

5640
if (!selectedVersion) {
57-
const [{ version }] = await this.versionManager.search(['latest']).toPromise();
41+
const [{version}] = await this.versionManager.search(['latest']).toPromise();
5842
await this.versionManager.setSelectedVersion(version);
5943
selectedVersion = version;
6044
}

‎apps/generator-cli/src/app/services/version-manager.service.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Test } from '@nestjs/testing';
22
import { Version, VersionManagerService } from './version-manager.service';
3-
import { HttpService } from '@nestjs/common';
3+
import { HttpService } from '@nestjs/axios';
44
import { of } from 'rxjs';
55
import { LOGGER } from '../constants';
66
import * as chalk from 'chalk';

‎apps/generator-cli/src/app/services/version-manager.service.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import {HttpService, Inject, Injectable} from '@nestjs/common';
1+
import {Inject, Injectable} from '@nestjs/common';
2+
import {HttpService} from '@nestjs/axios';
23
import {catchError, map, switchMap} from 'rxjs/operators';
34
import {replace} from 'lodash';
45
import {Observable} from 'rxjs';

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
}
8282
},
8383
"dependencies": {
84+
"@nestjs/axios": "0.0.8",
8485
"@nestjs/common": "8.4.4",
8586
"@nestjs/core": "8.4.4",
8687
"@nestjs/platform-express": "8.4.4",

‎yarn.lock‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,6 +1256,13 @@
12561256
"@types/yargs" "^16.0.0"
12571257
chalk "^4.0.0"
12581258

1259+
"@nestjs/axios@0.0.8":
1260+
version "0.0.8"
1261+
resolved "https://registry.yarnpkg.com/@nestjs/axios/-/axios-0.0.8.tgz#4e321e36b6bc3ab0f02d80bafe04ae39edfdcacf"
1262+
integrity sha512-oJyfR9/h9tVk776il0829xyj3b2e81yTu6HjPraxynwNtMNGqZBHHmAQL24yMB3tVbBM0RvG3eUXH8+pRCGwlg==
1263+
dependencies:
1264+
axios "0.27.2"
1265+
12591266
"@nestjs/common@8.4.4":
12601267
version "8.4.4"
12611268
resolved "https://registry.yarnpkg.com/@nestjs/common/-/common-8.4.4.tgz#0914c6c0540b5a344c7c8fd6072faa1a49af1158"
@@ -2705,6 +2712,14 @@ axios@0.26.1:
27052712
dependencies:
27062713
follow-redirects "^1.14.8"
27072714

2715+
axios@0.27.2:
2716+
version "0.27.2"
2717+
resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
2718+
integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
2719+
dependencies:
2720+
follow-redirects "^1.14.9"
2721+
form-data "^4.0.0"
2722+
27082723
babel-jest@^27.2.2:
27092724
version "27.2.5"
27102725
resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.2.5.tgz#6bbbc1bb4200fe0bfd1b1fbcbe02fc62ebed16aa"
@@ -5245,6 +5260,11 @@ follow-redirects@^1.14.8:
52455260
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7"
52465261
integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==
52475262

5263+
follow-redirects@^1.14.9:
5264+
version "1.15.1"
5265+
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
5266+
integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
5267+
52485268
for-in@^1.0.2:
52495269
version "1.0.2"
52505270
resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -5283,6 +5303,15 @@ form-data@^3.0.0:
52835303
combined-stream "^1.0.8"
52845304
mime-types "^2.1.12"
52855305

5306+
form-data@^4.0.0:
5307+
version "4.0.0"
5308+
resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
5309+
integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
5310+
dependencies:
5311+
asynckit "^0.4.0"
5312+
combined-stream "^1.0.8"
5313+
mime-types "^2.1.12"
5314+
52865315
form-data@~2.3.2:
52875316
version "2.3.3"
52885317
resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"

0 commit comments

Comments
 (0)