clean up unused variables

Author: bubylou

integration-test/integration_test.go

@@ -21,7 +21,7 @@ import (
 const attempts = 20
 
 func TestMain(m *testing.M) {
-	host, healthPath, basePath := grabTestHost()
+	host, _, _ := grabTestHost()
 
 	err := healthCheck(attempts)
 	if err != nil {
@@ -36,7 +36,7 @@ func TestMain(m *testing.M) {
 
 func healthCheck(attempts int) error {
 	var err error
-	host, healthPath, basePath := grabTestHost()
+	_, healthPath, _ := grabTestHost()
 
 	for attempts > 0 {
 		err = Do(Get(healthPath), Expect().Status().Equal(http.StatusOK))
@@ -55,7 +55,7 @@ func healthCheck(attempts int) error {
 }
 
 func TestWebFooterVersion(t *testing.T) {
-	host, healthPath, basePath := grabTestHost()
+	_, _, basePath := grabTestHost()
 
 	Test(t,
 		Description("Footer Version"),
@@ -69,7 +69,7 @@ func TestWebFooterVersion(t *testing.T) {
 // New tests based on controller/web
 // login/page
 func TestWebAuthUser(t *testing.T) {
-	host, healthPath, basePath := grabTestHost()
+	_, _, basePath := grabTestHost()
 	username, password := grabTestUser()
 
 	Test(t,
@@ -114,7 +114,7 @@ func TestWebAuthUser(t *testing.T) {
 // devices
 func TestWebDevice(t *testing.T) {
 	client, loginSteps := webAuthSteps()
-	host, healthPath, basePath := grabTestHost()
+	_, _, basePath := grabTestHost()
 
 	Test(t,
 		Description("Login for Device"),
@@ -177,7 +177,7 @@ func TestHTTPKoreaderSyncProgress(t *testing.T) {
 	deviceName := generateDeviceName()
 	deviceSteps := setupDeviceSteps(client, deviceName)
 	Test(t, Description("Device Register"), deviceSteps)
-	host, healthPath, basePath := grabTestHost()
+	_, _, basePath := grabTestHost()
 
 	// check auth
 	Test(t,
@@ -218,7 +218,7 @@ func TestHTTPKoreaderSyncProgress(t *testing.T) {
 // HTTP GET /users/auth
 func TestHTTPAuth(t *testing.T) {
 	username, password := grabTestUser()
-	host, healthPath, basePath := grabTestHost()
+	_, _, basePath := grabTestHost()
 	Test(t,
 		Description("Auth With Incorrect Password"),
 		Get(basePath+"/users/auth"),
@@ -276,7 +276,7 @@ func TestHTTPKompanionShelf(t *testing.T) {
 
 	client, loginSteps := webAuthSteps()
 	Test(t, Description("Login for Device"), loginSteps)
-	host, healthPath, basePath := grabTestHost()
+	_, _, basePath := grabTestHost()
 
 	// put book
 	var redirectedPath string
@@ -355,7 +355,7 @@ func TestWebStats(t *testing.T) {
 	Test(t, Description("Device Register"), deviceSteps)
 
 	basicAuth := "Basic " + base64.StdEncoding.EncodeToString([]byte(deviceName+":"+password))
-	host, healthPath, basePath := grabTestHost()
+	_, _, basePath := grabTestHost()
 
 	statsContent, err := os.ReadFile("../test/test_data/koreader/koreader_statistics_example.sqlite3")
 	if err != nil {
@@ -423,7 +423,7 @@ func TestHTTPKompanionOPDS(t *testing.T) {
 
 	client, loginSteps := webAuthSteps()
 	Test(t, Description("Login for Device"), loginSteps)
-	host, healthPath, basePath := grabTestHost()
+	_, _, basePath := grabTestHost()
 
 	// put book
 	var redirectedPath string
@@ -465,8 +465,13 @@ func TestHTTPKompanionOPDS(t *testing.T) {
 	// seach opds
 }
 
+func readPrefixedEnv(key string) string {
+	envKey := fmt.Sprintf("KOMPANION_%s", strings.ToUpper(key))
+	return os.Getenv(envKey)
+}
+
 func grabTestHost() (host string, healthPath string, basePath string) {
-	host := readPrefixedEnv("TEST_HOST")
+	host = readPrefixedEnv("TEST_HOST")
 
 	if host == "" {
 		host = "app:8080"
@@ -478,9 +483,9 @@ func grabTestHost() (host string, healthPath string, basePath string) {
 	return host, healthPath, basePath
 }
 
-func grabTestUser() (string, string) {
-	user := readPrefixedEnv("TEST_USER")
-	password := readPrefixedEnv("TEST_PASSWORD")
+func grabTestUser() (user string, password string) {
+	user = readPrefixedEnv("TEST_USER")
+	password = readPrefixedEnv("TEST_PASSWORD")
 
 	if user == "" || password == "" {
 		user = "user"
@@ -501,7 +506,7 @@ func hashSyncPassword(password string) string {
 
 // webAuthSteps returns a client and a step to authenticate
 func webAuthSteps() (*http.Client, hit.IStep) {
-	host := readPrefixedEnv("HEALTHCHECK_HOST")
+	_, _, basePath := grabTestHost()
 	username, password := grabTestUser()
 
 	jar, err := cookiejar.New(nil)
@@ -530,7 +535,7 @@ func webAuthSteps() (*http.Client, hit.IStep) {
 }
 
 func setupDeviceSteps(client *http.Client, deviceName string) hit.IStep {
-	host := readPrefixedEnv("HEALTHCHECK_HOST")
+	_, _, basePath := grabTestHost()
 	return CombineSteps(
 		HTTPClient(client),
 		Description("Device Register"),