Add tests for LoadAvailableRunners method

nomad/nomad.go

@@ -7,10 +7,23 @@ import (
 
 // ExecutorApi provides access to an container orchestration solution
 type ExecutorApi interface {
+	nomadApiQuerier
+
+	// LoadAvailableRunners loads all allocations of the specified job which are running and not about to get stopped.
+	LoadAvailableRunners(jobId string) (runnerIds []string, err error)
+}
+
+// nomadApiQuerier provides access to the Nomad functionality
+type nomadApiQuerier interface {
+	// init prepares an apiClient to be able to communicate to a provided Nomad API
+	init(nomadURL *url.URL) (err error)
+
 	// LoadJobList loads the list of jobs from the Nomad api.
 	LoadJobList() (list []*nomadApi.JobListStub, err error)
+
 	// GetJobScale returns the scale of the passed job.
 	GetJobScale(jobId string) (jobScale int, err error)
+
 	// SetJobScaling sets the scaling count of the passed job to Nomad.
 	SetJobScaling(jobId string, count int, reason string) (err error)
 
@@ -18,53 +31,29 @@ type ExecutorApi interface {
 	DeleteRunner(runnerId string) (err error)
 
 	// LoadAvailableRunners loads all allocations of the specified job which are running and not about to get stopped.
-	LoadAvailableRunners(jobId string) (runnerIds []string, err error)
+	loadRunners(jobId string) (allocationListStub []*nomadApi.AllocationListStub, err error)
 }
 
-// ApiClient provides access to the Nomad functionality
 type ApiClient struct {
+	nomadApiQuerier
+}
+
+type directNomadApiClient struct {
 	client *nomadApi.Client
 }
 
 // New creates a new api client.
 // One client is usually sufficient for the complete runtime of the API.
 func New(nomadURL *url.URL) (ExecutorApi, error) {
-	client := &ApiClient{}
+	client := &ApiClient{
+		nomadApiQuerier: &directNomadApiClient{},
+	}
 	err := client.init(nomadURL)
 	return client, err
 }
 
-// init prepares an apiClient to be able to communicate to a provided Nomad API.
-func (apiClient *ApiClient) init(nomadURL *url.URL) (err error) {
-	apiClient.client, err = nomadApi.NewClient(&nomadApi.Config{
-		Address:   nomadURL.String(),
-		TLSConfig: &nomadApi.TLSConfig{},
-	})
-	return err
-}
-
-func (apiClient *ApiClient) LoadJobList() (list []*nomadApi.JobListStub, err error) {
-	list, _, err = apiClient.client.Jobs().List(nil)
-	return
-}
-
-func (apiClient *ApiClient) GetJobScale(jobId string) (jobScale int, err error) {
-	status, _, err := apiClient.client.Jobs().ScaleStatus(jobId, nil)
-	if err != nil {
-		return
-	}
-	// ToDo: Consider counting also the placed and desired allocations
-	jobScale = status.TaskGroups[jobId].Running
-	return
-}
-
-func (apiClient *ApiClient) SetJobScaling(jobId string, count int, reason string) (err error) {
-	_, _, err = apiClient.client.Jobs().Scale(jobId, jobId, &count, reason, false, nil, nil)
-	return
-}
-
 func (apiClient *ApiClient) LoadAvailableRunners(jobId string) (runnerIds []string, err error) {
-	list, _, err := apiClient.client.Jobs().Allocations(jobId, true, nil)
+	list, err := apiClient.loadRunners(jobId)
 	if err != nil {
 		return nil, err
 	}
@@ -77,11 +66,44 @@ func (apiClient *ApiClient) LoadAvailableRunners(jobId string) (runnerIds []stri
 	return
 }
 
-func (apiClient *ApiClient) DeleteRunner(runnerId string) (err error) {
-	allocation, _, err := apiClient.client.Allocations().Info(runnerId, nil)
+func (rawApiClient *directNomadApiClient) init(nomadURL *url.URL) (err error) {
+	rawApiClient.client, err = nomadApi.NewClient(&nomadApi.Config{
+		Address:   nomadURL.String(),
+		TLSConfig: &nomadApi.TLSConfig{},
+	})
+	return err
+}
+
+func (rawApiClient *directNomadApiClient) LoadJobList() (list []*nomadApi.JobListStub, err error) {
+	list, _, err = rawApiClient.client.Jobs().List(nil)
+	return
+}
+
+func (rawApiClient *directNomadApiClient) GetJobScale(jobId string) (jobScale int, err error) {
+	status, _, err := rawApiClient.client.Jobs().ScaleStatus(jobId, nil)
 	if err != nil {
 		return
 	}
-	_, err = apiClient.client.Allocations().Stop(allocation, nil)
+	// ToDo: Consider counting also the placed and desired allocations
+	jobScale = status.TaskGroups[jobId].Running
+	return
+}
+
+func (rawApiClient *directNomadApiClient) SetJobScaling(jobId string, count int, reason string) (err error) {
+	_, _, err = rawApiClient.client.Jobs().Scale(jobId, jobId, &count, reason, false, nil, nil)
+	return
+}
+
+func (rawApiClient *directNomadApiClient) loadRunners(jobId string) (allocationListStub []*nomadApi.AllocationListStub, err error) {
+	allocationListStub, _, err = rawApiClient.client.Jobs().Allocations(jobId, true, nil)
+	return
+}
+
+func (rawApiClient *directNomadApiClient) DeleteRunner(runnerId string) (err error) {
+	allocation, _, err := rawApiClient.client.Allocations().Info(runnerId, nil)
+	if err != nil {
+		return
+	}
+	_, err = rawApiClient.client.Allocations().Stop(allocation, nil)
 	return err
 }