You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by ju...@apache.org on 2021/02/06 02:32:08 UTC
[apisix-dashboard] branch feat-improve-action updated (9872c63 ->
49cb409)
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a change to branch feat-improve-action
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git.
from 9872c63 feat: improve actions
add e04c651 fix: update description input box (#1348)
add 81dbdbf fix: ignore the init_dir event when watching etcd events (#1344)
add bb0a057 fix: Skip the data directly in Storage level (#1359)
add 6c3f35c feat: user can skip upstream when select service_id (#1302)
add ab5b1d9 test: Create Upstream in Route. (#1308)
add 5411a1e fix: editing a Service, the upstream info will be lost. (#1347)
add 4b1f7c0 fix: add maxlength={256} to Input.TextArea (#1358)
add 4d73ae6 fix: CI failed in create-route-with-upstream (#1364)
add f95e1df test: skip upstream after service is seleted (#1361)
add 446773f chore: upgrade codemirror version (#1369)
add 7a157af test: remove unnecessary wait in E2E (#1362)
add 23d010c chore: upgrade protobuf to v1.3.2 (#1367)
add 8852e63 chore: upgrade gjson to v1.6.7 (#1366)
add 39aac5b chore: add stop subcommand (#741)
add b0c531d fix(fe): update url regexp in online debug (#1326)
add 1bdcaa8 fix: cannot delete multiple plugins without page refreshing (#1317)
add 79369b0 fix: make api-test download dag-to-lua if needed (#1374)
add e03dc9c test: delete wait in test (#1370)
add fa080a8 fix: some apis bypassed authentication (#1373)
add 9cb9aa7 feat(BE): Export route from OpenAPI Specification3.0 (#1245)
add e362009 fix: update location of manager-api address conf to config/defaultSettings.ts in the develop.md (#1379)
add 6ee8dd1 feat: import route from OpenAPI Specification3.0 (#1102)
add 6e39bcb fix: exporte Route no matter the parameter is empty or not (#1384)
add fb048ee test: add edit the plugin (#1372)
add 32c3ddb feat(fe): import and export routes (#1240)
add 351f576 chore: update the year (#1377)
add 4700d6f docs: remove commit-convention.md (#1382)
add 7b1e3b0 feat: added script_id field in Route entity (#1386)
add a3a135d feat: update the menu order of the sidebar (#1376)
add 619165a docs: improve E2E test document (#1381)
add fd3cca6 feat: support IN operator (vars) when creating Route (#1385)
add cd3e8f5 chore: git ignore the output of backend unit test (#1394)
add bb50494 fix: added version ldflags when building manager-api in Dockerfile (#1393)
add bff19b5 fix(be): Modify the service to use the new JSON patch package (#1396)
add 94d952f fix(be): Modify the upstream to use the new JSON patch package (#1395)
add 89cc56c fix: push pr ci failed (#1409)
add 6e98820 fix: Minor problems left (#1412)
add 0a0a42a fix(be): CI uses the apisix-docker project dockerfile to build apisix (#1416)
add f795e9e fix: check delete successfully to ensure every delete option finished (#1414)
add cd3b7a6 chore: Use the original conf/config.yaml + sed to replace `api/test/docker/manager-api-conf.yaml` (#1417)
add 3852596 fix(FE): create-route-with-upstream.spec test
add dbfa426 feat: added delete button in plugin drawer (#1402)
add a407498 fix: Upstream information is lost when editing services (#1413)
add 597b046 feat: support return the manager api's git hash and version (#1408)
add bad159b style: format codes (#1427)
add 9824b5f fix: docker build failed in backend e2e test CI (#1433)
add 0b5a687 fix: added defer recover for go routines to prevent abnormal crash (#1419)
add 661e48f feat: remove the etcd dependency in the service unit test
add 61d8118 fix: change the /version to /apisix/admin/tool/version (#1429)
add eaa6a73 feat: support -v command to show version (#1431)
add 57c9d94 feat: add a tool to check the version of APISIX Dashboard for release (#1418)
add 4577740 feat: add version match API (#1430)
add 42f3bf6 feat: support IP allow list (#1424)
add 352a64d feat: refactor route unit test (#1315)
add 178ff5c chore: added global files to contain test selector mappers and public data (#1432)
add e6be67f fix CI failed due to IP restrictions (#1439)
add add78ad feat: support mTLS connection to ETCD (#1437)
add 9bd3a54 chore: introduce ginkgo framework for backend E2E testing (#1319)
add 8e80033 CI: test make build (#1421)
add 0b42332 feat: update system status (#1434)
add 1924ea7 fix: change validURL to http://localhost:8000/routes/list (#1442)
add 8796fa1 feat: show warning notification when dashboard version not matching apisix (#1435)
add 49cb409 Merge branch 'master' into feat-improve-action
No new revisions were added by this update.
Summary of changes:
.github/commit-convention.md | 89 -
.github/workflows/backend-cli-test.yml | 6 +
.github/workflows/backend-e2e-test.yml | 68 +
.github/workflows/backend-unit-test.yml | 7 -
.github/workflows/deploy-with-docker.yml | 10 +-
.../{frontend-e2e-test.yml => make-build.yaml} | 23 +-
.gitignore | 5 +
Dockerfile | 26 +-
Makefile | 32 +-
NOTICE | 4 +-
api/build.sh | 2 +-
api/cmd/manager/main_test.go | 2 +
api/cmd/managerapi.go | 57 +-
api/conf/conf.yaml | 7 +
api/go.mod | 9 +-
api/go.sum | 64 +-
api/internal/conf/conf.go | 20 +-
api/internal/core/entity/entity.go | 7 +
api/internal/core/storage/etcd.go | 71 +-
api/internal/core/storage/storage.go | 5 +-
api/internal/core/store/store.go | 29 +-
api/internal/core/store/store_test.go | 12 +-
api/internal/core/store/validate.go | 9 +-
api/internal/filter/authentication.go | 87 +-
api/internal/filter/ip_filter.go | 105 +
.../filter/{logging_test.go => ip_filter_test.go} | 38 +-
api/internal/filter/schema.go | 5 +-
api/internal/handler/data_loader/route_export.go | 496 ++++
.../handler/data_loader/route_export_test.go | 1951 +++++++++++++
api/internal/handler/data_loader/route_import.go | 522 ++++
.../handler/data_loader/route_import_test.go | 178 ++
api/internal/handler/global_rule/global_rule.go | 26 +-
api/internal/handler/handler_test.go | 2 +-
api/internal/handler/route/route.go | 109 +-
api/internal/handler/route/route_test.go | 3060 ++++++++++----------
api/internal/handler/service/service.go | 47 +-
api/internal/handler/service/service_test.go | 1010 +++++--
api/internal/handler/ssl/ssl.go | 40 +-
api/internal/handler/tool/tool.go | 111 +
api/internal/handler/tool/tool_test.go | 156 +
api/internal/handler/upstream/upstream.go | 75 +-
api/internal/handler/upstream/upstream_test.go | 61 +
api/internal/route.go | 7 +-
api/internal/utils/consts/api_error.go | 29 -
api/internal/utils/consts/api_error_test.go | 33 -
api/internal/utils/consts/error.go | 2 +
.../internal/utils/consts/versionMap.go | 13 +-
api/{cmd/manager/main.go => internal/utils/pid.go} | 35 +-
.../logging_test.go => utils/runtime/runtime.go} | 51 +-
.../utils/runtime/runtime_test.go} | 58 +-
api/internal/utils/utils.go | 47 +
.../typingd.d.ts => api/internal/utils/version.go | 14 +-
api/test/certs/mtls_ca.pem | 25 +
api/test/certs/mtls_client-key.pem | 27 +
api/test/certs/mtls_client.pem | 25 +
api/test/certs/mtls_server-key.pem | 27 +
api/test/certs/mtls_server.pem | 25 +
api/test/docker/Dockerfile | 2 -
api/test/docker/Dockerfile-apisix | 58 -
api/test/docker/docker-compose.yaml | 2 +-
api/test/e2e/base.go | 18 +-
api/test/e2e/http.go | 106 +
api/test/e2e/route_export_test.go | 2505 ++++++++++++++++
api/test/e2e/route_import_test.go | 579 ++++
api/test/e2e/route_online_debug_test.go | 2 +-
api/test/e2e/route_test.go | 15 +-
api/test/e2e/route_with_management_fileds_test.go | 22 +-
api/test/e2e/route_with_plugin_jwt_test.go | 4 +-
api/test/e2e/route_with_script_luacode_test.go | 199 ++
api/test/e2e/service_test.go | 87 +
api/test/e2e/ssl_test.go | 15 +-
api/test/e2e/upstream_test.go | 114 +
.../{authentication_test.go => version_test.go} | 37 +-
api/test/e2enew/base/base.go | 298 ++
api/test/e2enew/base/http.go | 94 +
api/test/e2enew/go.mod | 12 +
api/test/{e2e => e2enew}/go.sum | 73 +-
api/test/e2enew/route/host_test.go | 287 ++
.../e2enew/route/route_suite_test.go} | 22 +-
api/test/shell/cli_test.sh | 166 +-
.../{docker_deploy_test.sh => manager_smoking.sh} | 37 +
api/test/testdata/import/default.json | 39 +
.asf.yaml => api/test/testdata/import/default.yaml | 48 +-
api/test/testdata/import/multi-routes.yaml | 224 ++
api/test/testdata/import/with-plugins.yaml | 80 +
.../test/testdata/import/with-service-id.yaml | 43 +-
.../test/testdata/import/with-upstream-id.yaml | 43 +-
docs/IMPORT_OPENAPI_USER_GUIDE.md | 60 +
docs/back-end-e2e.md | 131 +
docs/deploy.md | 5 +-
docs/develop.md | 6 +-
utils/version-check.sh | 79 +
web/config/defaultSettings.ts | 8 +
web/config/proxy.ts | 7 +-
web/cypress/fixtures/export-route-dataset.json | 160 +
web/cypress/fixtures/import-error.txt | 1 +
web/cypress/fixtures/plugin-list.json | 38 +
web/cypress/fixtures/selector.json | 54 +-
.../consumer/create_and_delete_consumer.spec.js | 31 +-
.../integration/lang/switch-language.spec.js | 15 +-
.../integration/metrics/metrics-smoketest.spec.js | 13 +-
.../plugin/create-edit-delete-plugin.spec.js | 72 +
.../integration/plugin/schema-smocktest.spec.js | 72 +-
...an-skip-upstream-when-select-service-id.spec.js | 131 +
.../route/create-edit-delete-route.spec.js | 61 +-
.../route/create-route-with-upstream.spec.js | 134 +
.../integration/route/import_export_route.spec.js | 173 ++
web/cypress/integration/route/online-debug.spec.js | 65 +
web/cypress/integration/route/search-route.spec.js | 39 +-
.../service/create-and-delete-service.spec.js | 54 -
.../service/create-edit-delete-service.spec.js | 89 +
.../service/edit-service-with-upstream.spec.js | 110 +
.../settings/settings-smoketest.spec.js | 50 +-
web/cypress/integration/ssl/ssl-smoketest.spec.js | 17 +-
.../upstream/create_and_delete_upstream.spec.js | 46 +-
web/cypress/plugins/index.js | 17 +
web/cypress/support/commands.js | 81 +-
web/package.json | 11 +-
web/scripts/verifyCommit.js | 3 +-
web/src/components/Plugin/PluginDetail.tsx | 70 +-
web/src/components/Plugin/PluginPage.tsx | 12 +-
web/src/components/RightContent/index.tsx | 9 +-
web/src/components/Upstream/UpstreamForm.tsx | 260 +-
web/src/helpers.tsx | 18 +-
web/src/locales/en-US/component.ts | 2 +-
web/src/locales/en-US/menu.ts | 2 +-
web/src/locales/zh-CN/component.ts | 2 +-
web/src/locales/zh-CN/menu.ts | 4 +-
web/src/pages/Plugin/List.tsx | 22 +-
web/src/pages/Plugin/locales/en-US.ts | 4 +-
web/src/pages/Plugin/locales/zh-CN.ts | 4 +-
web/src/pages/Route/Create.tsx | 8 +-
web/src/pages/Route/List.tsx | 192 +-
.../Route/components/CreateStep4/CreateStep4.tsx | 7 +-
.../Route/components/DebugViews/DebugDrawView.tsx | 3 +-
.../Route/components/Step1/MatchingRulesView.tsx | 4 +
web/src/pages/Route/components/Step1/MetaView.tsx | 2 +
.../Route/components/Step2/RequestRewriteView.tsx | 2 +
web/src/pages/Route/constants.ts | 2 +
web/src/pages/Route/locales/en-US.ts | 7 +
web/src/pages/Route/locales/zh-CN.ts | 7 +
web/src/pages/Route/service.ts | 12 +
web/src/pages/Route/transform.ts | 5 +
web/src/pages/Route/typing.d.ts | 4 +-
web/src/pages/ServerInfo/List.tsx | 127 +-
web/src/pages/ServerInfo/locales/en-US.ts | 10 +-
web/src/pages/ServerInfo/locales/zh-CN.ts | 10 +-
web/src/pages/ServerInfo/service.ts | 4 +
web/src/pages/ServerInfo/style.less | 1 -
web/src/pages/ServerInfo/typing.d.ts | 5 +
web/src/pages/Service/Create.tsx | 4 +-
web/src/pages/Service/components/Step1.tsx | 1 +
web/src/pages/Upstream/locales/en-US.ts | 4 +-
web/{mock/user.ts => src/services/tool.ts} | 5 +-
web/yarn.lock | 70 +-
155 files changed, 14088 insertions(+), 2942 deletions(-)
delete mode 100644 .github/commit-convention.md
copy .github/workflows/{frontend-e2e-test.yml => make-build.yaml} (63%)
create mode 100644 api/internal/filter/ip_filter.go
copy api/internal/filter/{logging_test.go => ip_filter_test.go} (62%)
create mode 100644 api/internal/handler/data_loader/route_export.go
create mode 100644 api/internal/handler/data_loader/route_export_test.go
create mode 100644 api/internal/handler/data_loader/route_import.go
create mode 100644 api/internal/handler/data_loader/route_import_test.go
create mode 100644 api/internal/handler/tool/tool.go
create mode 100644 api/internal/handler/tool/tool_test.go
copy web/src/pages/Setting/typingd.d.ts => api/internal/utils/consts/versionMap.go (85%)
copy api/{cmd/manager/main.go => internal/utils/pid.go} (55%)
copy api/internal/{filter/logging_test.go => utils/runtime/runtime.go} (55%)
copy api/{cmd/manager/main_test.go => internal/utils/runtime/runtime_test.go} (56%)
copy web/src/pages/Setting/typingd.d.ts => api/internal/utils/version.go (84%)
create mode 100644 api/test/certs/mtls_ca.pem
create mode 100644 api/test/certs/mtls_client-key.pem
create mode 100644 api/test/certs/mtls_client.pem
create mode 100644 api/test/certs/mtls_server-key.pem
create mode 100644 api/test/certs/mtls_server.pem
delete mode 100644 api/test/docker/Dockerfile-apisix
create mode 100644 api/test/e2e/http.go
create mode 100644 api/test/e2e/route_export_test.go
create mode 100644 api/test/e2e/route_import_test.go
copy api/test/e2e/{authentication_test.go => version_test.go} (62%)
create mode 100644 api/test/e2enew/base/base.go
create mode 100644 api/test/e2enew/base/http.go
create mode 100644 api/test/e2enew/go.mod
copy api/test/{e2e => e2enew}/go.sum (69%)
create mode 100644 api/test/e2enew/route/host_test.go
copy api/{cmd/manager/main.go => test/e2enew/route/route_suite_test.go} (75%)
rename api/test/shell/{docker_deploy_test.sh => manager_smoking.sh} (80%)
create mode 100644 api/test/testdata/import/default.json
copy .asf.yaml => api/test/testdata/import/default.yaml (52%)
create mode 100644 api/test/testdata/import/multi-routes.yaml
create mode 100644 api/test/testdata/import/with-plugins.yaml
copy .asf.yaml => api/test/testdata/import/with-service-id.yaml (56%)
copy .asf.yaml => api/test/testdata/import/with-upstream-id.yaml (56%)
create mode 100644 docs/IMPORT_OPENAPI_USER_GUIDE.md
create mode 100644 docs/back-end-e2e.md
create mode 100755 utils/version-check.sh
create mode 100644 web/cypress/fixtures/export-route-dataset.json
create mode 100644 web/cypress/fixtures/import-error.txt
create mode 100644 web/cypress/fixtures/plugin-list.json
create mode 100644 web/cypress/integration/plugin/create-edit-delete-plugin.spec.js
create mode 100644 web/cypress/integration/route/can-skip-upstream-when-select-service-id.spec.js
create mode 100644 web/cypress/integration/route/create-route-with-upstream.spec.js
create mode 100644 web/cypress/integration/route/import_export_route.spec.js
create mode 100644 web/cypress/integration/route/online-debug.spec.js
delete mode 100644 web/cypress/integration/service/create-and-delete-service.spec.js
create mode 100644 web/cypress/integration/service/create-edit-delete-service.spec.js
create mode 100644 web/cypress/integration/service/edit-service-with-upstream.spec.js
copy web/{mock/user.ts => src/services/tool.ts} (87%)