Add zookeeper auth supports #132
Merged
Conversation
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
|
感谢你的pr ^_^ const dubbo = new Dubbo<typeof service>({
application: {name: 'node-dubbo'},
// 这个作为一个兼容模式存在默认为zk作为注册中心，未来我们可能支持redis，naccos
register: 'localhost:2181',
service,
});所以通过这样设计就比较单薄了不方便扩展，而且会让dubbo的初始化参数爆表。 所以做了重构之后，我们现在是这样的设计： import {Dubbo, setting, Zk} from 'dubbo2.js';
const dubbo = new Dubbo<typeof service>({
application: {name: 'dubbo-node-consumer'},
service,
dubboSetting,
register: Zk({
url: 'localhost:2181,localhost:2182,localhost:2183',
// others arguments, for example authInfo
}),
});这样注册中心的扩展性就不会影响到Dubbo的入口参数，Keep it simple. 所以希望authInfo不要挂在this.props.authInfo， 而是作为Zk的入口参数。 |
hufeng
reviewed
Oct 20, 2019
packages/dubbo/src/dubbo.ts
Outdated
| @@ -98,9 +98,12 @@ export default class Dubbo<TService = Object> | |||
|
|
|||
| //if dubbo register is string, create a zookeeper instance | |||
| let register = this._props.register; | |||
| const zkAuthInfo = this._props.zkAuthInfo; | |||
There was a problem hiding this comment.
这个参数的设置直接放入Zk({url: '', authInfo: {}})这个函数的参数内部，这样不会再在Dubbo的构造方法中添加更多的属性参数，为后续的多注册中心打下基础。
hufeng
reviewed
Oct 20, 2019
packages/dubbo/src/dubbo.ts
Outdated
| if (isString(register)) { | ||
| register = Zk({ | ||
| url: this._props.register as string, | ||
| zkAuthInfo: zkAuthInfo, | ||
| zkRoot: this._props.zkRoot as string, | ||
| }); | ||
| } |
There was a problem hiding this comment.
url为string的注册中心地址，默认是zk的注册中心，这个只作为兼容方案，后续希望收入到Zk函数，保证更好的扩展性
所以这个地方 不需要加入zkRoot和zkAuthInfo属性的设置
hufeng
reviewed
Oct 20, 2019
| @@ -111,7 +113,13 @@ export interface IDubboProvider { | |||
| methods: {[methodName: string]: Function}; | |||
| } | |||
|
|
|||
| export interface IZKAuthInfo { | |||
hufeng
reviewed
Oct 20, 2019
| //debug log | ||
| log(`connecting zkserver ${register}`); | ||
| //connect | ||
| this._client = zookeeper.createClient(register, { | ||
| retries: 10, | ||
| }); | ||
|
|
||
| if (zkAuthInfo && zkAuthInfo.scheme && zkAuthInfo.auth) { |
| @@ -145,14 +145,18 @@ export class ZkRegistry extends Registry<IZkClientProps & IDubboRegistryProps> { | |||
| * connect zookeeper | |||
| */ | |||
| private _connect = (callback: (err: Error) => void) => { | |||
| const {url: register} = this._props; | |||
| const {url: register, zkAuthInfo} = this._props; | |||
|
@hufeng 感谢回复和review。 重构的设计的确具有更好的抽象，我稍后在这个思路下重新提交一次，烦请您再查阅，十分感谢！ |
added 2 commits
October 21, 2019 01:31
|
@hufeng 更新了pr, 自测功能正常，辛苦您再查看一下。 |
added 2 commits
October 21, 2019 01:40
|
@xusd320 好的，我来review下 辛苦了 |
hufeng
approved these changes
Oct 21, 2019
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For Issue:130.
Add zookeeper authInfo supports.
Detail is here:
node-zookeeper-client#addAuthInfo