Add/link api #13
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 |
|---|---|---|
|
|
@@ -11,6 +11,7 @@ | |
| "regenerator": true, | ||
| "moduleName": "babel-runtime" | ||
| } | ||
| ], | ||
| ["transform-export-extensions"] | ||
| ] | ||
| } | ||
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
File renamed without changes.
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 |
|---|---|---|
| @@ -0,0 +1,191 @@ | ||
| /** | ||
| * Created by Chyroc on 17/1/11. | ||
| */ | ||
| import merge from 'merge' | ||
| import _ from 'lodash' | ||
| import { linkType } from './index' | ||
|
|
||
| function setCreateLinkRequestMainBody (linkName, connectorName) { | ||
| return { | ||
| 'id': -1, | ||
| 'name': linkName, | ||
| 'connector-name': connectorName, | ||
| 'enabled': true, | ||
| 'creation-date': Date.now(), | ||
| 'creation-user': null, | ||
| 'update-user': null, | ||
| 'update-date': Date.now() | ||
| } | ||
| } | ||
| function setCreateLinkRequestMysqlBody (jdbcDriver, connectionString, fetchSize, identifierEnclose, linkConfig) { | ||
| return { | ||
| 'link-config-values': { | ||
| 'configs': [ | ||
| { | ||
| 'validators': [], | ||
| 'inputs': [ | ||
| { | ||
| 'size': 128, | ||
| 'editable': 'ANY', | ||
| 'validators': [], | ||
| 'name': 'linkConfig.jdbcDriver', | ||
| 'id': 67, | ||
| 'sensitive': false, | ||
| 'overrides': '', | ||
| 'type': 'STRING', | ||
| 'value': jdbcDriver | ||
| }, { | ||
| 'size': 2000, | ||
| 'editable': 'ANY', | ||
| 'validators': [], | ||
| 'name': 'linkConfig.connectionString', | ||
| 'id': 68, | ||
| 'sensitive': false, | ||
| 'overrides': '', | ||
| 'type': 'STRING', | ||
| 'value': encodeURIComponent(connectionString) | ||
| }, { | ||
| 'size': 40, | ||
| 'editable': 'ANY', | ||
| 'validators': [], | ||
| 'name': 'linkConfig.username', | ||
| 'id': 69, | ||
| 'sensitive': false, | ||
| 'overrides': '', | ||
| 'type': 'STRING', | ||
| 'value': linkConfig['username'] | ||
| }, { | ||
| 'size': 40, | ||
| 'editable': 'ANY', | ||
| 'validators': [], | ||
| 'name': 'linkConfig.password', | ||
| 'id': 70, | ||
| 'sensitive': true, | ||
| 'overrides': '', | ||
| 'type': 'STRING', | ||
| 'value': linkConfig['password'] | ||
| }, { | ||
| 'editable': 'ANY', | ||
| 'validators': [], | ||
| 'name': 'linkConfig.fetchSize', | ||
| 'id': 71, | ||
| 'sensitive': false, | ||
| 'overrides': '', | ||
| 'type': 'INTEGER', | ||
| 'value': `${fetchSize}` | ||
| }, { | ||
| 'editable': 'ANY', | ||
| 'validators': [], | ||
| 'name': 'linkConfig.jdbcProperties', | ||
| 'id': 72, | ||
| 'sensitive': false, | ||
| 'overrides': '', | ||
| 'type': 'MAP', | ||
| 'sensitive-pattern': '' | ||
| } | ||
| ], | ||
| 'name': 'linkConfig', | ||
| 'id': 17, | ||
| 'type': 'LINK' | ||
| }, | ||
| { | ||
| 'validators': [], | ||
| 'inputs': [ | ||
| { | ||
| 'size': 5, | ||
| 'editable': 'ANY', | ||
| 'validators': [], | ||
| 'name': 'dialect.identifierEnclose', | ||
| 'id': 73, | ||
| 'sensitive': false, | ||
| 'overrides': '', | ||
| 'type': 'STRING', | ||
| 'value': encodeURIComponent(identifierEnclose) | ||
| } | ||
| ], | ||
| 'name': 'dialect', | ||
| 'id': 18, | ||
| 'type': 'LINK' | ||
| } | ||
| ], | ||
| 'validators': [] | ||
| } | ||
| } | ||
| } | ||
|
|
||
| function setCreateLinkRequestHdfsBody (linkConfig) { | ||
| return { | ||
| 'link-config-values': { | ||
| 'configs': [ | ||
| { | ||
| 'validators': [], | ||
| 'inputs': [ | ||
| { | ||
| 'size': 255, | ||
| 'editable': 'ANY', | ||
| 'validators': [], | ||
| 'name': 'linkConfig.uri', | ||
| 'id': 52, | ||
| 'sensitive': false, | ||
| 'overrides': '', | ||
| 'type': 'STRING', | ||
| 'value': encodeURIComponent(linkConfig['uri']) | ||
| }, { | ||
| 'size': 255, | ||
| 'editable': 'ANY', | ||
| 'validators': [], | ||
| 'name': 'linkConfig.confDir', | ||
| 'id': 53, | ||
| 'sensitive': false, | ||
| 'overrides': '', | ||
| 'type': 'STRING' | ||
| }, { | ||
| 'editable': 'ANY', | ||
| 'validators': [], | ||
| 'name': 'linkConfig.configOverrides', | ||
| 'id': 54, | ||
| 'sensitive': false, | ||
| 'overrides': '', | ||
| 'type': 'MAP', | ||
| // 'value': {'key': 'value'}, TODO | ||
| 'sensitive-pattern': '' | ||
| } | ||
| ], | ||
| 'name': 'linkConfig', | ||
| 'id': 13, | ||
| 'type': 'LINK' | ||
| } | ||
| ], | ||
| 'validators': [] | ||
| } | ||
| } | ||
| } | ||
|
|
||
| export function setCreateLinkRequestBody (linkConfig) { | ||
| if (linkConfig['linkType'] === linkType.mysql) { | ||
|
There was a problem hiding this comment. use two separate functions for mysql and hdfs |
||
| const fetchSize = linkConfig['fetchSize'] || 1000 | ||
| const identifierEnclose = linkConfig['identifierEnclose'] || '`' | ||
| const port = linkConfig['port'] || 3306 | ||
| const connectorName = 'generic-jdbc-connector' | ||
| const jdbcDriver = 'com.mysql.jdbc.Driver' | ||
| const connectionString = `jdbc:mysql://${linkConfig.host}:${port}/${linkConfig.databaseName}` | ||
| const mainBody = setCreateLinkRequestMainBody(linkConfig.linkName, connectorName) | ||
| const mysqlBody = setCreateLinkRequestMysqlBody(jdbcDriver, connectionString, fetchSize, identifierEnclose, linkConfig) | ||
| return {'links': [merge(mainBody, mysqlBody)]} | ||
| } else if (linkConfig['linkType'] === linkType.hdfs) { | ||
|
There was a problem hiding this comment. tear up this into two smaller functions |
||
| const connectorName = 'hdfs-connector' | ||
| const mainBody = setCreateLinkRequestMainBody(linkConfig.linkName, connectorName) | ||
| const hdfsBody = setCreateLinkRequestHdfsBody(linkConfig) | ||
| const createHdfsLinkBody = {'links': [merge(mainBody, hdfsBody)]} | ||
| if (linkConfig['hadoopConfDir']) { | ||
| _.set(createHdfsLinkBody, 'links[0].link-config-values.configs[0].inputs[1].value', encodeURIComponent(linkConfig['hadoopConfDir'])) | ||
| } | ||
| return createHdfsLinkBody | ||
| } else { | ||
| throw new Error('linkType must be mysql or hdfs') | ||
| } | ||
| } | ||
|
|
||
| export function setUpdateLinkRequestBody (linkConfig) { | ||
| return setCreateLinkRequestBody(linkConfig) | ||
| } | ||
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,16 +1,18 @@ | ||
| /* eslint-env mocha */ | ||
|
|
||
| import { expect } from 'chai' | ||
| import _ from 'lodash' | ||
| import { sqoopClient } from './index' | ||
|
|
||
| suite('connector', () => { | ||
| test('getConnectorAll', async () => { | ||
| const data = await sqoopClient.getConnectorAll() | ||
| expect(data.connectors.length).to.equal(7) | ||
| }) | ||
|
|
||
| test('getConnectorByConnectorName', async () => { | ||
| const connectorName = 'generic-jdbc-connector' | ||
| const data = await sqoopClient.getConnectorByConnectorName(connectorName) | ||
| expect(_.get(data, 'connectors[0].name')).to.equal('generic-jdbc-connector') | ||
| }) | ||
| }) |
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.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i think you need to look at
Promise.allThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
also if you explicitly return
Promisethen you do not need to useasyncThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
async是为了getLinkAll,不是后面那些delete