feat: added default values & missing fields to Upstream #1764

juzhiyuan · 2021-04-13T08:19:48Z

Please answer these questions before submitting a pull request, or your PR will get closed.

Why submit this pull request?

Bugfix
New feature provided
Improve performance
Backport patches

What changes will this PR take into?

Hi, this PR aims to add the missing fields to Upstream Form, according to schema_def. (https://github.com/apache/apisix/blob/master/apisix/schema_def.lua#L114) And all default value are added.

Concurrency
...

fix #1770

Checklist:

Did you explain what problem does this PR solve? Or what new features have been added?
Have you added corresponding test cases?
Have you modified the corresponding document?
Is this PR backward compatible? If it is not backward compatible, please discuss on the mailing list first

netlify · 2021-04-13T08:19:54Z

Deploy preview for apisix-dashboard ready!

Built with commit 1890dc7

https://deploy-preview-1764--apisix-dashboard.netlify.app

codecov-io · 2021-04-13T11:25:11Z

Codecov Report

Merging #1764 (900e6a3) into master (537b4ff) will decrease coverage by 9.23%.
The diff coverage is n/a.

❗ Current head 900e6a3 differs from pull request most recent head 881f365. Consider uploading reports for the commit 881f365 to get more accurate results

@@            Coverage Diff             @@
##           master    #1764      +/-   ##
==========================================
- Coverage   71.55%   62.32%   -9.24%     
==========================================
  Files          47       47              
  Lines        3129     3129              
==========================================
- Hits         2239     1950     -289     
- Misses        646      866     +220     
- Partials      244      313      +69

Flag	Coverage Δ
backend-e2e-test	`62.32% <ø> (ø)`
backend-e2e-test-ginkgo	`49.18% <ø> (-0.16%)`	⬇️
backend-unit-test	`?`

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

Impacted Files	Coverage Δ
api/internal/utils/runtime/runtime.go	`0.00% <0.00%> (-64.29%)`	⬇️
api/internal/core/store/validate_mock.go	`0.00% <0.00%> (-50.00%)`	⬇️
api/internal/filter/authentication.go	`47.22% <0.00%> (-30.56%)`	⬇️
api/internal/handler/service/service.go	`62.60% <0.00%> (-29.57%)`	⬇️
api/internal/core/store/store.go	`58.68% <0.00%> (-29.35%)`	⬇️
api/internal/filter/ip_filter.go	`48.71% <0.00%> (-23.08%)`	⬇️
api/internal/handler/global_rule/global_rule.go	`64.51% <0.00%> (-19.36%)`	⬇️
...pi/internal/handler/plugin_config/plugin_config.go	`59.57% <0.00%> (-18.09%)`	⬇️
api/internal/utils/json_patch.go	`44.82% <0.00%> (-13.80%)`	⬇️
api/internal/handler/upstream/upstream.go	`77.14% <0.00%> (-13.58%)`	⬇️
... and 12 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 537b4ff...881f365. Read the comment docs.

…ix-dashboard into juzhiyuan/upstream-fields

juzhiyuan · 2021-04-14T14:16:12Z

CI passes on local

web/src/components/Upstream/UpstreamForm.tsx

moonming · 2021-04-15T03:31:46Z

@juzhiyuan please use a better title of this PR

imjoey · 2021-04-15T03:28:40Z

web/src/components/Upstream/components/TLS.tsx

+                    required
+                    rules={[{ required: true, message: "" }, { max: 64 * 1024 }, { min: 128 }]}
+                  >
+                    <Input.TextArea disabled={readonly} minLength={128} maxLength={64 * 1024} rows={5} placeholder="请输入客户端证书" />


@juzhiyuan The text of placeholder seems no i18n here. As expected?

No, same as your last comment.

Due to CI will take a long time to run, I would prefer to remove them in the new PR.

imjoey · 2021-04-15T03:29:15Z

web/src/components/Upstream/components/TLS.tsx

+                    required
+                    rules={[{ required: true, message: "" }, { max: 64 * 1024 }, { min: 128 }]}
+                  >
+                    <Input.TextArea disabled={readonly} minLength={128} maxLength={64 * 1024} rows={5} placeholder="请输入客户端私钥" />


ditto here.

LiteSun · 2021-04-14T08:35:32Z

web/cypress/fixtures/selector.json

  "deleteAlert": ".ant-modal-body"
-}
+}


new line please.

LiteSun · 2021-04-14T08:37:48Z

web/src/components/Upstream/UpstreamForm.tsx

+            if (targetData) {
+              form.setFieldsValue(transformUpstreamDataFromRequest(targetData));
+            } else {
+              // TODO: 提示 upstream_id 找不到想要的数据


remove Chinese comment.

LiteSun · 2021-04-15T03:26:04Z

web/src/components/Upstream/components/TLS.tsx

+                    required
+                    rules={[{ required: true, message: "" }, { max: 64 * 1024 }, { min: 128 }]}
+                  >
+                    <Input.TextArea disabled={readonly} minLength={128} maxLength={64 * 1024} rows={5} placeholder="请输入客户端证书" />


LiteSun · 2021-04-15T03:26:18Z

web/src/components/Upstream/components/TLS.tsx

+                    required
+                    rules={[{ required: true, message: "" }, { max: 64 * 1024 }, { min: 128 }]}
+                  >
+                    <Input.TextArea disabled={readonly} minLength={128} maxLength={64 * 1024} rows={5} placeholder="请输入客户端私钥" />


LiteSun · 2021-04-15T03:32:43Z

web/src/components/Upstream/components/passive-check/Type.tsx

    </Form.Item>
  )
 }

