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

[3.5] Fix panic in etcd validate secure endpoints #16565

Merged
merged 1 commit into from
Sep 11, 2023

Conversation

fuweid
Copy link
Contributor

@fuweid fuweid commented Sep 9, 2023

Backport: #13824
Closes: #13810

NOTE: There are too many commits in the original pull request. I can't just use cherry-pick -xs to carry it.

Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.

Backport: etcd-io#13824

Signed-off-by: Wei Fu <fuweid89@gmail.com>
@ahrtr
Copy link
Member

ahrtr commented Sep 9, 2023

Should this PR be backported to 3.4? Could you double check?

Please also add a changelog item, thx

fuweid added a commit to fuweid/etcd that referenced this pull request Sep 9, 2023
Signed-off-by: Wei Fu <fuweid89@gmail.com>
@fuweid
Copy link
Contributor Author

fuweid commented Sep 9, 2023

Should this PR be backported to 3.4? Could you double check?

Dial: (&net.Dialer{

3.4 uses Dail so it won't panic.
And I use the same test in release-3.4 and it passes. I think we don't need to backport for 3.4.

➜  transport git:(release-3.4) ✗ git show | head -n 1
commit 420669a504281517c3de9d5ab234f62714984b24
➜  transport git:(release-3.4) ✗ go test -v -run=TestValidateSecureEndpoints -count=1 ./
=== RUN   TestValidateSecureEndpoints
{"level":"info","msg":"created cert file","path":"/tmp/etcd-test-tls-3358351632/cert.pem"}
{"level":"info","msg":"created key file","path":"/tmp/etcd-test-tls-3358351632/key.pem"}
=== RUN   TestValidateSecureEndpoints/invalidEndPoints
=== RUN   TestValidateSecureEndpoints/insecureEndpoints
=== RUN   TestValidateSecureEndpoints/secureEndPoints
=== RUN   TestValidateSecureEndpoints/mixEndPoints
--- PASS: TestValidateSecureEndpoints (0.01s)
    --- PASS: TestValidateSecureEndpoints/invalidEndPoints (0.00s)
    --- PASS: TestValidateSecureEndpoints/insecureEndpoints (0.00s)
    --- PASS: TestValidateSecureEndpoints/secureEndPoints (0.00s)
    --- PASS: TestValidateSecureEndpoints/mixEndPoints (0.00s)
PASS
ok      go.etcd.io/etcd/pkg/transport   0.014s
➜  transport git:(release-3.4) ✗

Please also add a changelog item, thx

Sure. Please check this #16566

Copy link
Member

@ahrtr ahrtr left a comment

Choose a reason for hiding this comment

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

thx

Copy link
Member

@jmhbnz jmhbnz left a comment

Choose a reason for hiding this comment

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

LGTM Thanks @fuweid

@serathius serathius merged commit 890af4c into etcd-io:release-3.5 Sep 11, 2023
12 checks passed
ahrtr added a commit that referenced this pull request Sep 11, 2023
iiamabby pushed a commit to iiamabby/etcd that referenced this pull request Nov 30, 2023
Signed-off-by: Wei Fu <fuweid89@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants