Skip to content

Commit 3d4d183

Browse files
author
miaowing
committed
update nestcloud
1 parent 8047879 commit 3d4d183

5 files changed

+57
-33
lines changed

‎package.json

+7-5
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
"dependencies": {
1010
"@godaddy/terminus": "^4.1.0",
1111
"@grpc/proto-loader": "0.4.0",
12-
"@nestcloud/boot": "^0.7.3",
13-
"@nestcloud/common": "^0.7.2",
14-
"@nestcloud/consul": "^0.7.2",
15-
"@nestcloud/loadbalance": "^0.7.3",
16-
"@nestcloud/service": "^0.7.2",
12+
"@nestcloud/boot": "^0.7.13",
13+
"@nestcloud/common": "^0.7.13",
14+
"@nestcloud/consul": "^0.7.13",
15+
"@nestcloud/etcd": "0.7.13",
16+
"@nestcloud/loadbalance": "^0.7.13",
1717
"@nestcloud/rbac": "^0.7.1",
18+
"@nestcloud/service": "^0.7.13",
1819
"@nestjs/common": "^6.5.3",
1920
"@nestjs/core": "^6.5.3",
2021
"@nestjs/platform-express": "^6.5.3",
@@ -23,6 +24,7 @@
2324
"class-transformer": "0.2.0",
2425
"class-validator": "0.9.1",
2526
"consul": "^0.34.1",
27+
"etcd3": "^0.2.13",
2628
"reflect-metadata": "0.1.13",
2729
"rxjs": "6.4.0",
2830
"typescript": "3.4.4"

‎src/app.module.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Module } from '@nestjs/common';
2-
import { BOOT, CONSUL } from '@nestcloud/common';
2+
import { BOOT, CONSUL, ETCD } from '@nestcloud/common';
33
import { BootModule } from '@nestcloud/boot';
44
import { ConsulModule } from '@nestcloud/consul';
55
import { ServiceModule } from '@nestcloud/service';
@@ -9,14 +9,15 @@ import { TerminusModule } from '@nestjs/terminus';
99
import { HeroController } from './hero.controller';
1010
import { resolve } from 'path';
1111
import { RbacValidatorRegister } from './rbac-validator.register';
12+
import { EtcdModule } from '@nestcloud/etcd';
1213