-export default PassiveCheckTypeComponent
+export default ActiveCheckTypeComponent


wrong name.

juzhiyuan · 2021-04-15T03:40:19Z

Hi @imjoey @LiteSun , thanks for your reviewing, just noticed there have some comments related to i18n (I missed them), if no urgent bug needs to be fixed, I would prefer resolving them in the new PR, because GitHub Action will queue unexpected those days.

imjoey

/lgtm

Thanks @juzhiyuan .

juzhiyuan added 5 commits April 13, 2021 15:14

chore: added TLS

c39993e

chore: added TLS

6a6fa02

chore: added i18n for Others

9bb5146

chore: update active.type

acfa1d8

chore: update active.timeout

900e6a3

juzhiyuan marked this pull request as draft April 13, 2021 08:19

chore: added Concurrency

881f365

juzhiyuan added 21 commits April 13, 2021 19:28

Merge branch 'master' into juzhiyuan/upstream-fields

c7eb03e

chore: added concurrency i18n

7a0ccd9

chore: update host fields

fb54a38

chore: update Port

823c2b1

chore: update Port

04f2f29

chore: added type tooltip

0c0c663

chore: update HTTP Path

8f8d109

chore: update Host

8f5de24

chore: added verify_https_certificate

309d336

chore: update i18n

02feece

chore: added TODO

1f7b685

chore: update active check interval

4df5ec7

chore: update active check interval

d544309

chore: update successes

ece1c97

chore: added active http_statues

8ebe5b9

chore: update timeouts

9f0bcd0

chore: update interval

be690b9

chore: update HttpFailures & HttpStatues

e16ac2a

chore: update TCP failures

0efb744

chore: update req headers

b5886e6

chore: update ReqHeaders

3589ec6

juzhiyuan added 2 commits April 14, 2021 15:21

fix: ci

6021971

Merge branch 'master' into juzhiyuan/upstream-fields

47db0f7

juzhiyuan requested review from imjoey and bzp2010 April 14, 2021 10:53

juzhiyuan added 3 commits April 14, 2021 18:54

Update selector.json

9cb53d2

chore: added plugin

3a5d75a

Merge branch 'juzhiyuan/upstream-fields' of github.com:juzhiyuan/apis…

154eff4

…ix-dashboard into juzhiyuan/upstream-fields

juzhiyuan mentioned this pull request Apr 14, 2021

there is no default status code when configuring the health check through the Dashboard #1770

Closed

fix: CI

202b523

juzhiyuan and others added 8 commits April 14, 2021 22:37

fix: CI

d38c7ca

chore: remove extra line

c1f8582

chore: update typing

bbe67a5

Merge branch 'master' into juzhiyuan/upstream-fields

c7ea9a1

fix: ci

d829414

fix: ci

2810a54

Merge branch 'master' into juzhiyuan/upstream-fields

8644a28

chore: sync CI codes

1890dc7

imjoey reviewed Apr 15, 2021

View reviewed changes

web/src/components/Upstream/UpstreamForm.tsx Show resolved Hide resolved

juzhiyuan changed the title ~~chore: added Fields to Upstream module~~ feat: added default values & missing fields to Upstream Apr 15, 2021

imjoey requested changes Apr 15, 2021

View reviewed changes

LiteSun approved these changes Apr 15, 2021

View reviewed changes

imjoey approved these changes Apr 15, 2021

View reviewed changes

membphis approved these changes Apr 15, 2021

View reviewed changes

moonming approved these changes Apr 15, 2021

View reviewed changes

moonming merged commit 4b86ef2 into apache:master Apr 15, 2021

juzhiyuan deleted the juzhiyuan/upstream-fields branch April 15, 2021 04:33

juzhiyuan mentioned this pull request Apr 15, 2021

resolve PR comments #1775

Closed

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: added default values & missing fields to Upstream #1764

feat: added default values & missing fields to Upstream #1764

juzhiyuan commented Apr 13, 2021 •

edited

Loading

netlify bot commented Apr 13, 2021 •

edited

Loading

codecov-io commented Apr 13, 2021 •

edited

Loading

juzhiyuan commented Apr 14, 2021

moonming commented Apr 15, 2021

imjoey Apr 15, 2021

juzhiyuan Apr 15, 2021

juzhiyuan Apr 15, 2021

imjoey Apr 15, 2021

LiteSun Apr 14, 2021

LiteSun Apr 14, 2021

LiteSun Apr 15, 2021

LiteSun Apr 15, 2021

LiteSun Apr 15, 2021

juzhiyuan commented Apr 15, 2021 •

edited

Loading

imjoey left a comment

feat: added default values & missing fields to Upstream #1764

feat: added default values & missing fields to Upstream #1764

Conversation

juzhiyuan commented Apr 13, 2021 • edited Loading

netlify bot commented Apr 13, 2021 • edited Loading

codecov-io commented Apr 13, 2021 • edited Loading

Codecov Report

juzhiyuan commented Apr 14, 2021

moonming commented Apr 15, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

juzhiyuan commented Apr 15, 2021 • edited Loading

imjoey left a comment

Choose a reason for hiding this comment

juzhiyuan commented Apr 13, 2021 •

edited

Loading

netlify bot commented Apr 13, 2021 •

edited

Loading

codecov-io commented Apr 13, 2021 •

edited

Loading

juzhiyuan commented Apr 15, 2021 •

edited

Loading