feat: Add HTTPS support to REST (#986)

* feat: add HTTPS support to REST

Signed-off-by: Yangsta911 <[email protected]>

* refactor: Update Address struct to remove Protocol field and use Scheme

Signed-off-by: Yangsta911 <[email protected]>

---------

Signed-off-by: Yangsta911 <[email protected]>

Author: Yangsta911

clients/http/subscription_test.go

@@ -26,7 +26,7 @@ func addSubscriptionRequest() requests.AddSubscriptionRequest {
 	return requests.NewAddSubscriptionRequest(
 		dtos.Subscription{
 			Name:        TestSubscriptionName,
-			Channels:    []dtos.Address{dtos.NewRESTAddress(TestHost, TestPort, http.MethodGet)},
+			Channels:    []dtos.Address{dtos.NewRESTAddress(TestHost, TestPort, http.MethodGet, "http")},
 			Receiver:    TestReceiver,
 			Categories:  []string{TestCategory},
 			Labels:      []string{TestLabel},
@@ -41,7 +41,7 @@ func updateSubscriptionRequest() requests.UpdateSubscriptionRequest {
 	return requests.NewUpdateSubscriptionRequest(
 		dtos.UpdateSubscription{
 			Name:     &name,
-			Channels: []dtos.Address{dtos.NewRESTAddress(TestHost, TestPort, http.MethodPut)},
+			Channels: []dtos.Address{dtos.NewRESTAddress(TestHost, TestPort, http.MethodPut, "http")},
 		},
 	)
 }

dtos/address.go

@@ -68,11 +68,12 @@ type RESTAddress struct {
 	InjectEdgeXAuth bool   `json:"injectEdgeXAuth,omitempty"`
 }
 
-func NewRESTAddress(host string, port int, httpMethod string) Address {
+func NewRESTAddress(host string, port int, httpMethod string, scheme string) Address {
 	return Address{
-		Type: common.REST,
-		Host: host,
-		Port: port,
+		Type:   common.REST,
+		Host:   host,
+		Port:   port,
+		Scheme: scheme,
 		RESTAddress: RESTAddress{
 			HTTPMethod: httpMethod,
 		},
@@ -160,7 +161,7 @@ func ToAddressModel(a Address) models.Address {
 	case common.REST:
 		address = models.RESTAddress{
 			BaseAddress: models.BaseAddress{
-				Type: a.Type, Host: a.Host, Port: a.Port,
+				Type: a.Type, Host: a.Host, Port: a.Port, Scheme: a.Scheme,
 			},
 			Path:            a.RESTAddress.Path,
 			HTTPMethod:      a.RESTAddress.HTTPMethod,

dtos/requests/subscription_test.go

@@ -24,7 +24,7 @@ var (
 	testHost                   = "host"
 	testPort                   = 123
 	testSubscriptionChannels   = []dtos.Address{
-		dtos.NewRESTAddress(testHost, testPort, http.MethodGet),
+		dtos.NewRESTAddress(testHost, testPort, http.MethodGet, "http"),
 		dtos.NewEmailAddress([]string{"[email protected]"}),
 		dtos.NewMQTTAddress(testHost, testPort, "publisher", "topic"),
 		dtos.NewZeroMQAddress(testHost, testPort, "topic"),