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

feat: add proxy-mirror plugin form #1725

Merged
merged 29 commits into from
Apr 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
1acb995
feat: add proxy-mirror form
LiteSun Apr 9, 2021
8136c15
feat: update
LiteSun Apr 9, 2021
11bf7f9
fix: ci
LiteSun Apr 9, 2021
f02d0c5
feat: update ci
LiteSun Apr 9, 2021
28ba08f
fix: ci
LiteSun Apr 9, 2021
457dccb
feat: add proxy-mirror plugin form
LiteSun Apr 9, 2021
2b743e1
fix: ci
LiteSun Apr 9, 2021
2b71a7e
fix: lint
LiteSun Apr 9, 2021
f10c60a
fix: ci
LiteSun Apr 9, 2021
ae5a3dc
Merge branch 'master' into proxy-mirror-form
LiteSun Apr 9, 2021
0d7b781
test: update
LiteSun Apr 10, 2021
81e1107
fix: ci unstable
LiteSun Apr 10, 2021
f0b596c
Merge branch 'fix-fe-ci' into proxy-mirror-form
LiteSun Apr 10, 2021
3f3045c
fix: ci
LiteSun Apr 10, 2021
4c59311
fix: ci
LiteSun Apr 10, 2021
8143999
fix: ci
LiteSun Apr 10, 2021
34c9921
fix: ci
LiteSun Apr 10, 2021
12b5500
Merge branch 'fix-fe-ci' into proxy-mirror-form
LiteSun Apr 10, 2021
54d1ccd
feat: update i18n
LiteSun Apr 11, 2021
d84d919
Merge remote-tracking branch 'upstream/master' into proxy-mirror-form
LiteSun Apr 11, 2021
814892b
fix: lint
LiteSun Apr 11, 2021
2b5df55
Merge branch 'master' into proxy-mirror-form
LiteSun Apr 11, 2021
86ec8a6
Merge branch 'master' into proxy-mirror-form
LiteSun Apr 12, 2021
53e7ac3
feat: add rule tip
LiteSun Apr 12, 2021
2b13d81
feat: udpate test case
LiteSun Apr 12, 2021
dd5d849
test: add create-route-with-proxy-mirror-form.spec
LiteSun Apr 13, 2021
6191a40
feat: update
LiteSun Apr 13, 2021
4b4ff42
Merge branch 'master' into proxy-mirror-form
LiteSun Apr 14, 2021
43a6890
Merge branch 'master' into proxy-mirror-form
LiteSun Apr 14, 2021
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/* eslint-disable no-undef */

