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

client: fix check datascale command for https endpoints #12864

Merged
merged 2 commits into from
Apr 18, 2021

Conversation

ssbostan
Copy link
Contributor

etcdctl check datascale command was not working with https endpoints.
this is a fix for solving that problem.

@codecov-io
Copy link

Codecov Report

Merging #12864 (a9c4301) into master (57a092b) will decrease coverage by 8.09%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #12864      +/-   ##
==========================================
- Coverage   71.81%   63.71%   -8.10%     
==========================================
  Files         427      421       -6     
  Lines       33812    33621     -191     
==========================================
- Hits        24282    21423    -2859     
- Misses       7617    10120    +2503     
- Partials     1913     2078     +165     
Flag Coverage Δ
all 63.71% <0.00%> (-8.10%) ⬇️

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

Impacted Files Coverage Δ
etcdctl/ctlv3/command/check.go 12.22% <0.00%> (-0.07%) ⬇️
etcdctl/ctlv3/command/util.go 16.66% <0.00%> (+6.66%) ⬆️
...ver/proxy/grpcproxy/adapter/lock_client_adapter.go 0.00% <0.00%> (-100.00%) ⬇️
server/etcdserver/api/v2v3/watcher.go 0.00% <0.00%> (-82.09%) ⬇️
server/etcdserver/api/v3compactor/revision.go 0.00% <0.00%> (-76.93%) ⬇️
client/pkg/v3/testutil/recorder.go 0.00% <0.00%> (-76.28%) ⬇️
client/v3/namespace/lease.go 0.00% <0.00%> (-69.24%) ⬇️
server/proxy/grpcproxy/election.go 6.25% <0.00%> (-68.75%) ⬇️
server/proxy/grpcproxy/lock.go 33.33% <0.00%> (-66.67%) ⬇️
server/etcdserver/api/v2v3/store.go 14.24% <0.00%> (-64.12%) ⬇️
... and 159 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 c73da74...a9c4301. Read the comment docs.

@lilic
Copy link
Contributor

lilic commented Apr 16, 2021

Thank you! 🎉 Fixes #12860.

@ptabor
Copy link
Contributor

ptabor commented Apr 16, 2021

Please run ./scripts/fix.sh to
fix:

'gofmt' started at Thu Apr 15 23:30:18 UTC 2021
ctlv3/command/util.go
diff -u ctlv3/command/util.go.orig ctlv3/command/util.go
--- ctlv3/command/util.go.orig	2021-04-15 23:30:22.106425999 +0000
+++ ctlv3/command/util.go	2021-04-15 23:30:22.106425999 +0000
@@ -15,8 +15,8 @@
 package command
 
 import (
-	"crypto/tls"
 	"context"
+	"crypto/tls"
 	"encoding/hex"
 	"fmt"
 	"io/ioutil"
@@ -107,7 +107,7 @@
 			return 0.0
 		}
 		http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{
-			Certificates: []tls.Certificate{cert},
+			Certificates:       []tls.Certificate{cert},
 			InsecureSkipVerify: scfg.insecureSkipVerify,
 		}
 	}

@ssbostan
Copy link
Contributor Author

@ptabor Done.

@codecov-commenter
Copy link

Codecov Report

Merging #12864 (97a8aff) into master (57a092b) will decrease coverage by 10.25%.
The diff coverage is 0.00%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master   #12864       +/-   ##
===========================================
- Coverage   71.81%   61.55%   -10.26%     
===========================================
  Files         427      418        -9     
  Lines       33812    33595      -217     
===========================================
- Hits        24282    20680     -3602     
- Misses       7617    10873     +3256     
- Partials     1913     2042      +129     
Flag Coverage Δ
all 61.55% <0.00%> (-10.26%) ⬇️

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

Impacted Files Coverage Δ
etcdctl/ctlv3/command/check.go 12.22% <0.00%> (-0.07%) ⬇️
etcdctl/ctlv3/command/util.go 16.66% <0.00%> (+6.66%) ⬆️
client/pkg/v3/transport/timeout_conn.go 0.00% <0.00%> (-100.00%) ⬇️
client/pkg/v3/transport/timeout_dialer.go 0.00% <0.00%> (-100.00%) ⬇️
pkg/report/report.go 0.00% <0.00%> (-95.58%) ⬇️
pkg/flags/unique_strings.go 0.00% <0.00%> (-87.50%) ⬇️
pkg/report/timeseries.go 0.00% <0.00%> (-86.77%) ⬇️
pkg/expect/expect.go 0.00% <0.00%> (-84.29%) ⬇️
client/pkg/v3/transport/listener_opts.go 13.33% <0.00%> (-83.34%) ⬇️
server/etcdserver/api/v2v3/watcher.go 0.00% <0.00%> (-82.09%) ⬇️
... and 156 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 c73da74...97a8aff. Read the comment docs.

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

5 participants