1314
@Module({
1415
imports: [
1516
BootModule.forRoot({ filePath: resolve(__dirname, 'config.yaml') }),
16-
ConsulModule.forRootAsync({ inject: [BOOT] }),
17-
ServiceModule.forRootAsync({ inject: [BOOT, CONSUL] }),
17+
EtcdModule.forRootAsync({ inject: [BOOT] }),
18+
ServiceModule.forRootAsync({ inject: [BOOT, ETCD] }),
1819
LoadbalanceModule.forRootAsync({ inject: [BOOT] }),
19-
RbacModule.forRootAsync({ inject: [CONSUL, BOOT] }),
20+
RbacModule.forRootAsync({ inject: [ETCD, BOOT] }),
2021
TerminusModule.forRootAsync({
2122
useFactory: () => ({ endpoints: [{ url: '/health', healthIndicators: [] }] }),
2223
}),

‎src/config.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ consul:
22
host: localhost
33
port: 8500
44
discoveryHost: localhost
5+
etcd:
6+
hosts: localhost:2379
57
service:
68
name: nestcloud-rbac-examples
79
port: 3000

‎src/rbac-validator.register.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Injectable } from '@nestjs/common';
2-
import { ConsulValidator, UseValidators } from '@nestcloud/rbac';
2+
import { EtcdValidator, UseValidators } from '@nestcloud/rbac';
33

44
@Injectable()
5-
@UseValidators(ConsulValidator)
5+
@UseValidators(EtcdValidator)
66
export class RbacValidatorRegister {
77
}

‎yarn.lock

+41-22
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
lodash.camelcase "^4.3.0"
3131
protobufjs "^6.8.6"
3232

33-
"@grpc/[email protected]":
33+
"@grpc/[email protected]", "@grpc/proto-loader@^0.5.1":
3434
version "0.5.3"
3535
resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.3.tgz#a233070720bf7560c4d70e29e7950c72549a132c"
3636
integrity sha512-8qvUtGg77G2ZT2HqdqYoM/OY97gQd/0crSG34xNmZ4ZOsv3aQT/FQV9QfZPazTGna6MIoyUd+u6AxsoZjJ/VMQ==
@@ -58,37 +58,42 @@
5858
underscore "^1.9.1"
5959
ws "^6.1.0"
6060

61-
"@nestcloud/boot@^0.7.3":
62-
version "0.7.3"
63-
resolved "https://registry.yarnpkg.com/@nestcloud/boot/-/boot-0.7.3.tgz#8e809ee2d576f824fffa9c14d8acdc0b353c3f64"
64-
integrity sha512-Oqyiruoq7hHnS1V7UpXovB2io+6gB5xsT30yWiDYdS+QQM4ppUtYmQt6Dt06JOJM8OjgvpQWR1QxtoQEKj0t2A==
61+
"@nestcloud/boot@^0.7.13":
62+
version "0.7.13"
63+
resolved "https://registry.npmjs.org/@nestcloud/boot/-/boot-0.7.13.tgz#ac84a7adf3f8819ef57ba141a4bf98e94fdbae76"
64+
integrity sha512-9Q+IPCfxlQ5PCcRe6xfUWfCgXZkI+qre9g7w9cN6wxR0CXmmbcQy2y1UADExH11J+l5kIvIRAlLtUUxZ2rBWlQ==
6565
dependencies:
6666
handlebars "^4.1.1"
6767
lodash "^4.17.11"
6868
reflect-metadata "^0.1.12"
6969
yamljs "^0.3.0"
7070

71-
"@nestcloud/common@^0.7.2":
72-
version "0.7.2"
73-
resolved "https://registry.yarnpkg.com/@nestcloud/common/-/common-0.7.2.tgz#bd79524c25e6c6ef79815a5f2bd5924f12a0caa6"
74-
integrity sha512-vklmrayPf8wu64TRy0Pgo9IBashUGhL/Y+AV+adzWN/RcQBJGiE0uMVJN7lkz1e3i1+QSK2k5IoUseB39t+inQ==
71+
"@nestcloud/common@^0.7.13":
72+
version "0.7.13"
73+
resolved "https://registry.npmjs.org/@nestcloud/common/-/common-0.7.13.tgz#fc22adbc221d0ea849ce1b3d0f394a302899bcb3"
74+
integrity sha512-vtynkWGtyKXI2+hQ/JjZOG7CdcfEIb9igXzyMyLmyOpPRKjPjQxoa+viEZ43rkokVVdm2EG/k8O4dRsqyj8Lag==
7575
dependencies:
7676
kubernetes-client "^8.3.3"
7777
lodash "^4.17.11"
7878
yamljs "^0.3.0"
7979

80-
"@nestcloud/consul@^0.7.2":
81-
version "0.7.2"
82-
resolved "https://registry.yarnpkg.com/@nestcloud/consul/-/consul-0.7.2.tgz#eb418c21c60aa9152d5b72efc121de571fd76795"
83-
integrity sha512-H+TAtlfnx6DM8FUeU7iatMsfqs5swCgCdwGrzn6Ab4EDtGV7MDhKy4ILXPovq6rflQejW0ZE+6GT8j2cSbLc5A==
80+
"@nestcloud/consul@^0.7.13":
81+
version "0.7.13"
82+
resolved "https://registry.npmjs.org/@nestcloud/consul/-/consul-0.7.13.tgz#6c9f67498bf0b1b10b08b9b5be8798d80d242a02"
83+
integrity sha512-o02hYVeg2RGBxUjqpKnDoYT1RTshnJ2Yjjwlh2t8KSHEqLd1Zluv5kjWFnsnXIDebUAOigDND079DJ1lnwokHQ==
8484
dependencies:
8585
reflect-metadata "^0.1.13"
8686
yamljs "^0.3.0"
8787

88-
"@nestcloud/loadbalance@^0.7.3":
89-
version "0.7.3"
90-
resolved "https://registry.yarnpkg.com/@nestcloud/loadbalance/-/loadbalance-0.7.3.tgz#11e439c234873b1721ce9c4f2454ae630da571d4"
91-
integrity sha512-AFxKWUCWAzSJurLrQjdIOTYEXHxC6eiHyYNmv9nI+N+fx0NqW5u+Y4CVo5phbCqsD6stXw4EUaVBs4mFJ8dJtQ==
88+
"@nestcloud/[email protected]":
89+
version "0.7.13"
90+
resolved "https://registry.npmjs.org/@nestcloud/etcd/-/etcd-0.7.13.tgz#6e11337e9a9b85169a18f128a71253792d13727e"
91+
integrity sha512-K+lv3DMlgiCCG1GGVJqhgns0tt3SDGH1ANIg2yhMMyGxb6efKsQJUd6/sBAXeyQFX6d+O8RtnQOyEnRQdj3PnQ==
92+
93+
"@nestcloud/loadbalance@^0.7.13":
94+
version "0.7.13"
95+
resolved "https://registry.npmjs.org/@nestcloud/loadbalance/-/loadbalance-0.7.13.tgz#81c227cc2bd646499053a81a9d1f75b73959fc9c"
96+
integrity sha512-FmAW7uguD6g8C+0Cd+qTuFN15pduWcmFDSR287FMEPkbTy2VAyM+HfQLzvrmFwi8edwm+WPsSP2vyRdUYFQeyA==
9297
dependencies:
9398
axios "^0.18.0"
9499
lodash "^4.17.11"
@@ -102,10 +107,10 @@
102107
reflect-metadata "^0.1.12"
103108
yamljs "^0.3.0"
104109

105-
"@nestcloud/service@^0.7.2":
106-
version "0.7.2"
107-
resolved "https://registry.yarnpkg.com/@nestcloud/service/-/service-0.7.2.tgz#0eacdb1ccbfa67ca64171c265611b152fa3151db"
108-
integrity sha512-742ycJdPsB88mNc55OqQ9DivMJedi07/yasmjAnGD2FjYMwjfP037tLeu1ASD0tMldGuCeLsulQYSRA+R/YmVQ==
110+
"@nestcloud/service@^0.7.13":
111+
version "0.7.13"
112+
resolved "https://registry.npmjs.org/@nestcloud/service/-/service-0.7.13.tgz#784d36d857f501d08e56270e3b3a3a9aa24b2c08"
113+
integrity sha512-ZKiX0NRQBy08cL+7Vo9VbCiDAYD5BWzi9StSOf+mmy9KQ1ixUnHJfQ2RK0eaHFCNMhycMQjzo39PhFg4heajJA==
109114
dependencies:
110115
blueimp-md5 "^2.10.0"
111116
lodash "^4.17.11"
@@ -553,6 +558,11 @@ bcrypt-pbkdf@^1.0.0:
553558
dependencies:
554559
tweetnacl "^0.14.3"
555560

561+
bignumber.js@^5.0.0:
562+
version "5.0.0"
563+
resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-5.0.0.tgz#fbce63f09776b3000a83185badcde525daf34833"
564+
integrity sha512-KWTu6ZMVk9sxlDJQh2YH1UOnfDP8O8TpxUxgQG/vKASoSnEjK9aVuOueFaPcQEYQ5fyNXNTOYwYw3099RYebWg==
565+
556566
bitsyntax@~0.1.0:
557567
version "0.1.0"
558568
resolved "https://registry.yarnpkg.com/bitsyntax/-/bitsyntax-0.1.0.tgz#b0c59acef03505de5a2ed62a2f763c56ae1d6205"
@@ -1150,6 +1160,15 @@ etag@~1.8.1:
11501160
version "1.8.1"
11511161
resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
11521162

1163+
etcd3@^0.2.13:
1164+
version "0.2.13"
1165+
resolved "https://registry.yarnpkg.com/etcd3/-/etcd3-0.2.13.tgz#1d9a29cdccbaa83685032db8d008cd00267629a0"
1166+
integrity sha512-9zVnoebQRwOGivGT9/bFHQsjkcZttgzyDU50G1J27tdU76vmgp78YGOAEe9zzEjU6IEFa2KYYUg5AyMKDOp37A==
1167+
dependencies:
1168+
"@grpc/proto-loader" "^0.5.1"
1169+
bignumber.js "^5.0.0"
1170+
grpc "^1.21.1"
1171+
11531172
event-emitter@^0.3.5, event-emitter@~0.3.5:
11541173
version "0.3.5"
11551174
resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
@@ -1555,7 +1574,7 @@ got@^8.3.2:
15551574
url-parse-lax "^3.0.0"
15561575
url-to-options "^1.0.1"
15571576

1558-
[email protected]:
1577+
[email protected], grpc@^1.21.1:
15591578
version "1.24.2"
15601579
resolved "https://registry.yarnpkg.com/grpc/-/grpc-1.24.2.tgz#76d047bfa7b05b607cbbe3abb99065dcefe0c099"
15611580
integrity sha512-EG3WH6AWMVvAiV15d+lr+K77HJ/KV/3FvMpjKjulXHbTwgDZkhkcWbwhxFAoTdxTkQvy0WFcO3Nog50QBbHZWw==

0 commit comments

Comments
 (0)