Introduce GetFullyQualifiedHomeserverName(...)

Author: MadLittleMods

internal/docker/deployment.go

@@ -57,6 +57,16 @@ func (hsDep *HomeserverDeployment) SetEndpoints(baseURL string, fedBaseURL strin
 	}
 }
 
+func (d *Deployment) GetFullyQualifiedHomeserverName(hsName string) (string, error) {
+	_, ok := d.HS[hsName]
+	if !ok {
+		return "", fmt.Errorf("Deployment.GetFullyQualifiedHomeserverName - HS name '%s' not found", hsName)
+	}
+	// We have network aliases for each Docker container that will resolve the `hsName` to
+	// the container.
+	return hsName, nil
+}
+
 // DestroyAtCleanup destroys the entire deployment. It should be called at cleanup time for dirty
 // deployments only. Handles configuration options for things which should run at container destroy
 // time, like post-run scripts and printing logs.

test_package.go

@@ -20,6 +20,12 @@ import (
 
 // Deployment provides a way for tests to interact with a set of homeservers.
 type Deployment interface {
+	// Returns the resolvable host name of a homeserver given its short alias (e.g.,
+	// "hs1", "hs2").
+	//
+	// In the case of the standard Docker deployment, this will be the same `hs1`, `hs2`
+	// but may be different for other custom deployments.
+	GetFullyQualifiedHomeserverName(hsName string) (string, error)
 	// UnauthenticatedClient returns a blank CSAPI client.
 	UnauthenticatedClient(t ct.TestLike, serverName string) *client.CSAPI
 	// Register a new user on the given server.