context('Create and delete consumer with proxy-mirror plugin form', () => {
beforeEach(() => {
cy.login();

cy.fixture('selector.json').as('domSelector');
cy.fixture('data.json').as('data');
});

const selector = {
host: "#host",
alert: "[role=alert]"
}

it('should create consumer with proxy-mirror form', function () {
cy.visit('/');
cy.contains('Consumer').click();
cy.get(this.domSelector.empty).should('be.visible');
cy.contains('Create').click();
// basic information
cy.get(this.domSelector.username).type(this.data.consumerName);
cy.get(this.domSelector.description).type(this.data.description);
cy.contains('Next').click();

// config auth plugin
cy.contains(this.domSelector.pluginCard, 'key-auth').within(() => {
cy.contains('Enable').click({
force: true,
});
});
cy.focused(this.domSelector.drawer).should('exist');
cy.get(this.domSelector.disabledSwitcher).click();
// edit codemirror
cy.get(this.domSelector.codeMirror)
.first()
.then((editor) => {
editor[0].CodeMirror.setValue(
JSON.stringify({
key: 'test',
}),
);
cy.contains('button', 'Submit').click();
});

Comment on lines +43 to +61
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why we need key-auth plugin?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is because an authentication plugin is required when creating a Consumer.

cy.contains(this.domSelector.pluginCard, 'proxy-mirror').within(() => {
cy.contains('Enable').click({
force: true,
});
});

cy.focused(this.domSelector.drawer).should('exist');

// config proxy-mirror form with wrong host
cy.get(selector.host).type('127.0.0.1:1999');
cy.get(selector.alert).contains('address needs to contain schema: http or https, not URI part');
cy.get(this.domSelector.drawer).within(() => {
cy.contains('Submit').click({
force: true,
});
});
cy.get(this.domSelector.notification).should('contain', 'Invalid plugin data');
cy.get(this.domSelector.notificationCloseIcon).click();

// config proxy-mirror form with correct host
cy.get(selector.host).clear().type('http://127.0.0.1:1999');
cy.get(selector.alert).should('not.exist');
cy.get(this.domSelector.disabledSwitcher).click();
cy.get(this.domSelector.drawer).within(() => {
cy.contains('Submit').click({
force: true,
});
});
cy.get(this.domSelector.drawer).should('not.exist');

cy.contains('button', 'Next').click();
cy.contains('button', 'Submit').click();
cy.get(this.domSelector.notification).should('contain', this.data.createConsumerSuccess);
});

it('should delete the consumer', function () {
cy.visit('/consumer/list');
cy.contains(this.data.consumerName).should('be.visible').siblings().contains('Delete').click();
cy.contains('button', 'Confirm').click();
cy.get(this.domSelector.notification).should('contain', this.data.deleteConsumerSuccess);
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/* eslint-disable no-undef */

context('Create and delete route with proxy-mirror form', () => {
const selector = {
host: "#host",
alert: ".ant-form-item-explain"
}

beforeEach(() => {
cy.login();

cy.fixture('selector.json').as('domSelector');
cy.fixture('data.json').as('data');
});

it('should create route with proxy-mirror form', function () {
cy.visit('/');
cy.contains('Route').click();
cy.get(this.domSelector.empty).should('be.visible');
cy.contains('Create').click();
cy.contains('Next').click().click();
cy.get(this.domSelector.name).type('routeName');
cy.get(this.domSelector.description).type('desc');
cy.contains('Next').click();

cy.get(this.domSelector.nodes_0_host).type('127.0.0.1');
cy.contains('Next').click();

// config proxy-mirror plugin
cy.contains('proxy-mirror').parents(this.domSelector.pluginCardBordered).within(() => {
cy.get('button').click({
force: true
});
});

cy.get(this.domSelector.drawer).should('be.visible').within(() => {
cy.get(this.domSelector.disabledSwitcher).click();
cy.get(this.domSelector.checkedSwitcher).should('exist');
});

// config proxy-mirror form with wrong host
cy.get(selector.host).type('127.0.0.1:1999');
cy.get(selector.alert).contains('address needs to contain schema: http or https, not URI part');
cy.get(this.domSelector.drawer).within(() => {
cy.contains('Submit').click({
force: true,
});
});
cy.get(this.domSelector.notification).should('contain', 'Invalid plugin data');
cy.get(this.domSelector.notificationCloseIcon).click();

// config proxy-mirror form with correct host
cy.get(selector.host).clear().type('http://127.0.0.1:1999');
cy.get(selector.alert).should('not.exist');
cy.get(this.domSelector.disabledSwitcher).click();
cy.get(this.domSelector.drawer).within(() => {
cy.contains('Submit').click({
force: true,
});
});
cy.get(this.domSelector.drawer).should('not.exist');

cy.contains('button', 'Next').click();
cy.contains('button', 'Submit').click();
cy.contains(this.data.submitSuccess);

// back to route list page
cy.contains('Goto List').click();
cy.url().should('contains', 'routes/list');
});

it('should delete the route', function () {
cy.visit('/routes/list');
const {
domSelector,
data
} = this;

cy.get(domSelector.name).clear().type('routeName');
cy.contains('Search').click();
cy.contains('routeName').siblings().contains('More').click();
cy.contains('Delete').click();
cy.get(domSelector.deleteAlert).should('be.visible').within(() => {
cy.contains('OK').click();
});
cy.get(domSelector.notification).should('contain', data.deleteRouteSuccess);
cy.get(domSelector.notificationCloseIcon).click();
});
});
11 changes: 11 additions & 0 deletions web/cypress/support/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,17 @@ Cypress.Commands.add('configurePlugins', (cases) => {

// NOTE: wait for the Drawer to appear on the DOM
cy.focused(domSelector.drawer).should('exist');

cy.get(domSelector.codeMirrorMode).invoke('text').then(text => {
if (text === 'Form') {
cy.wait(5000);
cy.get(domSelector.codeMirrorMode).should('be.visible');
cy.get(domSelector.codeMirrorMode).click();
cy.get(domSelector.selectDropdown).should('be.visible');
cy.get(domSelector.selectJSON).click();
}
});

cy.get(domSelector.drawer, { timeout }).within(() => {
cy.get(domSelector.switch).click({
force: true,
Expand Down
5 changes: 4 additions & 1 deletion web/src/components/Plugin/UI/plugin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { Empty } from 'antd';
import { useIntl } from 'umi';

import BasicAuth from './basic-auth';
import ProxyMirror from './proxy-mirror';
import LimitConn from './limit-conn';

type Props = {
Expand All @@ -28,7 +29,7 @@ type Props = {
renderForm: boolean
}

export const PLUGIN_UI_LIST = ['basic-auth', 'limit-conn'];
export const PLUGIN_UI_LIST = ['basic-auth', 'limit-conn', 'proxy-mirror'];

export const PluginForm: React.FC<Props> = ({ name, renderForm, form }) => {

Expand All @@ -39,6 +40,8 @@ export const PluginForm: React.FC<Props> = ({ name, renderForm, form }) => {
switch (name) {
case 'basic-auth':
return <BasicAuth form={form} />
case 'proxy-mirror':
return <ProxyMirror form={form} />
juzhiyuan marked this conversation as resolved.
Show resolved Hide resolved
case 'limit-conn':
return <LimitConn form={form} />
default:
Expand Down
61 changes: 61 additions & 0 deletions web/src/components/Plugin/UI/proxy-mirror.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import React from 'react';
import type { FormInstance } from 'antd/es/form';
import { Form, Input } from 'antd';
import { useIntl } from 'umi';

type Props = {
form: FormInstance;
};

const FORM_ITEM_LAYOUT = {
labelCol: {
span: 4,
},
wrapperCol: {
span: 10
},
};

const ProxyMirror: React.FC<Props> = ({ form }) => {
const { formatMessage } = useIntl();

return (
<Form
form={form}
{...FORM_ITEM_LAYOUT}
>
<Form.Item
label="host"
name="host"
extra={formatMessage({ id: 'component.pluginForm.proxy-mirror.host.extra' })}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because we have tooltip, so we don't need this extra.

tooltip={formatMessage({ id: 'component.pluginForm.proxy-mirror.host.tooltip' })}
rules={[
{
pattern: new RegExp(/^http(s)?:\/\/[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+(:[0-9]{1,5})?$/, 'g'),
message: formatMessage({ id: 'component.pluginForm.proxy-mirror.host.ruletip' }),
}
]}
>
<Input />
LiteSun marked this conversation as resolved.
Show resolved Hide resolved
</Form.Item>
</Form>
);
}

export default ProxyMirror;
5 changes: 5 additions & 0 deletions web/src/components/Plugin/locales/en-US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ export default {
'component.plugin.pluginTemplate.tip1': '1. When a route already have plugins field configured, the plugins in the plugin template will be merged into it.',
'component.plugin.pluginTemplate.tip2': '2. The same plugin in the plugin template will override one in the plugins',

// proxy-mirror
'component.pluginForm.proxy-mirror.host.tooltip': 'Specify a mirror service address, e.g. http://127.0.0.1:9797 (address needs to contain schema: http or https, not URI part)',
LiteSun marked this conversation as resolved.
Show resolved Hide resolved
'component.pluginForm.proxy-mirror.host.extra': 'e.g. http://127.0.0.1:9797 (address needs to contain schema: http or https, not URI part)',
'component.pluginForm.proxy-mirror.host.ruletip': 'address needs to contain schema: http or https, not URI part',

// limit-conn
'component.pluginForm.limit-conn.conn.tooltip': 'the maximum number of concurrent requests allowed. Requests exceeding this ratio (and below conn + burst) will get delayed(the latency seconds is configured by default_conn_delay) to conform to this threshold.',
'component.pluginForm.limit-conn.burst.tooltip': 'the number of excessive concurrent requests (or connections) allowed to be delayed.',
Expand Down
5 changes: 5 additions & 0 deletions web/src/components/Plugin/locales/zh-CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ export default {
'component.plugin.pluginTemplate.tip1': '1. 若路由已配置插件,则插件模板数据将与已配置的插件数据合并。',
'component.plugin.pluginTemplate.tip2': '2. 插件模板相同的插件会覆盖掉原有的插件。',

// proxy-mirror
'component.pluginForm.proxy-mirror.host.tooltip': '指定镜像服务地址,例如:http://127.0.0.1:9797(地址中需要包含 schema :http或https,不能包含 URI 部分)',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should add judgment on the front end

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Here is tip for user
  2. the front-end will do a schema check on the data entered by the user

juzhiyuan marked this conversation as resolved.
Show resolved Hide resolved
LiteSun marked this conversation as resolved.
Show resolved Hide resolved
'component.pluginForm.proxy-mirror.host.extra': '例如:http://127.0.0.1:9797(地址中需要包含 schema:http或https,不能包含 URI 部分)',
'component.pluginForm.proxy-mirror.host.ruletip': '地址中需要包含 schema :http或https,不能包含 URI 部分',

// limit-conn
'component.pluginForm.limit-conn.conn.tooltip': '允许的最大并发请求数。超过 conn 的限制、但是低于 conn + burst 的请求,将被延迟处理。',
'component.pluginForm.limit-conn.burst.tooltip': '允许被延迟处理的并发请求数。',
Expand Down