parse and inject the scheme e.g https when constructing the node address

client/metadata/README.md

@@ -6,7 +6,7 @@ This API client was generated by the [swagger-codegen](https://github.com/swagge
 
 - API version: 
 - Package version: 1.0.0
-- Build date: 2017-07-13T17:00:20.181+01:00
+- Build date: 2017-08-14T09:58:05.106+01:00
 - Build package: class io.swagger.codegen.languages.GoClientCodegen
 
 ## Installation

client/metadata/api_location.go

@@ -26,6 +26,8 @@ type ApiLocation struct {
 	// public port of the node
 	Port int32 `json:"port,omitempty"`
 
+	Scheme string `json:"scheme,omitempty"`
+
 	// unique identifier for a node
 	Uid string `json:"uid,omitempty"`
 }

client/metadata/api_location_request.go

@@ -25,4 +25,6 @@ type ApiLocationRequest struct {
 
 	// public port of the node
 	Port int32 `json:"port,omitempty"`
+
+	Scheme string `json:"scheme,omitempty"`
 }

client/metadata/docs/ApiLocation.md

@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **IpAddress** | **string** | public IP address of the node | [default to null]
 **Port** | **int32** | public port of the node | [default to null]
+**Scheme** | **string** |  | [default to null]
 **Uid** | **string** | unique identifier for a node | [default to null]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

client/metadata/docs/ApiLocationRequest.md

@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **IpAddress** | **string** | public IP address of the node | [default to null]
 **Port** | **int32** | public port of the node | [default to null]
+**Scheme** | **string** |  | [default to null]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

metadata/api/catalog.go

@@ -51,6 +51,7 @@ type ItemWithLocation struct {
 type LocationRequest struct {
 	IPAddress string `json:"ip-address" description:"public IP address of the node" validate:"nonzero"`
 	Port      int    `json:"port" description:"public port of the node" validate:"nonzero"`
+	Scheme    string `json:"scheme" description:protocol to use e.g. http or https`
 }
 
 // Location contains the original request and a UID to use when interacting with the service e.g. adding Items to the catalog.

node/server.go

@@ -85,8 +85,8 @@ func Serve(options Options) error {
 // registerWithMetadataService returns the 'announce' token from the metadata service
 func registerWithMetadataService(client *metadataclient.MetadataApi, nodePublicAddress string) (string, error) {
 
-	// parse the nods public address into its component parts
-	ok, host, port := utils.HostAndIpToBits(nodePublicAddress)
+	// parse the node's public address into its component parts
+	ok, scheme, host, port := utils.HostAndIpToBits(nodePublicAddress)
 
 	if !ok {
 		return "", errors.New("unable to parse WEBSERVICES_URL or flag -u. Expected value : http[s]://host:port")
@@ -101,6 +101,7 @@ func registerWithMetadataService(client *metadataclient.MetadataApi, nodePublicA
 		response, _, err := client.RegisterLocation(metadataclient.ApiLocationRequest{
 			IpAddress: host,
 			Port:      int32(port),
+			Scheme:    scheme,
 		})
 
 		if err != nil {

ui/node.js

@@ -14214,9 +14214,9 @@ var _user$project$Decoders$Item = F5(
 	function (a, b, c, d, e) {
 		return {key: a, location: b, sample: c, tags: d, uid: e};
 	});
-var _user$project$Decoders$Location = F4(
-	function (a, b, c, d) {
-		return {ipAddress: a, ipPort: b, uid: c, right: d};
+var _user$project$Decoders$Location = F5(
+	function (a, b, c, d, e) {
+		return {ipAddress: a, ipPort: b, scheme: c, uid: d, right: e};
 	});
 var _user$project$Decoders$DataResponse = function (a) {
 	return {data: a};
@@ -14256,11 +14256,12 @@ var _user$project$Decoders$decodeDevices = _elm_lang$core$Json_Decode$list(_user
 var _user$project$Decoders$Requesting = {ctor: 'Requesting'};
 var _user$project$Decoders$RequestAccess = {ctor: 'RequestAccess'};
 var _user$project$Decoders$Unknown = {ctor: 'Unknown'};
-var _user$project$Decoders$decodeLocation = A5(
-	_elm_lang$core$Json_Decode$map4,
+var _user$project$Decoders$decodeLocation = A6(
+	_elm_lang$core$Json_Decode$map5,
 	_user$project$Decoders$Location,
 	A2(_elm_lang$core$Json_Decode$field, 'ip-address', _elm_lang$core$Json_Decode$string),
 	A2(_elm_lang$core$Json_Decode$field, 'port', _elm_lang$core$Json_Decode$int),
+	A2(_elm_lang$core$Json_Decode$field, 'scheme', _elm_lang$core$Json_Decode$string),
 	A2(_elm_lang$core$Json_Decode$field, 'uid', _elm_lang$core$Json_Decode$string),
 	_elm_lang$core$Json_Decode$succeed(_user$project$Decoders$Unknown));
 var _user$project$Decoders$decodeItem = A6(

ui/search.js

@@ -10442,9 +10442,9 @@ var _user$project$Decoders$Item = F5(
 	function (a, b, c, d, e) {
 		return {key: a, location: b, sample: c, tags: d, uid: e};
 	});
-var _user$project$Decoders$Location = F4(
-	function (a, b, c, d) {
-		return {ipAddress: a, ipPort: b, uid: c, right: d};
+var _user$project$Decoders$Location = F5(
+	function (a, b, c, d, e) {
+		return {ipAddress: a, ipPort: b, scheme: c, uid: d, right: e};
 	});
 var _user$project$Decoders$DataResponse = function (a) {
 	return {data: a};
@@ -10484,11 +10484,12 @@ var _user$project$Decoders$decodeDevices = _elm_lang$core$Json_Decode$list(_user
 var _user$project$Decoders$Requesting = {ctor: 'Requesting'};
 var _user$project$Decoders$RequestAccess = {ctor: 'RequestAccess'};
 var _user$project$Decoders$Unknown = {ctor: 'Unknown'};
-var _user$project$Decoders$decodeLocation = A5(
-	_elm_lang$core$Json_Decode$map4,
+var _user$project$Decoders$decodeLocation = A6(
+	_elm_lang$core$Json_Decode$map5,
 	_user$project$Decoders$Location,
 	A2(_elm_lang$core$Json_Decode$field, 'ip-address', _elm_lang$core$Json_Decode$string),
 	A2(_elm_lang$core$Json_Decode$field, 'port', _elm_lang$core$Json_Decode$int),
+	A2(_elm_lang$core$Json_Decode$field, 'scheme', _elm_lang$core$Json_Decode$string),
 	A2(_elm_lang$core$Json_Decode$field, 'uid', _elm_lang$core$Json_Decode$string),
 	_elm_lang$core$Json_Decode$succeed(_user$project$Decoders$Unknown));
 var _user$project$Decoders$decodeItem = A6(
@@ -10690,14 +10691,17 @@ var _user$project$Search$metadataURL = 'http://localhost:8081';
 var _user$project$Search$nodeURLFromLocation = function (location) {
 	return A2(
 		_elm_lang$core$Basics_ops['++'],
-		'http://',
+		location.scheme,
 		A2(
 			_elm_lang$core$Basics_ops['++'],
-			location.ipAddress,
+			'://',
 			A2(
 				_elm_lang$core$Basics_ops['++'],
-				':',
-				_elm_lang$core$Basics$toString(location.ipPort))));
+				location.ipAddress,
+				A2(
+					_elm_lang$core$Basics_ops['++'],
+					':',
+					_elm_lang$core$Basics$toString(location.ipPort)))));
 };
 var _user$project$Search$initialModel = {all: _elm_lang$core$Maybe$Nothing, filter: _elm_lang$core$Maybe$Nothing};
 var _user$project$Search$unsafeDrawGraph = _elm_lang$core$Native_Platform.outgoingPort(

ui/src/Decoders.elm

@@ -35,6 +35,7 @@ decodeItem =
 type alias Location =
     { ipAddress : String
     , ipPort : Int
+    , scheme : String
     , uid : String
     , right : Right
     }
@@ -48,9 +49,10 @@ type Right
 
 decodeLocation : Json.Decode.Decoder Location
 decodeLocation =
-    Json.Decode.map4 Location
+    Json.Decode.map5 Location
         (Json.Decode.field "ip-address" Json.Decode.string)
         (Json.Decode.field "port" Json.Decode.int)
+        (Json.Decode.field "scheme" Json.Decode.string)
         (Json.Decode.field "uid" Json.Decode.string)
         (Json.Decode.succeed Unknown)
 

ui/src/Search.elm

@@ -149,7 +149,7 @@ prepareGraphData items =
 
 nodeURLFromLocation : Decoders.Location -> String
 nodeURLFromLocation location =
-    "http://" ++ location.ipAddress ++ ":" ++ toString (location.ipPort)
+    location.scheme ++ "://" ++ location.ipAddress ++ ":" ++ toString (location.ipPort)
 
 
 metadataURL : String

utils/address.go

@@ -7,26 +7,26 @@ import (
 )
 
 // HostAndIpToBits parses an address parsing out the host and port
-// Example input - http://abc.com:1234 returns { true, abc.com, 1234 }
-func HostAndIpToBits(address string) (bool, string, int) {
+// Example input - http://abc.com:1234 returns { true, http, abc.com, 1234 }
+func HostAndIpToBits(address string) (bool, string, string, int) {
 
 	url, err := url.Parse(address)
 
 	if err != nil {
-		return false, "", 0
+		return false, "", "", 0
 	}
 
 	bits := strings.Split(url.Host, ":")
 
 	if len(bits) != 2 {
-		return false, "", 0
+		return false, "", "", 0
 	}
 
 	port, err := strconv.Atoi(bits[1])
 
 	if err != nil {
-		return false, "", 0
+		return false, "", "", 0
 	}
 
-	return true, bits[0], port
+	return true, url.Scheme, bits[0], port
 }