Fix http datastore fqdn address

In case the http datastore address has a port number, the datastore address should contain both the hostname and the port. Signed-off-by: Shahriyar Jalayeri <[email protected]>
lf-edge · Jul 24, 2024 · a81166f · a81166f
1 parent ffbccba
commit a81166f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/pkg/expect/http.go b/pkg/expect/http.go
@@ -143,6 +143,11 @@ func (exp *AppExpectation) createDataStoreHTTP(id uuid.UUID) *config.DatastoreCo
 			ds.DType = config.DsType_DsHttps
 		}
 		ds.Fqdn = fmt.Sprintf("%s://%s", u.Scheme, u.Hostname())
+		// In case the http datastore address has a port number,
+		// the datastore address should contain both the hostname and the port.
+		if u.Port() != "" {
+			ds.Fqdn = fmt.Sprintf("%s:%s", ds.Fqdn, u.Port())
+		}
 	} else {
 		ds.Fqdn = fmt.Sprintf("http://%s:%s", exp.ctrl.GetVars().AdamDomain, exp.ctrl.GetVars().EServerPort)
 	}