Merge pull request #32 from easyops-cn/kestrel/schema

chore(): support https scheme refs MONITOR-6046

Author: hzhaop

plugins/restv2/client.go

@@ -25,6 +25,7 @@ type Client struct {
 	Middleware  Middleware
 	NameService giraffe.NameService
 	retryConf   RetryConfig
+	Scheme      string
 }
 
 // ClientOption Client 配置函数
@@ -111,6 +112,9 @@ func (c *Client) sendWithENS(req *http.Request, contract giraffe.Contract) (resp
 	// 备份 http body
 	var originalBody []byte
 	req.URL.Scheme = "http"
+	if c.Scheme != "" {
+		req.URL.Scheme = c.Scheme
+	}
 	if req != nil && req.Body != nil {
 		originalBody, _ = copyBody(req)
 	}
@@ -185,6 +189,7 @@ func NewClient(opts ...ClientOption) *Client {
 		Client:      &http.Client{},
 		Middleware:  DefaultMiddleware,
 		NameService: nil,
+		Scheme:      "http",
 	}
 	for _, o := range opts {
 		o(c)
@@ -216,3 +221,9 @@ func WithRetryConfig(conf RetryConfig) ClientOption {
 		c.retryConf.init()
 	}
 }
+
+func WithScheme(scheme string) ClientOption {
+	return func(c *Client) {
+		c.Scheme = scheme
+	}
+}

plugins/restv2/client_test.go

@@ -481,6 +481,7 @@ func TestNewClient(t *testing.T) {
 				retryConf: RetryConfig{
 					RetryInterval: defaultWaitDuration,
 				},
+				Scheme: "http",
 			},
 		},
 	}
@@ -658,3 +659,33 @@ func TestClient_sendWithENS_503_retry_no_retryAfter(t *testing.T) {
 		_, _ = c.sendWithENS(req1, nil)
 	})
 }
+
+func TestWithScheme(t *testing.T) {
+	type args struct {
+		scheme string
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{
+			name: "success",
+			args: args{
+				scheme: "https",
+			},
+			want: "https",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := WithScheme(tt.args.scheme)
+			client := &Client{}
+			got(client)
+
+			if !reflect.DeepEqual(client.Scheme, tt.want) {
+				t.Errorf("WithScheme() = %v, want %v", client.Scheme, tt.want)
+			}
+		})
+	}
+}