fix: fix the upstream timeout unit

[stu01509]

Please answer these questions before submitting a pull request

• Why submit this pull request?

• Bugfix

• New feature provided

• Improve performance

• Backport patches

• Related issues
  Fix The upstream timeout unit is seconds instead of milliseconds #1565

---

Bugfix

• Description

• How to fix?
  Change the upstream timeout unit to s.
  

[codecov-io]

Codecov Report

Merging #1580 (11dcccc) into master (e22de29) will increase coverage by 3.42%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #1580      +/-   ##
==========================================
+ Coverage   69.01%   72.44%   +3.42%     
==========================================
  Files         132       86      -46     
  Lines        5374     2355    -3019     
  Branches      592      592              
==========================================
- Hits         3709     1706    -2003     
+ Misses       1417      649     -768     
+ Partials      248        0     -248     

Flag	Coverage Δ
backend-e2e-test-ginkgo	?
backend-unit-test	?
frontend-e2e-test	72.44% <100.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
web/src/components/Upstream/constant.ts	100.00% <ø> (ø)
web/src/components/Upstream/UpstreamForm.tsx	62.01% <100.00%> (ø)
api/internal/core/entity/entity.go
api/internal/utils/version.go
api/internal/utils/utils.go
api/internal/handler/service/service.go
api/internal/handler/label/label.go
api/internal/core/store/validate.go
api/internal/utils/pid.go
api/internal/handler/global_rule/global_rule.go
... and 38 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e22de29...11dcccc. Read the comment docs.

[juzhiyuan]

LGTM, and would like to update those 3 fields' value to 6? for they are in seconds 🤔

https://github.com/stu01509/apisix-dashboard/blob/fix-%231565-use-seconds/web/src/components/Upstream/constant.ts#L22-L24

[stu01509]

LGTM, and would like to update those 3 fields' value to 6? for they are in seconds 🤔

https://github.com/stu01509/apisix-dashboard/blob/fix-%231565-use-seconds/web/src/components/Upstream/constant.ts#L22-L24

Agree, So I update the commit.

[liuxiran]

Hi @stu01509
For the error in route/import_export_route.spec.js, you would try to update these codes to 6

• https://github.com/apache/apisix-dashboard/blob/9cb4b430e4337a9a1b6a4b3eea4763a76c2feeb7/web/cypress/fixtures/export-route-dataset.json#L43~L45
• https://github.com/apache/apisix-dashboard/blob/9cb4b430e4337a9a1b6a4b3eea4763a76c2feeb7/web/cypress/fixtures/export-route-dataset.json#L96~L98
• https://github.com/apache/apisix-dashboard/blob/9cb4b430e4337a9a1b6a4b3eea4763a76c2feeb7/web/cypress/fixtures/export-route-dataset.json#L148~L150

and for the error https://github.com/apache/apisix-dashboard/pull/1580/checks?check_run_id=2100719617, may need @nic-chen 's help, for this error also occued in https://github.com/apache/apisix-dashboard/pull/1576/checks?check_run_id=2101373014 thanks a lot.

[nic-chen]

Hi @stu01509

For the error in route/import_export_route.spec.js, you would try to update these codes to 6

• https://github.com/apache/apisix-dashboard/blob/9cb4b430e4337a9a1b6a4b3eea4763a76c2feeb7/web/cypress/fixtures/export-route-dataset.json#L43~L45

• https://github.com/apache/apisix-dashboard/blob/9cb4b430e4337a9a1b6a4b3eea4763a76c2feeb7/web/cypress/fixtures/export-route-dataset.json#L96~L98

• https://github.com/apache/apisix-dashboard/blob/9cb4b430e4337a9a1b6a4b3eea4763a76c2feeb7/web/cypress/fixtures/export-route-dataset.json#L148~L150

and for the error https://github.com/apache/apisix-dashboard/pull/1580/checks?check_run_id=2100719617, may need @nic-chen 's help, for this error also occued in https://github.com/apache/apisix-dashboard/pull/1576/checks?check_run_id=2101373014 thanks a lot.

I found the reason, will fix it soon

[stu01509]

Hi @liuxiran and @nic-chen

Thanks for point out, so should I fix the E2E test error or waiting for @nic-chen to solve it?

[liuxiran]

Hi @liuxiran and @nic-chen

Thanks for point out, so should I fix the E2E test error or waiting for @nic-chen to solve it?

you can try to fix the e2e error in route/import_export_route.spec.js first😊 @stu01509

[nic-chen]

thanks @liuxiran

[stu01509]

Hi @liuxiran and @nic-chen

Update the commit, fix the import_export_route.spec.js compare file error.

[nic-chen]

wait for #1594

[nic-chen]

hi, please sync codes from branch master.

[stu01509]

hi, please sync codes from branch master.

Done!